fix tests (hasDocuments.count)

2026-06-17 07:27:44 +08:00 · 2022-12-07 18:16:12 +02:00
parent b195961923
commit bbce72ca82
46 changed files with 81 additions and 80 deletions
--- a/library/common-test/tests/container_in_deployment/command-arg_test.yaml
+++ b/library/common-test/tests/container_in_deployment/command-arg_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/container_in_deployment/env_from.yaml
+++ b/library/common-test/tests/container_in_deployment/env_from.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/container_in_deployment/env_list.yaml
+++ b/library/common-test/tests/container_in_deployment/env_list.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/container_in_deployment/env_test.yaml
+++ b/library/common-test/tests/container_in_deployment/env_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/container_in_deployment/fixedEnv_test.yaml
+++ b/library/common-test/tests/container_in_deployment/fixedEnv_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/container_in_deployment/image_test.yaml
+++ b/library/common-test/tests/container_in_deployment/image_test.yaml
@@ -7,7 +7,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/container_in_deployment/lifecycle_test.yaml
+++ b/library/common-test/tests/container_in_deployment/lifecycle_test.yaml
@@ -7,7 +7,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/container_in_deployment/port_test.yaml
+++ b/library/common-test/tests/container_in_deployment/port_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/container_in_deployment/probe_test.yaml
+++ b/library/common-test/tests/container_in_deployment/probe_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isSubset:
--- a/library/common-test/tests/container_in_deployment/resources_test.yaml
+++ b/library/common-test/tests/container_in_deployment/resources_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - equal:
--- a/library/common-test/tests/container_in_deployment/securityContext_test.yaml
+++ b/library/common-test/tests/container_in_deployment/securityContext_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/container_in_deployment/various_options_test.yaml
+++ b/library/common-test/tests/container_in_deployment/various_options_test.yaml
@@ -7,7 +7,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/container_in_deployment/volumeMounts_test.yaml
+++ b/library/common-test/tests/container_in_deployment/volumeMounts_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isNull:
--- a/library/common-test/tests/deployment/annotation_test.yaml
+++ b/library/common-test/tests/deployment/annotation_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isNotEmpty:
--- a/library/common-test/tests/deployment/controller_test.yaml
+++ b/library/common-test/tests/deployment/controller_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - equal:
@@ -31,7 +31,7 @@ tests:
        enabled: false
    asserts:
      - hasDocuments:
-          count: 1
+          count: 2

  - it: should pass with controller strategy changed and rollingUpdate strategies set
    documentIndex: *deploymentDoc
--- a/library/common-test/tests/deployment/default_test.yaml
+++ b/library/common-test/tests/deployment/default_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isAPIVersion:
--- a/library/common-test/tests/deployment/dns-network_test.yaml
+++ b/library/common-test/tests/deployment/dns-network_test.yaml
@@ -7,7 +7,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/deployment/label_test.yaml
+++ b/library/common-test/tests/deployment/label_test.yaml
@@ -8,7 +8,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - equal:
--- a/library/common-test/tests/deployment/names_test.yaml
+++ b/library/common-test/tests/deployment/names_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - equal:
--- a/library/common-test/tests/deployment/podSecurityContext_test.yaml
+++ b/library/common-test/tests/deployment/podSecurityContext_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - equal:
--- a/library/common-test/tests/deployment/serviceAccountName_test.yaml
+++ b/library/common-test/tests/deployment/serviceAccountName_test.yaml
@@ -7,7 +7,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/deployment/various_options_test.yaml
+++ b/library/common-test/tests/deployment/various_options_test.yaml
@@ -7,7 +7,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/deployment/volume_configMap_test.yaml
+++ b/library/common-test/tests/deployment/volume_configMap_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isNull:
--- a/library/common-test/tests/deployment/volume_custom_test.yaml
+++ b/library/common-test/tests/deployment/volume_custom_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isNull:
--- a/library/common-test/tests/deployment/volume_emptyDir_test.yaml
+++ b/library/common-test/tests/deployment/volume_emptyDir_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isNull:
--- a/library/common-test/tests/deployment/volume_hostPath_test.yaml
+++ b/library/common-test/tests/deployment/volume_hostPath_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isNull:
--- a/library/common-test/tests/deployment/volume_nfs_test.yaml
+++ b/library/common-test/tests/deployment/volume_nfs_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isNull:
--- a/library/common-test/tests/deployment/volume_pvc_test.yaml
+++ b/library/common-test/tests/deployment/volume_pvc_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isNull:
--- a/library/common-test/tests/deployment/volume_secret_test.yaml
+++ b/library/common-test/tests/deployment/volume_secret_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isNull:
--- a/library/common-test/tests/deployment/volume_test.yaml
+++ b/library/common-test/tests/deployment/volume_test.yaml
@@ -6,7 +6,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - isNull:
--- a/library/common-test/tests/externalInterfaces/externalInterfaces_test.yaml
+++ b/library/common-test/tests/externalInterfaces/externalInterfaces_test.yaml
@@ -8,7 +8,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

