From 01c38e2bd587bf517e398f1b38482ba946e872f0 Mon Sep 17 00:00:00 2001 From: Arthur de Lapertosa Lisboa Date: Thu, 6 Feb 2025 13:49:06 -0300 Subject: [PATCH] code review changes --- build/int.cloudbuild.yaml | 15 +++++++++++++++ examples/confidential_safer_cluster/network.tf | 3 ++- examples/confidential_safer_cluster/versions.tf | 2 +- .../confidential_safer_cluster_test.go | 1 + 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/build/int.cloudbuild.yaml b/build/int.cloudbuild.yaml index 6a9d7d0c24..9e6f3a74f5 100644 --- a/build/int.cloudbuild.yaml +++ b/build/int.cloudbuild.yaml @@ -471,6 +471,21 @@ steps: - verify simple-fleet-app-operator-permissions name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' args: ['/bin/bash', '-c', 'cft test run TestSimpleFleetAppOperatorPermissions --stage teardown --verbose'] +- id: apply test-confidential-safer-cluster + waitFor: + - create-all + name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' + args: ['/bin/bash', '-c', 'cft test run TestConfidentialSaferCluster --stage apply --verbose'] +- id: verify test-confidential-safer-cluster + waitFor: + - apply test-confidential-safer-cluster + name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' + args: ['/bin/bash', '-c', 'cft test run TestConfidentialSaferCluster --stage verify --verbose'] +- id: teardown test-confidential-safer-cluster + waitFor: + - verify test-confidential-safer-cluster + name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS' + args: ['/bin/bash', '-c', 'cft test run TestConfidentialSaferCluster --stage teardown --verbose'] tags: - 'ci' - 'integration' diff --git a/examples/confidential_safer_cluster/network.tf b/examples/confidential_safer_cluster/network.tf index e033a6484f..60ad7e5a8e 100644 --- a/examples/confidential_safer_cluster/network.tf +++ b/examples/confidential_safer_cluster/network.tf @@ -16,10 +16,11 @@ module "gcp-network" { source = "terraform-google-modules/network/google" - version = ">= 7.5" + version = "~> 10.0" project_id = var.project_id network_name = local.network_name + routing_mode = "GLOBAL" subnets = [ { diff --git a/examples/confidential_safer_cluster/versions.tf b/examples/confidential_safer_cluster/versions.tf index 26da9d513c..9cb767a518 100644 --- a/examples/confidential_safer_cluster/versions.tf +++ b/examples/confidential_safer_cluster/versions.tf @@ -15,7 +15,7 @@ */ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/test/integration/confidential_safer_cluster/confidential_safer_cluster_test.go b/test/integration/confidential_safer_cluster/confidential_safer_cluster_test.go index 6f0c828b3a..f6be23d5de 100644 --- a/test/integration/confidential_safer_cluster/confidential_safer_cluster_test.go +++ b/test/integration/confidential_safer_cluster/confidential_safer_cluster_test.go @@ -32,6 +32,7 @@ func TestConfidentialSaferCluster(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) + testutils.TGKEVerify(t, bpt, assert) projectId := bpt.GetStringOutput("project_id") location := bpt.GetStringOutput("location")