From 3da389f927f4f2e0dbf3cbe7fb897b6c2887fd9f Mon Sep 17 00:00:00 2001
From: Leonardo Henrique Romanini <leonardo.romanini@ciandt.com>
Date: Thu, 24 Oct 2024 11:23:47 -0300
Subject: [PATCH] Add a retry

---
 .../modules/bootstrap-kms-hsm/cloudbuild.tf   |  1 +
 .../apache_web_server_test.go                 | 23 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/oss-terraform-automation/common/modules/bootstrap-kms-hsm/cloudbuild.tf b/oss-terraform-automation/common/modules/bootstrap-kms-hsm/cloudbuild.tf
index 8f9b973..22dad94 100644
--- a/oss-terraform-automation/common/modules/bootstrap-kms-hsm/cloudbuild.tf
+++ b/oss-terraform-automation/common/modules/bootstrap-kms-hsm/cloudbuild.tf
@@ -28,6 +28,7 @@ resource "null_resource" "pkcs11_docker_image_build_template" {
   provisioner "local-exec" {
     when    = create
     command = <<EOF
+    gcloud builds submit --project=${var.project_id} --config=${path.module}/cloudbuild.yaml --impersonate-service-account=${local.custom_sa_email} --substitutions=_LOCATION="${var.artifact_location}",_REPOSITORY="${var.artifact_repository}-${local.default_suffix}",_IMAGE="${var.artifact_image}",_VERSION="${var.artifact_version}",_KMS_KEYRING="${var.keyring}-${local.default_suffix}",_KMS_KEY="${var.key}-${local.default_suffix}",_KMS_LOCATION="${var.location}",_PKCS11_LIB_VERSION="${var.pkcs11_lib_version}",_SERVICE_ACCOUNT="${local.custom_sa_email}",_CERTIFICATE_FILE="${local.certificate_file_string}",_DIGEST_FLAG="${var.digest_flag}",_CERTIFICATE_NAME="${var.certificate_name}" ${var.docker_file_path} || sleep 45 &&
     gcloud builds submit --project=${var.project_id} --config=${path.module}/cloudbuild.yaml --impersonate-service-account=${local.custom_sa_email} --substitutions=_LOCATION="${var.artifact_location}",_REPOSITORY="${var.artifact_repository}-${local.default_suffix}",_IMAGE="${var.artifact_image}",_VERSION="${var.artifact_version}",_KMS_KEYRING="${var.keyring}-${local.default_suffix}",_KMS_KEY="${var.key}-${local.default_suffix}",_KMS_LOCATION="${var.location}",_PKCS11_LIB_VERSION="${var.pkcs11_lib_version}",_SERVICE_ACCOUNT="${local.custom_sa_email}",_CERTIFICATE_FILE="${local.certificate_file_string}",_DIGEST_FLAG="${var.digest_flag}",_CERTIFICATE_NAME="${var.certificate_name}" ${var.docker_file_path}
     EOF
   }
diff --git a/test/integration/oss-apache-web-server/apache_web_server_test.go b/test/integration/oss-apache-web-server/apache_web_server_test.go
index dc7382d..d642c68 100644
--- a/test/integration/oss-apache-web-server/apache_web_server_test.go
+++ b/test/integration/oss-apache-web-server/apache_web_server_test.go
@@ -18,7 +18,6 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/gcloud"
 	"github.com/GoogleCloudPlatform/cloud-foundation-toolkit/infra/blueprint-test/pkg/tft"
 	"github.com/gruntwork-io/terratest/modules/shell"
 	"github.com/stretchr/testify/assert"
@@ -27,18 +26,18 @@ import (
 func TestFakeApacheWebServerModule(t *testing.T) {
 	apacheT := tft.NewTFBlueprintTest(t)
 
-	apacheT.DefineApply(func(assert *assert.Assertions) {
-		apacheT.DefaultApply(assert)
+	// apacheT.DefineApply(func(assert *assert.Assertions) {
+	// 	apacheT.DefaultApply(assert)
 
-		projectId := apacheT.GetTFSetupJsonOutput("project_id")
-		t.Cleanup(func() {
-			logsCmd := fmt.Sprintf("logging read --project=%s", projectId.Str)
-			logs := gcloud.Runf(t, logsCmd).Array()
-			for _, log := range logs {
-				t.Logf("%s build-log: %s", projectId.Str, log.Get("textPayload").String())
-			}
-		})
-	})
+	// 	projectId := apacheT.GetTFSetupJsonOutput("project_id")
+	// 	t.Cleanup(func() {
+	// 		logsCmd := fmt.Sprintf("logging read --project=%s", projectId.Str)
+	// 		logs := gcloud.Runf(t, logsCmd).Array()
+	// 		for _, log := range logs {
+	// 			t.Logf("%s build-log: %s", projectId.Str, log.Get("textPayload").String())
+	// 		}
+	// 	})
+	// })
 
 	apacheT.DefineVerify(func(assert *assert.Assertions) {
 		apacheT.DefaultVerify(assert)