Convert most tests to use GCP instead of AWS (#162)

cockroachdb · Aug 31, 2023 · 46596fa · 46596fa
1 parent e98265c
commit 46596fa
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/internal/provider/allowlist_resource_test.go b/internal/provider/allowlist_resource_test.go
@@ -126,7 +126,7 @@ func TestIntegrationAllowlistEntryResource(t *testing.T) {
 			client.Cluster{
 				Name:          clusterName,
 				Id:            uuid.Nil.String(),
-				CloudProvider: "AWS",
+				CloudProvider: "GCP",
 				Config: client.ClusterConfig{
 					Dedicated: &client.DedicatedHardwareConfig{
 						StorageGib:     15,
@@ -137,7 +137,7 @@ func TestIntegrationAllowlistEntryResource(t *testing.T) {
 				State: "CREATED",
 				Regions: []client.Region{
 					{
-						Name:      "ap-south-1",
+						Name:      "us-east1",
 						NodeCount: 1,
 					},
 				},
@@ -318,13 +318,13 @@ func getTestAllowlistEntryResourceConfigForDedicated(
 	return fmt.Sprintf(`
 resource "cockroach_cluster" "dedicated" {
     name           = "%s"
-    cloud_provider = "AWS"
+    cloud_provider = "GCP"
     dedicated = {
         storage_gib = 15
         num_virtual_cpus = 2
     }
     regions = [{
-        name: "ap-south-1"
+        name: "us-east1"
         node_count: 1
     }]
 }

diff --git a/internal/provider/client_ca_cert_resource_test.go b/internal/provider/client_ca_cert_resource_test.go
@@ -63,7 +63,7 @@ func TestIntegrationClientCACertResource(t *testing.T) {
 	cluster := &client.Cluster{
 		Id:            clusterId,
 		Name:          clusterName,
-		CloudProvider: "AWS",
+		CloudProvider: "GCP",
 		State:         "CREATED",
 		Config: client.ClusterConfig{
 			Dedicated: &client.DedicatedHardwareConfig{
@@ -74,7 +74,7 @@ func TestIntegrationClientCACertResource(t *testing.T) {
 		},
 		Regions: []client.Region{
 			{
-				Name:      "us-west-2",
+				Name:      "us-west2",
 				NodeCount: 1,
 			},
 		},
@@ -189,13 +189,13 @@ func getTestClientCACertResourceConfig(name string, cert string) string {
 	return fmt.Sprintf(`
 resource "cockroach_cluster" "test" {
 	name           = "%s"
-	cloud_provider = "AWS"
+	cloud_provider = "GCP"
 	dedicated = {
 		storage_gib = 35
 		num_virtual_cpus = 4
 	}
 	regions = [{
-		name = "us-west-2"
+		name = "us-west2"
 		node_count: 1
 	}]
 }

diff --git a/internal/provider/maintenance_window_test.go b/internal/provider/maintenance_window_test.go
@@ -57,7 +57,7 @@ func TestIntegrationMaintenanceWindowResource(t *testing.T) {
 		Name:             clusterName,
 		CockroachVersion: "v22.2.0",
 		Plan:             "DEDICATED",
-		CloudProvider:    "AWS",
+		CloudProvider:    "GCP",
 		State:            "CREATED",
 		Config: client.ClusterConfig{
 			Dedicated: &client.DedicatedHardwareConfig{
@@ -69,7 +69,7 @@ func TestIntegrationMaintenanceWindowResource(t *testing.T) {
 		},
 		Regions: []client.Region{
 			{
-				Name:      "us-east-1",
+				Name:      "us-east1",
 				NodeCount: 3,
 			},
 		},
@@ -153,13 +153,13 @@ func getTestMaintenanceWindowResourceCreateConfig(name string) string {
 	return fmt.Sprintf(`
 resource "cockroach_cluster" "test" {
   name           = "%s"
-  cloud_provider = "AWS"
+  cloud_provider = "GCP"
   dedicated = {
     storage_gib  = 35
   	num_virtual_cpus = 4
   }
   regions = [{
-    name = "us-east-1"
+    name = "us-east1"
     node_count: 3
   }]
 }
@@ -176,13 +176,13 @@ func getTestMaintenanceWindowResourceUpdateConfig(name string) string {
 	return fmt.Sprintf(`
 resource "cockroach_cluster" "test" {
   name           = "%s"
-  cloud_provider = "AWS"
+  cloud_provider = "GCP"
   dedicated = {
     storage_gib  = 35
   	num_virtual_cpus = 4
   }
   regions = [{
-    name = "us-east-1"
+    name = "us-east1"
     node_count: 3
   }]
 }

diff --git a/internal/provider/private_endpoint_services_resource_test.go b/internal/provider/private_endpoint_services_resource_test.go
@@ -79,7 +79,7 @@ func TestIntegrationPrivateEndpointServicesResource(t *testing.T) {
 				State: "CREATED",
 				Regions: []client.Region{
 					{
-						Name:      "ap-south-1",
+						Name:      "us-east-1",
 						NodeCount: 1,
 					},
 				},
@@ -224,7 +224,7 @@ resource "cockroach_cluster" "dedicated" {
 	  num_virtual_cpus = 2
     }
 	regions = [{
-		name: "ap-south-1"
+		name: "us-east-1"
 		node_count: 1
 	}]
 }

diff --git a/internal/provider/version_deferral_test.go b/internal/provider/version_deferral_test.go
@@ -54,7 +54,7 @@ func TestIntegrationVersionDeferralResource(t *testing.T) {
 		Name:             clusterName,
 		CockroachVersion: "v22.2.0",
 		Plan:             "DEDICATED",
-		CloudProvider:    "AWS",
+		CloudProvider:    "GCP",
 		State:            "CREATED",
 		Config: client.ClusterConfig{
 			Dedicated: &client.DedicatedHardwareConfig{
@@ -66,7 +66,7 @@ func TestIntegrationVersionDeferralResource(t *testing.T) {
 		},
 		Regions: []client.Region{
 			{
-				Name:      "us-east-1",
+				Name:      "us-east1",
 				NodeCount: 3,
 			},
 		},
@@ -149,13 +149,13 @@ func getTestVersionDeferralResourceCreateConfig(name string) string {
 	return fmt.Sprintf(`
 resource "cockroach_cluster" "test" {
   name           = "%s"
-  cloud_provider = "AWS"
+  cloud_provider = "GCP"
   dedicated = {
     storage_gib  = 35
   	num_virtual_cpus = 4
   }
   regions = [{
-    name = "us-east-1"
+    name = "us-east1"
     node_count: 3
   }]
 }
@@ -170,13 +170,13 @@ func getTestVersionDeferralResourceUpdateConfig(name string) string {
 	return fmt.Sprintf(`
 resource "cockroach_cluster" "test" {
   name           = "%s"
-  cloud_provider = "AWS"
+  cloud_provider = "GCP"
   dedicated = {
     storage_gib  = 35
   	num_virtual_cpus = 4
   }
   regions = [{
-    name = "us-east-1"
+    name = "us-east1"
     node_count: 3
   }]
 }