Updated spec tests for removal of no-nats-tls feature

genesis-community · Jan 10, 2024 · a3cc0ab · a3cc0ab
1 parent a65c796
commit a3cc0ab
Show file tree

Hide file tree

Showing 32 changed files with 67 additions and 163 deletions.
diff --git a/spec/results/app-autoscaler-integration.yml b/spec/results/app-autoscaler-integration.yml
@@ -402,10 +402,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -415,7 +412,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/availability-zones.yml b/spec/results/availability-zones.yml
@@ -394,10 +394,7 @@ instance_groups:
   - us-west-2c
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -407,7 +404,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/azure.yml b/spec/results/azure.yml
@@ -390,10 +390,7 @@ instance_groups:
   - z1
   instances: 1
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -403,7 +400,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/blobstore-aws.yml b/spec/results/blobstore-aws.yml
@@ -392,10 +392,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -405,7 +402,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/blobstore-azure.yml b/spec/results/blobstore-azure.yml
@@ -392,10 +392,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -405,7 +402,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/blobstore-gcp.yml b/spec/results/blobstore-gcp.yml
@@ -392,10 +392,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -405,7 +402,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/blobstore-minio.yml b/spec/results/blobstore-minio.yml
@@ -392,10 +392,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -405,7 +402,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/compiled-releases.yml b/spec/results/compiled-releases.yml
@@ -392,10 +392,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -405,7 +402,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/compiled-windows-releases.yml b/spec/results/compiled-windows-releases.yml
@@ -425,10 +425,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -438,7 +435,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/container-routing-integrity.yml b/spec/results/container-routing-integrity.yml
@@ -392,10 +392,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -405,7 +402,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/dns-service-discovery.yml b/spec/results/dns-service-discovery.yml
@@ -394,10 +394,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -407,7 +404,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/haproxy-self-signed.yml b/spec/results/haproxy-self-signed.yml
@@ -392,10 +392,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -405,7 +402,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/haproxy-tls.yml b/spec/results/haproxy-tls.yml
@@ -393,10 +393,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -406,7 +403,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/haproxy.yml b/spec/results/haproxy.yml
@@ -392,10 +392,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -405,7 +402,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/isolation-segments-extended.yml b/spec/results/isolation-segments-extended.yml
@@ -416,10 +416,7 @@ instance_groups:
   - zoneD
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -429,7 +426,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/isolation-segments.yml b/spec/results/isolation-segments.yml
@@ -412,10 +412,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -425,7 +422,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/loggregator-forwarder-agent.yml b/spec/results/loggregator-forwarder-agent.yml
@@ -392,10 +392,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -405,7 +402,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/mysql-db.yml b/spec/results/mysql-db.yml
@@ -392,10 +392,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -405,7 +402,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true

diff --git a/spec/results/native-garden-runc.yml b/spec/results/native-garden-runc.yml
@@ -392,10 +392,7 @@ instance_groups:
   - z2
   instances: 2
   jobs:
-  - custom_provider_definitions:
-    - name: nats-tls-address
-      type: address
-    name: nats-tls
+  - name: nats-tls
     properties:
       nats:
         client:
@@ -405,7 +402,7 @@ instance_groups:
             private_key: <!{credhub}:nats_client_cert.private_key!>
         external:
           tls:
-            ca: <!{credhub}:nats_client_cert.ca!>
+            ca: <!{credhub}:nats_server_cert.ca!>
             certificate: <!{credhub}:nats_server_cert.certificate!>
             private_key: <!{credhub}:nats_server_cert.private_key!>
         fail_deployment_if_v1: true