chore(CI): add autopilot DefaultVerify (#2153)

apeabody · web-flow · commit f3e2e59f1116 · 2024-10-28T23:36:02.000Z
diff --git a/examples/autopilot_private_firewalls/network.tf b/examples/autopilot_private_firewalls/network.tf
@@ -23,9 +23,10 @@ module "gcp-network" {
 
   subnets = [
     {
-      subnet_name   = local.subnet_name
-      subnet_ip     = "10.0.0.0/17"
-      subnet_region = var.region
+      subnet_name           = local.subnet_name
+      subnet_ip             = "10.0.0.0/17"
+      subnet_region         = var.region
+      subnet_private_access = true
     },
     {
       subnet_name   = local.master_auth_subnetwork
diff --git a/examples/simple_autopilot_public/network.tf b/examples/simple_autopilot_public/network.tf
@@ -23,9 +23,10 @@ module "gcp-network" {
 
   subnets = [
     {
-      subnet_name   = local.subnet_name
-      subnet_ip     = "10.0.0.0/17"
-      subnet_region = var.region
+      subnet_name           = local.subnet_name
+      subnet_ip             = "10.0.0.0/17"
+      subnet_region         = var.region
+      subnet_private_access = true
     },
     {
       subnet_name   = local.master_auth_subnetwork
diff --git a/test/integration/autopilot_private_firewalls/autopilot_private_firewalls_test.go b/test/integration/autopilot_private_firewalls/autopilot_private_firewalls_test.go
@@ -26,8 +26,7 @@ import (
 func TestAutopilotPrivateFirewalls(t *testing.T) {
 	bpt := tft.NewTFBlueprintTest(t)
 	bpt.DefineVerify(func(assert *assert.Assertions) {
-		//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token
-		// bpt.DefaultVerify(assert)
+		bpt.DefaultVerify(assert)
 		projectId := bpt.GetStringOutput("project_id")
 		location := bpt.GetStringOutput("location")
 		clusterName := bpt.GetStringOutput("cluster_name")
diff --git a/test/integration/simple_autopilot_private_non_default_sa/simple_autopilot_private_non_default_sa_test.go b/test/integration/simple_autopilot_private_non_default_sa/simple_autopilot_private_non_default_sa_test.go
@@ -33,8 +33,7 @@ func TestSimpleAutopilotPrivateNonDefaultSA(t *testing.T) {
 	)
 
 	bpt.DefineVerify(func(assert *assert.Assertions) {
-		//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token
-		// bpt.DefaultVerify(assert)
+		bpt.DefaultVerify(assert)
 
 		location := bpt.GetStringOutput("location")
 		clusterName := bpt.GetStringOutput("cluster_name")
diff --git a/test/integration/simple_autopilot_public/simple_autopiliot_public_test.go b/test/integration/simple_autopilot_public/simple_autopiliot_public_test.go
@@ -30,8 +30,7 @@ func TestSimpleAutopilotPublic(t *testing.T) {
 	)
 
 	bpt.DefineVerify(func(assert *assert.Assertions) {
-		//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token
-		// bpt.DefaultVerify(assert)
+		bpt.DefaultVerify(assert)
 
 		projectId := bpt.GetStringOutput("project_id")
 		location := bpt.GetStringOutput("location")

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,10 @@ module "gcp-network" {`
`23`	`23`
`24`	`24`	`subnets = [`
`25`	`25`	`{`
`26`		`- subnet_name = local.subnet_name`
`27`		`- subnet_ip = "10.0.0.0/17"`
`28`		`- subnet_region = var.region`
	`26`	`+ subnet_name = local.subnet_name`
	`27`	`+ subnet_ip = "10.0.0.0/17"`
	`28`	`+ subnet_region = var.region`
	`29`	`+ subnet_private_access = true`
`29`	`30`	`},`
`30`	`31`	`{`
`31`	`32`	`subnet_name = local.master_auth_subnetwork`
Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@ func TestSimpleAutopilotPrivateNonDefaultSA(t *testing.T) {`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`bpt.DefineVerify(func(assert *assert.Assertions) {`
`36`		`- //Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token`
`37`		`- // bpt.DefaultVerify(assert)`
	`36`	`+ bpt.DefaultVerify(assert)`
`38`	`37`
`39`	`38`	`location := bpt.GetStringOutput("location")`
`40`	`39`	`clusterName := bpt.GetStringOutput("cluster_name")`
Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ func TestSimpleAutopilotPublic(t *testing.T) {`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`bpt.DefineVerify(func(assert *assert.Assertions) {`
`33`		`- //Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token`
`34`		`- // bpt.DefaultVerify(assert)`
	`33`	`+ bpt.DefaultVerify(assert)`
`35`	`34`
`36`	`35`	`projectId := bpt.GetStringOutput("project_id")`
`37`	`36`	`location := bpt.GetStringOutput("location")`