@@ -117,7 +117,7 @@ tests:
        - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-0", "type": "macvlan", "master": "ens3s0", "ipam": {"type": "dhcp"}}'
    asserts:
      - hasDocuments:
-          count: 3
+          count: 4
      - isKind:
          of: NetworkAttachmentDefinition
      - isAPIVersion:
@@ -145,7 +145,7 @@ tests:
        - ix-RELEASE-NAME-0
    asserts:
      - hasDocuments:
-          count: 3
+          count: 4
      - isKind:
          of: Deployment
      - isSubset:
@@ -171,7 +171,7 @@ tests:
        - ix-RELEASE-NAME-0
    asserts:
      - hasDocuments:
-          count: 4
+          count: 5
      - isKind:
          of: NetworkAttachmentDefinition
      - isAPIVersion:
@@ -198,7 +198,7 @@ tests:
        - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-1", "type": "macvlan", "master": "ens5s0", "ipam": {"type": "dhcp"}}'
    asserts:
      - hasDocuments:
-          count: 4
+          count: 5
      - isKind:
          of: NetworkAttachmentDefinition
      - isAPIVersion:
@@ -228,7 +228,7 @@ tests:
        - ix-RELEASE-NAME-1
    asserts:
      - hasDocuments:
-          count: 4
+          count: 5
      - isKind:
          of: Deployment
      - isSubset:
@@ -255,7 +255,7 @@ tests:
        - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-0", "type": "macvlan", "master": "ens3s0", "ipam": {"type": "dhcp"}}'
    asserts:
      - hasDocuments:
-          count: 3
+          count: 4
      - isKind:
          of: NetworkAttachmentDefinition
      - isAPIVersion:
@@ -285,7 +285,7 @@ tests:
        - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-0", "type": "macvlan", "master": "ens3s0", "ipam": {"type": "dhcp"}}'
    asserts:
      - hasDocuments:
-          count: 3
+          count: 4
      - isKind:
          of: NetworkAttachmentDefinition
      - isAPIVersion:
@@ -313,7 +313,7 @@ tests:
        - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-0", "type": "macvlan", "master": "ens3s0", "ipam": {"type": "dhcp"}}'
    asserts:
      - hasDocuments:
-          count: 3
+          count: 4
      - isKind:
          of: NetworkAttachmentDefinition
      - isAPIVersion:
@@ -351,7 +351,7 @@ tests:
        - '{"cniVersion": "0.3.1", "name": "ix-RELEASE-NAME-0", "type": "macvlan", "master": "ens3s0", "ipam": {"type": "dhcp"}}'
    asserts:
      - hasDocuments:
-          count: 3
+          count: 4
      - isKind:
          of: NetworkAttachmentDefinition
      - isAPIVersion:
--- a/library/common-test/tests/pvc/pvc_test.yaml
+++ b/library/common-test/tests/pvc/pvc_test.yaml
@@ -8,7 +8,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/rbac/rbac_test.yaml
+++ b/library/common-test/tests/rbac/rbac_test.yaml
@@ -11,7 +11,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/service/service_test.yaml
+++ b/library/common-test/tests/service/service_test.yaml
@@ -8,7 +8,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/service/service_test_ClusterIP.yaml
+++ b/library/common-test/tests/service/service_test_ClusterIP.yaml
@@ -9,7 +9,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/service/service_test_ExternalIP.yaml
+++ b/library/common-test/tests/service/service_test_ExternalIP.yaml
@@ -8,7 +8,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/service/service_test_ExternalName.yaml
+++ b/library/common-test/tests/service/service_test_ExternalName.yaml
@@ -8,7 +8,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/service/service_test_LoadBalancer.yaml
+++ b/library/common-test/tests/service/service_test_LoadBalancer.yaml
@@ -8,7 +8,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/service/service_test_NodePort.yaml
+++ b/library/common-test/tests/service/service_test_NodePort.yaml
@@ -8,7 +8,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/service/service_test_hostNet.yaml
+++ b/library/common-test/tests/service/service_test_hostNet.yaml
@@ -9,7 +9,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/serviceAccount/serviceAccount_test.yaml
+++ b/library/common-test/tests/serviceAccount/serviceAccount_test.yaml
@@ -9,7 +9,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment

