From a3cc0ab6c0896180d36462ecf8ae010b211c8122 Mon Sep 17 00:00:00 2001 From: "Dennis J. Bell" Date: Wed, 10 Jan 2024 11:28:51 -0800 Subject: [PATCH] Updated spec tests for removal of no-nats-tls feature --- spec/results/app-autoscaler-integration.yml | 7 ++----- spec/results/availability-zones.yml | 7 ++----- spec/results/azure.yml | 7 ++----- spec/results/blobstore-aws.yml | 7 ++----- spec/results/blobstore-azure.yml | 7 ++----- spec/results/blobstore-gcp.yml | 7 ++----- spec/results/blobstore-minio.yml | 7 ++----- spec/results/compiled-releases.yml | 7 ++----- spec/results/compiled-windows-releases.yml | 7 ++----- spec/results/container-routing-integrity.yml | 7 ++----- spec/results/dns-service-discovery.yml | 7 ++----- spec/results/haproxy-self-signed.yml | 7 ++----- spec/results/haproxy-tls.yml | 7 ++----- spec/results/haproxy.yml | 7 ++----- spec/results/isolation-segments-extended.yml | 7 ++----- spec/results/isolation-segments.yml | 7 ++----- spec/results/loggregator-forwarder-agent.yml | 7 ++----- spec/results/mysql-db.yml | 7 ++----- spec/results/native-garden-runc.yml | 7 ++----- spec/results/no-tcp-routers.yml | 7 ++----- spec/results/override-vm-types-and-counts-old-names.yml | 7 ++----- spec/results/override-vm-types-and-counts.yml | 7 ++----- spec/results/postgres-db.yml | 7 ++----- spec/results/router-synergy.yml | 7 ++----- spec/results/routing-api.yml | 7 ++----- spec/results/small-footprint.yml | 7 ++----- spec/results/upgrade-from-v1-with-db-override-names.yml | 9 +++------ spec/results/upgraded-from-v1-with-204-overrides.yml | 7 ++----- spec/results/upgraded-from-v1.yml | 9 +++------ spec/results/upgrading-to-v2-with-204-overrides.yml | 7 ++----- spec/results/upgrading-to-v2.yml | 9 +++------ spec/results/windows-and-smb-support.yml | 7 ++----- 32 files changed, 67 insertions(+), 163 deletions(-) diff --git a/spec/results/app-autoscaler-integration.yml b/spec/results/app-autoscaler-integration.yml index 32c2e7e..4579057 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/availability-zones.yml b/spec/results/availability-zones.yml index e862c1d..21611f7 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/azure.yml b/spec/results/azure.yml index 7666d71..d28e8e0 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/blobstore-aws.yml b/spec/results/blobstore-aws.yml index 933200f..18a78dd 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/blobstore-azure.yml b/spec/results/blobstore-azure.yml index fd24715..88f16b8 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/blobstore-gcp.yml b/spec/results/blobstore-gcp.yml index 7464e3a..309c491 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/blobstore-minio.yml b/spec/results/blobstore-minio.yml index 24c4032..759ccb8 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/compiled-releases.yml b/spec/results/compiled-releases.yml index a4b062f..bd1f948 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/compiled-windows-releases.yml b/spec/results/compiled-windows-releases.yml index 1e05a49..df5d746 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/container-routing-integrity.yml b/spec/results/container-routing-integrity.yml index 0c6b512..c8fca5c 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/dns-service-discovery.yml b/spec/results/dns-service-discovery.yml index 7cc1668..a488fdb 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/haproxy-self-signed.yml b/spec/results/haproxy-self-signed.yml index 8879e48..f063838 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/haproxy-tls.yml b/spec/results/haproxy-tls.yml index 6874a12..fc30584 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/haproxy.yml b/spec/results/haproxy.yml index 01f8ba0..41e8b74 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/isolation-segments-extended.yml b/spec/results/isolation-segments-extended.yml index 5e70257..2bd531b 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/isolation-segments.yml b/spec/results/isolation-segments.yml index 142eecf..e56e324 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/loggregator-forwarder-agent.yml b/spec/results/loggregator-forwarder-agent.yml index a05dd70..37bb60c 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/mysql-db.yml b/spec/results/mysql-db.yml index d2d4938..f3f0ba3 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/native-garden-runc.yml b/spec/results/native-garden-runc.yml index 2f14bbe..fa87041 100644 --- 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/no-tcp-routers.yml b/spec/results/no-tcp-routers.yml index 69775c6..7a141aa 100644 --- a/spec/results/no-tcp-routers.yml +++ b/spec/results/no-tcp-routers.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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/override-vm-types-and-counts-old-names.yml b/spec/results/override-vm-types-and-counts-old-names.yml index a253258..cdb5307 100644 --- a/spec/results/override-vm-types-and-counts-old-names.yml +++ b/spec/results/override-vm-types-and-counts-old-names.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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/override-vm-types-and-counts.yml b/spec/results/override-vm-types-and-counts.yml index 4e2b5af..6bbb59b 100644 --- a/spec/results/override-vm-types-and-counts.yml +++ b/spec/results/override-vm-types-and-counts.yml @@ -392,10 +392,7 @@ instance_groups: - z2 instances: 24 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/postgres-db.yml b/spec/results/postgres-db.yml index 41e4642..133f450 100644 --- a/spec/results/postgres-db.yml +++ b/spec/results/postgres-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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/router-synergy.yml b/spec/results/router-synergy.yml index 486df6a..9d70f8f 100644 --- a/spec/results/router-synergy.yml +++ b/spec/results/router-synergy.yml @@ -393,10 +393,7 @@ instance_groups: - us-west-2a instances: 1 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/routing-api.yml b/spec/results/routing-api.yml index ebcddb1..154eb35 100644 --- a/spec/results/routing-api.yml +++ b/spec/results/routing-api.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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/small-footprint.yml b/spec/results/small-footprint.yml index cd278d8..0f16897 100644 --- a/spec/results/small-footprint.yml +++ b/spec/results/small-footprint.yml @@ -390,10 +390,7 @@ instance_groups: - z2 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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/upgrade-from-v1-with-db-override-names.yml b/spec/results/upgrade-from-v1-with-db-override-names.yml index b7bcea2..31c616a 100644 --- a/spec/results/upgrade-from-v1-with-db-override-names.yml +++ b/spec/results/upgrade-from-v1-with-db-override-names.yml @@ -397,10 +397,7 @@ instance_groups: - z4 instances: 2 jobs: - - custom_provider_definitions: - - name: nats-tls-address - type: address - name: nats-tls + - name: nats-tls properties: nats: client: @@ -410,7 +407,7 @@ instance_groups: private_key: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true @@ -422,7 +419,7 @@ instance_groups: enabled: true private_key: password: - user: nats_user + user: nats provides: nats-tls: as: nats-tls diff --git a/spec/results/upgraded-from-v1-with-204-overrides.yml b/spec/results/upgraded-from-v1-with-204-overrides.yml index af95230..771d6de 100644 --- a/spec/results/upgraded-from-v1-with-204-overrides.yml +++ b/spec/results/upgraded-from-v1-with-204-overrides.yml @@ -397,10 +397,7 @@ instance_groups: - z4 instances: 2 jobs: - - custom_provider_definitions: - - name: nats-tls-address - type: address - name: nats-tls + - name: nats-tls properties: nats: client: @@ -410,7 +407,7 @@ instance_groups: private_key: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/upgraded-from-v1.yml b/spec/results/upgraded-from-v1.yml index 15bbc2a..9c8cb7a 100644 --- a/spec/results/upgraded-from-v1.yml +++ b/spec/results/upgraded-from-v1.yml @@ -397,10 +397,7 @@ instance_groups: - z4 instances: 2 jobs: - - custom_provider_definitions: - - name: nats-tls-address - type: address - name: nats-tls + - name: nats-tls properties: nats: client: @@ -410,7 +407,7 @@ instance_groups: private_key: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true @@ -422,7 +419,7 @@ instance_groups: enabled: true private_key: password: - user: nats_user + user: nats provides: nats-tls: as: nats-tls diff --git a/spec/results/upgrading-to-v2-with-204-overrides.yml b/spec/results/upgrading-to-v2-with-204-overrides.yml index 0215214..f6192db 100644 --- a/spec/results/upgrading-to-v2-with-204-overrides.yml +++ b/spec/results/upgrading-to-v2-with-204-overrides.yml @@ -395,10 +395,7 @@ instance_groups: - z3 instances: 2 jobs: - - custom_provider_definitions: - - name: nats-tls-address - type: address - name: nats-tls + - name: nats-tls properties: nats: client: @@ -408,7 +405,7 @@ instance_groups: private_key: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true diff --git a/spec/results/upgrading-to-v2.yml b/spec/results/upgrading-to-v2.yml index 7af0ec6..bf41278 100644 --- a/spec/results/upgrading-to-v2.yml +++ b/spec/results/upgrading-to-v2.yml @@ -395,10 +395,7 @@ instance_groups: - z3 instances: 2 jobs: - - custom_provider_definitions: - - name: nats-tls-address - type: address - name: nats-tls + - name: nats-tls properties: nats: client: @@ -408,7 +405,7 @@ instance_groups: private_key: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true @@ -420,7 +417,7 @@ instance_groups: enabled: true private_key: password: - user: nats_user + user: nats provides: nats-tls: as: nats-tls diff --git a/spec/results/windows-and-smb-support.yml b/spec/results/windows-and-smb-support.yml index a4a2533..e31bc5b 100644 --- a/spec/results/windows-and-smb-support.yml +++ b/spec/results/windows-and-smb-support.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: external: tls: - ca: + ca: certificate: private_key: fail_deployment_if_v1: true