Updated spec tests for datastore pattern change

The datastore pattern is now a non-capturing group, which is arguably more correct, but was put in place due to credhub entombed variables causing the pattern to fail.
genesis-community · Jul 16, 2024 · 6995a36 · 6995a36
1 parent 0bcd6e3
commit 6995a36
Show file tree

Hide file tree

Showing 15 changed files with 40 additions and 40 deletions.
diff --git a/spec/results/all-addons.yml b/spec/results/all-addons.yml
@@ -409,10 +409,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: all-addons/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: all-addons/templates
         vm_folder: all-addons/vms
       enable_human_readable_name: true

diff --git a/spec/results/all-params.yml b/spec/results/all-params.yml
@@ -16,10 +16,10 @@ cloud_provider:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: all-params/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: all-params/templates
         vm_folder: all-params/vms
       password: <!{meta.vault}/vsphere:password!>
@@ -400,10 +400,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: all-params/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: all-params/templates
         vm_folder: all-params/vms
       enable_human_readable_name: true

diff --git a/spec/results/blacksmith-integration.yml b/spec/results/blacksmith-integration.yml
@@ -399,10 +399,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: blacksmith-integration/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: blacksmith-integration/templates
         vm_folder: blacksmith-integration/vms
       enable_human_readable_name: true

diff --git a/spec/results/external-db-no-tls.yml b/spec/results/external-db-no-tls.yml
@@ -379,10 +379,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: external-db-no-tls/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: external-db-no-tls/templates
         vm_folder: external-db-no-tls/vms
       enable_human_readable_name: true

diff --git a/spec/results/external-db.yml b/spec/results/external-db.yml
@@ -408,10 +408,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: external-db/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: external-db/templates
         vm_folder: external-db/vms
       enable_human_readable_name: true

diff --git a/spec/results/node-exporter.yml b/spec/results/node-exporter.yml
@@ -383,10 +383,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: node-exporter/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: node-exporter/templates
         vm_folder: node-exporter/vms
       enable_human_readable_name: true

diff --git a/spec/results/ops-override.yml b/spec/results/ops-override.yml
@@ -377,10 +377,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1|test-ephemeral-datastores2)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1|test-ephemeral-datastores2)$
         disk_path: ops-override/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1|test-persistent-datastores2)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1|test-persistent-datastores2)$
         template_folder: ops-override/templates
         vm_folder: ops-override/vms
       enable_human_readable_name: true

diff --git a/spec/results/proto-all-params-source-vsphere.yml b/spec/results/proto-all-params-source-vsphere.yml
@@ -16,10 +16,10 @@ cloud_provider:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1|test-ephemeral-datastores2)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1|test-ephemeral-datastores2)$
         disk_path: proto-all-params-source-vsphere/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1|test-persistent-datastores2)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1|test-persistent-datastores2)$
         template_folder: proto-all-params-source-vsphere/templates
         vm_folder: proto-all-params-source-vsphere/vms
       password: <!{meta.vault}/vsphere:password!>
@@ -419,10 +419,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1|test-ephemeral-datastores2)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1|test-ephemeral-datastores2)$
         disk_path: proto-all-params-source-vsphere/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1|test-persistent-datastores2)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1|test-persistent-datastores2)$
         template_folder: proto-all-params-source-vsphere/templates
         vm_folder: proto-all-params-source-vsphere/vms
       enable_human_readable_name: true

diff --git a/spec/results/proto-all-params-vsphere.yml b/spec/results/proto-all-params-vsphere.yml
@@ -16,10 +16,10 @@ cloud_provider:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1|test-ephemeral-datastores2)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1|test-ephemeral-datastores2)$
         disk_path: proto-all-params-vsphere/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1|test-persistent-datastores2)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1|test-persistent-datastores2)$
         template_folder: proto-all-params-vsphere/templates
         vm_folder: proto-all-params-vsphere/vms
       password: <!{meta.vault}/vsphere:password!>
@@ -411,10 +411,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1|test-ephemeral-datastores2)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1|test-ephemeral-datastores2)$
         disk_path: proto-all-params-vsphere/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1|test-persistent-datastores2)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1|test-persistent-datastores2)$
         template_folder: proto-all-params-vsphere/templates
         vm_folder: proto-all-params-vsphere/vms
       enable_human_readable_name: true

diff --git a/spec/results/proto-vsphere.yml b/spec/results/proto-vsphere.yml
@@ -16,10 +16,10 @@ cloud_provider:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: proto-vsphere/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: proto-vsphere/templates
         vm_folder: proto-vsphere/vms
       password: <!{meta.vault}/vsphere:password!>
@@ -411,10 +411,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: proto-vsphere/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: proto-vsphere/templates
         vm_folder: proto-vsphere/vms
       enable_human_readable_name: true

diff --git a/spec/results/skip-op-users.yml b/spec/results/skip-op-users.yml
@@ -366,10 +366,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: skip-op-users/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: skip-op-users/templates
         vm_folder: skip-op-users/vms
       enable_human_readable_name: true

diff --git a/spec/results/upgrade.yml b/spec/results/upgrade.yml
@@ -16,10 +16,10 @@ cloud_provider:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: upgrade/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: upgrade/templates
         vm_folder: upgrade/vms
       password: <!{meta.vault}/vsphere:password!>
@@ -411,10 +411,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: upgrade/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: upgrade/templates
         vm_folder: upgrade/vms
       enable_human_readable_name: true

diff --git a/spec/results/vault-credhub-proxy.yml b/spec/results/vault-credhub-proxy.yml
@@ -390,10 +390,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1)$
         disk_path: vault-credhub-proxy/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1)$
         template_folder: vault-credhub-proxy/templates
         vm_folder: vault-credhub-proxy/vms
       enable_human_readable_name: true

diff --git a/spec/results/vsphere-s3-blobstore.yml b/spec/results/vsphere-s3-blobstore.yml
@@ -364,10 +364,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1|test-ephemeral-datastores2)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1|test-ephemeral-datastores2)$
         disk_path: vsphere-s3-blobstore/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1|test-persistent-data)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1|test-persistent-data)$
         template_folder: vsphere-s3-blobstore/templates
         vm_folder: vsphere-s3-blobstore/vms
       enable_human_readable_name: true

diff --git a/spec/results/vsphere.yml b/spec/results/vsphere.yml
@@ -377,10 +377,10 @@ instance_groups:
       datacenters:
       - clusters:
         - test-cluster1
-        datastore_pattern: ^(test-ephemeral-datastores1|test-ephemeral-datastores2)$
+        datastore_pattern: ^(?:test-ephemeral-datastores1|test-ephemeral-datastores2)$
         disk_path: vsphere/disks
         name: test-datacenter
-        persistent_datastore_pattern: ^(test-persistent-datastores1|test-persistent-datastores2)$
+        persistent_datastore_pattern: ^(?:test-persistent-datastores1|test-persistent-datastores2)$
         template_folder: vsphere/templates
         vm_folder: vsphere/vms
       enable_human_readable_name: true