--- a/library/common-test/tests/utils/utils_primary_port_test.yaml
+++ b/library/common-test/tests/utils/utils_primary_port_test.yaml
@@ -7,7 +7,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - equal:
--- a/library/common-test/tests/utils/utils_primary_rbac_test.yaml
+++ b/library/common-test/tests/utils/utils_primary_rbac_test.yaml
@@ -6,7 +6,7 @@ tests:
  - it: should pass with default values
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3

  - it: should fail with more than 1 primary rbac
    set:
@@ -45,7 +45,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 4
+          count: 5
      - isKind:
          of: Role
      - equal:
@@ -63,7 +63,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 4
+          count: 5
      - isKind:
          of: RoleBinding
      - equal:
@@ -82,7 +82,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 4
+          count: 5
      - isKind:
          of: ClusterRole
      - equal:
@@ -101,7 +101,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 4
+          count: 5
      - isKind:
          of: ClusterRoleBinding
      - equal:
@@ -124,7 +124,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: Role
      - equal:
@@ -147,7 +147,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: Role
      - equal:
@@ -170,7 +170,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: RoleBinding
      - equal:
@@ -193,7 +193,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: RoleBinding
      - equal:
@@ -217,7 +217,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: ClusterRole
      - equal:
@@ -241,7 +241,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: ClusterRole
      - equal:
@@ -265,7 +265,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: ClusterRoleBinding
      - equal:
@@ -289,7 +289,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: ClusterRoleBinding
      - equal:
@@ -312,7 +312,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: Role
      - equal:
@@ -335,7 +335,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: Role
      - equal:
@@ -358,7 +358,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: RoleBinding
      - equal:
@@ -381,7 +381,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: RoleBinding
      - equal:
@@ -405,7 +405,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: ClusterRole
      - equal:
@@ -429,7 +429,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: ClusterRole
      - equal:
@@ -453,7 +453,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: ClusterRoleBinding
      - equal:
@@ -477,7 +477,7 @@ tests:
          subjects: *subjects
    asserts:
      - hasDocuments:
-          count: 6
+          count: 7
      - isKind:
          of: ClusterRoleBinding
      - equal:
--- a/library/common-test/tests/utils/utils_primary_serviceAccount_test.yaml
+++ b/library/common-test/tests/utils/utils_primary_serviceAccount_test.yaml
@@ -6,7 +6,7 @@ tests:
  - it: should pass with default values
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3

  - it: should fail with more than 1 primary serviceAccounts
    set:
@@ -30,7 +30,7 @@ tests:
          primary: false
    asserts:
      - hasDocuments:
-          count: 3
+          count: 4
      - isKind:
          of: ServiceAccount
      - equal:
@@ -49,7 +49,7 @@ tests:
          primary: false
    asserts:
      - hasDocuments:
-          count: 4
+          count: 5
      - isKind:
          of: ServiceAccount
      - equal:
@@ -68,7 +68,7 @@ tests:
          primary: false
    asserts:
      - hasDocuments:
-          count: 4
+          count: 5
      - isKind:
          of: ServiceAccount
      - equal:
@@ -87,7 +87,7 @@ tests:
          primary: true
    asserts:
      - hasDocuments:
-          count: 4
+          count: 5
      - isKind:
          of: ServiceAccount
      - equal:
@@ -106,7 +106,7 @@ tests:
          primary: true
    asserts:
      - hasDocuments:
-          count: 4
+          count: 5
      - isKind:
          of: ServiceAccount
      - equal:
--- a/library/common-test/tests/utils/utils_primary_service_test.yaml
+++ b/library/common-test/tests/utils/utils_primary_service_test.yaml
@@ -7,7 +7,7 @@ tests:
    documentIndex: &deploymentDoc 0
    asserts:
      - hasDocuments:
-          count: 2
+          count: 3
      - isKind:
          of: Deployment
      - equal:
--- a/library/common/1.0.0/templates/spawner/_portal.tpl
+++ b/library/common/1.0.0/templates/spawner/_portal.tpl
@@ -2,6 +2,7 @@
  {{- if .Values.portal -}}
    {{- if .Values.portal.enabled -}}
      {{- include "ix.v1.common.class.portal" (dict "root" $) -}}
+      {{/* TODO: Unittests */}}
    {{- end -}}
  {{- end -}}
 {{- end -}}