Merge branch 'main' into renovate/terraform-module

terraform-ibm-modules · May 2, 2023 · 4d46935 · 4d46935
2 parents 13314a6 + 6c4f9ca
commit 4d46935
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/examples/default/main.tf b/examples/default/main.tf
@@ -71,6 +71,15 @@ module "vpes" {
   cloud_services       = var.cloud_services
   cloud_service_by_crn = var.cloud_service_by_crn
   service_endpoints    = var.service_endpoints
+  #  Wait 30secs after security group is destroyed before destroying VPE to workaround timing issue which can produce “Target not found” error on destroy
+  depends_on = [time_sleep.wait_30_seconds]
 }
 
+resource "time_sleep" "wait_30_seconds" {
+  depends_on = [data.ibm_is_security_group.default_sg]
+
+  destroy_duration = "30s"
+}
+
+
 ##############################################################################
diff --git a/examples/default/versions.tf b/examples/default/versions.tf
@@ -10,6 +10,10 @@ terraform {
       source  = "IBM-Cloud/ibm"
       version = "1.51.0"
     }
+    time = {
+      source  = "hashicorp/time"
+      version = "0.9.1"
+    }
   }
 }
 

diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -13,7 +13,7 @@ const resourceGroup = "geretain-test-resources"
 const defaultExampleTerraformDir = "examples/default"
 
 func setupOptions(t *testing.T, prefix string, dir string) *testhelper.TestOptions {
-	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
+	options := testhelper.TestOptionsDefaultWithVars(&testhelper.TestOptions{
 		Testing:       t,
 		TerraformDir:  dir,
 		Prefix:        prefix,