fix(deps): update terraform github.com/terraform-ibm-modules/terrafor…

…m-ibm-landing-zone to v6.2.1 (#33)
terraform-ibm-modules · Oct 29, 2024 · 43412d9 · 43412d9
1 parent b891793
commit 43412d9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/solutions/e2e/README.md b/solutions/e2e/README.md
@@ -115,7 +115,7 @@ statement instead the previous block.
 |------|--------|---------|
 | <a name="module_app_tier_autoscale"></a> [app\_tier\_autoscale](#module\_app\_tier\_autoscale) | github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vsi-autoscale | v1.0.2 |
 | <a name="module_data_tier_vsi"></a> [data\_tier\_vsi](#module\_data\_tier\_vsi) | terraform-ibm-modules/landing-zone-vsi/ibm | 4.2.0 |
-| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi/module | v6.1.2 |
+| <a name="module_landing_zone"></a> [landing\_zone](#module\_landing\_zone) | git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi/module | v6.2.1 |
 | <a name="module_private_secret_engine"></a> [private\_secret\_engine](#module\_private\_secret\_engine) | terraform-ibm-modules/secrets-manager-private-cert-engine/ibm | 1.3.3 |
 | <a name="module_secrets_manager_group"></a> [secrets\_manager\_group](#module\_secrets\_manager\_group) | terraform-ibm-modules/secrets-manager-secret-group/ibm | 1.2.2 |
 | <a name="module_secrets_manager_private_certificate"></a> [secrets\_manager\_private\_certificate](#module\_secrets\_manager\_private\_certificate) | terraform-ibm-modules/secrets-manager-private-cert/ibm | 1.3.1 |

diff --git a/solutions/e2e/main.tf b/solutions/e2e/main.tf
@@ -7,7 +7,7 @@
 ##############################################################################
 
 module "landing_zone" {
-  source               = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi/module?ref=v6.1.2"
+  source               = "git::https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone.git//patterns/vsi/module?ref=v6.2.1"
   prefix               = var.prefix
   region               = var.region
   ssh_public_key       = var.ssh_key

diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -14,6 +14,10 @@ import (
 
 const defaultExampleTerraformDir = "solutions/e2e"
 
+// Need to use different regions per test to ensure there is no clash in SSH keys as ssh key value has to be unique per VPC region
+const region1 = "us-south"
+const region2 = "us-east"
+
 var sharedInfoSvc *cloudinfo.CloudInfoService
 
 func TestMain(m *testing.M) {
@@ -26,22 +30,26 @@ func TestMain(m *testing.M) {
 	sshPrivateKey := "<<EOF\n" + rsaKeyPair.PrivateKey + "EOF"
 	os.Setenv("TF_VAR_ssh_key", sshPublicKey)
 	os.Setenv("TF_VAR_ssh_private_key", sshPrivateKey)
+
+	// use trial instance for tests
+	os.Setenv("TF_VAR_sm_service_plan", "trial")
 	os.Exit(m.Run())
 }
 
-func setupOptions(t *testing.T, prefix string, dir string) *testhelper.TestOptions {
+func setupOptions(t *testing.T, prefix string, dir string, region string) *testhelper.TestOptions {
 	options := testhelper.TestOptionsDefaultWithVars(&testhelper.TestOptions{
 		Testing:      t,
 		TerraformDir: dir,
 		Prefix:       prefix,
+		Region:       region,
 	})
 	return options
 }
 
 func TestRunDefaultExample(t *testing.T) {
 	t.Parallel()
 
-	options := setupOptions(t, "webapp", defaultExampleTerraformDir)
+	options := setupOptions(t, "webapp", defaultExampleTerraformDir, region1)
 
 	output, err := options.RunTestConsistency()
 	assert.Nil(t, err, "This should not have errored")
@@ -51,7 +59,7 @@ func TestRunDefaultExample(t *testing.T) {
 func TestRunUpgradeExample(t *testing.T) {
 	t.Parallel()
 
-	options := setupOptions(t, "webapp-upg", defaultExampleTerraformDir)
+	options := setupOptions(t, "webapp-u", defaultExampleTerraformDir, region2)
 
 	output, err := options.RunTestUpgrade()
 	if !options.UpgradeTestSkipped {