From 5802af617e0235ddce0b5b985350a5867265dc80 Mon Sep 17 00:00:00 2001 From: ocofaigh Date: Fri, 14 Jun 2024 12:09:03 +0100 Subject: [PATCH 1/2] test: remove workaround --- tests/pr_test.go | 3 --- tests/resources/main.tf | 13 +++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/tests/pr_test.go b/tests/pr_test.go index 15f455f..154e461 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -163,8 +163,6 @@ func TestRunDAManage(t *testing.T) { return } - // Workaround for https://github.com/terraform-ibm-modules/terraform-ibm-mas/issues/78 - // defer terraform.Destroy(t, preReqOptions) defer func() { // Check if "DO_NOT_DESTROY_ON_FAILURE" is set envVal, _ := os.LookupEnv("DO_NOT_DESTROY_ON_FAILURE") @@ -173,7 +171,6 @@ func TestRunDAManage(t *testing.T) { if options.Testing.Failed() && strings.ToLower(envVal) == "true" { fmt.Println("Terratest failed. Debug the Test and delete resources manually.") } else { - terraform.RunTerraformCommand(t, preReqOptions, "state", "rm", "module.landing_zone.module.landing_zone.ibm_resource_group.resource_groups[\"workload-rg\"]") terraform.Destroy(t, preReqOptions) } }() diff --git a/tests/resources/main.tf b/tests/resources/main.tf index ece0de6..d88360f 100644 --- a/tests/resources/main.tf +++ b/tests/resources/main.tf @@ -3,10 +3,11 @@ ############################################################################## module "landing_zone" { - source = "terraform-ibm-modules/landing-zone/ibm//patterns//roks//module" - version = "5.22.0" - region = var.region - prefix = var.prefix - tags = var.resource_tags - override = true + source = "terraform-ibm-modules/landing-zone/ibm//patterns//roks//module" + version = "5.24.5" + region = var.region + prefix = var.prefix + tags = var.resource_tags + cluster_force_delete_storage = true # delete sotrage created by tests + override = true } From ba7577c700576bd3561204346a86076c5d2e784a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Conall=20=C3=93=20Cofaigh?= Date: Thu, 20 Jun 2024 09:31:14 +0100 Subject: [PATCH 2/2] Update main.tf --- tests/resources/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/resources/main.tf b/tests/resources/main.tf index d88360f..5dc7f9e 100644 --- a/tests/resources/main.tf +++ b/tests/resources/main.tf @@ -4,7 +4,7 @@ module "landing_zone" { source = "terraform-ibm-modules/landing-zone/ibm//patterns//roks//module" - version = "5.24.5" + version = "5.24.7" region = var.region prefix = var.prefix tags = var.resource_tags