fix: server env not showing for services
This commit is contained in:
parent
5ed308dcf0
commit
09e14d2f51
2 changed files with 40 additions and 0 deletions
|
|
@ -160,6 +160,26 @@ public function availableSharedVariables(): array
|
||||||
// User not authorized to view server variables
|
// User not authorized to view server variables
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// For service environment variables, try to use the service's server
|
||||||
|
$serviceUuid = data_get($this->parameters, 'service_uuid');
|
||||||
|
if ($serviceUuid) {
|
||||||
|
$service = \App\Models\Service::whereRelation('environment.project.team', 'id', $team->id)
|
||||||
|
->where('uuid', $serviceUuid)
|
||||||
|
->with('server')
|
||||||
|
->first();
|
||||||
|
|
||||||
|
if ($service && $service->server) {
|
||||||
|
try {
|
||||||
|
$this->authorize('view', $service->server);
|
||||||
|
$result['server'] = $service->server->environment_variables()
|
||||||
|
->pluck('key')
|
||||||
|
->toArray();
|
||||||
|
} catch (\Illuminate\Auth\Access\AuthorizationException $e) {
|
||||||
|
// User not authorized to view server variables
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -297,6 +297,26 @@ public function availableSharedVariables(): array
|
||||||
// User not authorized to view server variables
|
// User not authorized to view server variables
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
// For service environment variables, try to use the service's server
|
||||||
|
$serviceUuid = data_get($this->parameters, 'service_uuid');
|
||||||
|
if ($serviceUuid) {
|
||||||
|
$service = \App\Models\Service::whereRelation('environment.project.team', 'id', $team->id)
|
||||||
|
->where('uuid', $serviceUuid)
|
||||||
|
->with('server')
|
||||||
|
->first();
|
||||||
|
|
||||||
|
if ($service && $service->server) {
|
||||||
|
try {
|
||||||
|
$this->authorize('view', $service->server);
|
||||||
|
$result['server'] = $service->server->environment_variables()
|
||||||
|
->pluck('key')
|
||||||
|
->toArray();
|
||||||
|
} catch (\Illuminate\Auth\Access\AuthorizationException $e) {
|
||||||
|
// User not authorized to view server variables
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue