fix: #205 preserve secret vars value

Author: bohdan-shulha

Diff for: app/Actions/Services/StartDeployment.php

@@ -31,6 +31,9 @@ public function authorize(ActionRequest $request): bool
 
     public function handle(User $user, Service $service, DeploymentData $deploymentData): Deployment
     {
+        // TODO: Call this in Authorize? In rules?
+        $service->team->quotas()->deployments->ensureQuota();
+
         return DB::transaction(function () use ($service, $deploymentData, $user) {
             $taskGroup = NodeTaskGroup::create([
                 'swarm_id' => $service->swarm_id,
@@ -56,11 +59,6 @@ public function asController(Service $service, ActionRequest $request): Response
     {
         $deploymentData = DeploymentData::make($request->validated());
 
-        $team = $service->team;
-        $quotas = $team->quotas();
-
-        $quotas->deployments->ensureQuota();
-
         $this->handle($request->user(), $service, $deploymentData);
 
         return to_route('services.deployments', $service);

Diff for: app/Models/DeploymentData/Process.php

@@ -163,6 +163,13 @@ public function asNodeTasks(Deployment $deployment): array
             ];
         }
 
+        foreach ($this->secretVars as $secretVar) {
+            $previousSecret = $previous?->findSecretVar($secretVar->name);
+            if ($secretVar->sameAs($previousSecret)) {
+                $secretVar->value = $previousSecret->value;
+            }
+        }
+
         foreach ($this->secretFiles as $secretFile) {
             $previousSecret = $previous?->findSecretFile($secretFile->path);
             if ($secretFile->sameAs($previousSecret)) {
@@ -293,7 +300,7 @@ public function asNodeTasks(Deployment $deployment): array
             'value' => $internalDomain,
         ]);
 
-        $serviceSecretVars = $this->getSecretVars($previous);
+        $serviceSecretVars = $this->getSecretVars();
 
         $tasks[] = [
             'type' => NodeTaskType::LaunchService,
@@ -458,13 +465,11 @@ public function asNodeTasks(Deployment $deployment): array
         return $tasks;
     }
 
-    protected function getSecretVars(?Process $previous): object
+    protected function getSecretVars(): object
     {
         return (object) collect($this->secretVars)
-            ->reduce(function ($carry, SecretVar $var) use ($previous) {
-                $prevVar = $previous?->findSecretVar($var->name);
-
-                $carry[$var->name] = ($var->sameAs($prevVar) ? $prevVar->value : $var->value) ?? '';
+            ->reduce(function ($carry, SecretVar $var) {
+                $carry[$var->name] = $var->value;
 
                 return $carry;
             }, []);

Diff for: app/Models/Service.php

@@ -26,7 +26,6 @@ class Service extends Model
         'team_id',
     ];
 
-    // Add this line to make slug the routing key
     public function getRouteKeyName()
     {
         return 'slug';

Diff for: resources/js/Pages/Nodes/Partials/DockerRegistries.vue

@@ -147,6 +147,7 @@ const submitForm = async () => {
                     <TextInput
                         v-model="registry.username"
                         type="password"
+                        autocomplete="off"
                         class="w-full"
                         :placeholder="
                             registry.dockerName
@@ -165,6 +166,7 @@ const submitForm = async () => {
                     <TextInput
                         v-model="registry.password"
                         type="password"
+                        autocomplete="off"
                         class="w-full"
                         :placeholder="
                             registry.dockerName

Diff for: resources/js/Pages/Nodes/Partials/S3Storages.vue

@@ -167,6 +167,7 @@ const submitForm = async () => {
                         v-model="item.secretKey"
                         type="password"
                         class="w-full"
+                        autocomplete="off"
                         :placeholder="
                             item.dockerName ? 'keep secret key' : '**********'
                         "

Diff for: resources/js/Pages/Services/Partials/DeploymentData.vue

@@ -1427,6 +1427,7 @@ const evaluateSecretVarTemplate = (secretVar, index) => {
                     <TextInput
                         v-model="secretVar.value"
                         class="grow"
+                        autocomplete="off"
                         :placeholder="
                             initialSecretVars.includes(secretVar.name)
                                 ? 'keep existing secret value'