service: Template file improvements

roles/service/vars/main/secrets.yaml

@@ -2,34 +2,34 @@
 _service_container_secrets: >-
   {{
     service_container_secrets
+    | map(attribute='name')
+    | map('community.general.dict_kv', 'target')
+    | zip(
+      service_container_secrets,
+      service_container_secrets
       | map(attribute='name')
-      | map('community.general.dict_kv', 'target')
-      | zip(
-        service_container_secrets,
-        service_container_secrets
-          | map(attribute='name')
-          | map('regex_replace', '^', service_name ~ '-')
-          | map('community.general.dict_kv', 'name')
-        )
-      | map('combine')
-      + (
-        [{
-          'name': _service_database_name,
-          'type': service_database_secret_type,
-          'target': service_database_secret_target
-        }] if _service_setup_database else []
-      )
-      + (
-        [{
-          'name': _service_database_name ~ '-url',
-          'value':
-            'postgres://'
-            ~ service_name | replace('-', '_')
-            ~ ':' ~ service_podman_secrets[service_name ~ '-postgres']
-            ~ '@postgres/' ~ service_name | replace('-', '_')
-            ~ '?sslmode=disable',
-          'type': service_database_secret_type,
-          'target': service_database_secret_target ~ '-url'
-        }] if service_podman_secrets[service_name ~ '-postgres'] is defined else []
-      )
+      | map('regex_replace', '^', service_name ~ '-')
+      | map('community.general.dict_kv', 'name')
+    )
+    | map('combine')
+    + (
+      [{
+        'name': _service_database_name,
+        'type': service_database_secret_type,
+        'target': service_database_secret_target
+      }] if _service_setup_database else []
+    )
+    + (
+      [{
+        'name': _service_database_name ~ '-url',
+        'value':
+          'postgres://'
+          ~ service_name | replace('-', '_')
+          ~ ':' ~ service_podman_secrets[service_name ~ '-postgres']
+          ~ '@postgres/' ~ service_name | replace('-', '_')
+          ~ '?sslmode=disable',
+        'type': service_database_secret_type,
+        'target': service_database_secret_target ~ '-url'
+      }] if service_podman_secrets[service_name ~ '-postgres'] is defined else []
+    )
   }}