fix: extend the required terraform version to < 1.7 (#466)

terraform-ibm-modules · Feb 28, 2024 · bbd304a · bbd304a
1 parent f49c9d5
commit bbd304a
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ module "tg_gateway_connection" {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0, <1.6.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0, <1.7.0 |
 | <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.52.0, < 2.0.0 |
 
 ### Modules

diff --git a/common-dev-assets b/common-dev-assets
diff --git a/examples/basic/versions.tf b/examples/basic/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.0.0, <1.6.0"
+  required_version = ">= 1.0.0, <1.7.0"
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"

diff --git a/examples/crossaccounts/versions.tf b/examples/crossaccounts/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.0.0, <1.6.0"
+  required_version = ">= 1.0.0, <1.7.0"
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"

diff --git a/examples/two-vpcs/versions.tf b/examples/two-vpcs/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.0.0, <1.6.0"
+  required_version = ">= 1.0.0, <1.7.0"
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"

diff --git a/modules/terraform-ibm-transit-gateway-action/README.md b/modules/terraform-ibm-transit-gateway-action/README.md
@@ -39,7 +39,7 @@ module "tg_gateway_connection_crossaccounts_approve" {
 
 | Name | Version |
 |------|---------|
-| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0, <1.6.0 |
+| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0, <1.7.0 |
 | <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | >= 1.52.0, < 2.0.0 |
 
 ### Modules

diff --git a/modules/terraform-ibm-transit-gateway-action/versions.tf b/modules/terraform-ibm-transit-gateway-action/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.0.0, <1.6.0"
+  required_version = ">= 1.0.0, <1.7.0"
   required_providers {
     # Use "greater than or equal to" range in modules
     ibm = {

diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -8,7 +8,6 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/cloudinfo"
 	"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/common"
 	"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testhelper"
@@ -82,47 +81,47 @@ func setupOptions2VpcsExample(t *testing.T, prefix string) *testhelper.TestOptio
 	return options
 }
 
-func setupOptionsCrossaccountsExample(t *testing.T, prefix string) *testhelper.TestOptions {
-	const TwoVpcsExampleTerraformDir = "examples/crossaccounts"
-
-	// loading and setting apikeys to perform the test
-	// from TF_VAR_ibmcloud_api_key and TF_VAR_ibmcloud_api_key_ext env variables
-	// to TF_VAR_ibmcloud_api_key_account_a and TF_VAR_ibmcloud_api_key_account_b env variables
-	ibmCloudApiKeyAEnvVarName := "TF_VAR_ibmcloud_api_key"
-	ibmCloudApiKeyA := ""
-	valA, presentA := os.LookupEnv(ibmCloudApiKeyAEnvVarName)
-	require.True(t, presentA)
-	ibmCloudApiKeyA = valA
-	ibmCloudApiKeyBEnvVarName := "TF_VAR_ibmcloud_api_key_ext"
-	ibmCloudApiKeyB := ""
-	valB, presentB := os.LookupEnv(ibmCloudApiKeyBEnvVarName)
-	require.True(t, presentB)
-	ibmCloudApiKeyB = valB
-	os.Setenv("TF_VAR_ibmcloud_api_key_account_a", ibmCloudApiKeyA)
-	os.Setenv("TF_VAR_ibmcloud_api_key_account_b", ibmCloudApiKeyB)
-
-	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
-		Testing:       t,
-		Prefix:        prefix,
-		TerraformDir:  TwoVpcsExampleTerraformDir,
-		ResourceGroup: resourceGroup,
-	})
-	const ibmcloudApiKeyVar = "TF_VAR_ibmcloud_api_key"
-
-	options.TerraformVars = map[string]interface{}{
-		"transit_gateway_name": fmt.Sprintf("%s-%s", options.Prefix, "crosstg"),
-		// using the same region of the target account
-		"region_account_a": permanentResources["gestaging_vpc_region"],
-		"region_account_b": permanentResources["gestaging_vpc_region"],
-		"prefix_account_a": fmt.Sprintf("%s-%s", options.Prefix, "a"),
-		// using existing vpc crn
-		"existing_vpc_crn_account_b": permanentResources["gestaging_vpc_crn"],
-		"resource_group_account_a":   options.ResourceGroup,
-		"resource_group_account_b":   permanentResources["gestaging_rg"],
-	}
-
-	return options
-}
+// func setupOptionsCrossaccountsExample(t *testing.T, prefix string) *testhelper.TestOptions {
+// 	const TwoVpcsExampleTerraformDir = "examples/crossaccounts"
+
+// 	// loading and setting apikeys to perform the test
+// 	// from TF_VAR_ibmcloud_api_key and TF_VAR_ibmcloud_api_key_ext env variables
+// 	// to TF_VAR_ibmcloud_api_key_account_a and TF_VAR_ibmcloud_api_key_account_b env variables
+// 	ibmCloudApiKeyAEnvVarName := "TF_VAR_ibmcloud_api_key"
+// 	ibmCloudApiKeyA := ""
+// 	valA, presentA := os.LookupEnv(ibmCloudApiKeyAEnvVarName)
+// 	require.True(t, presentA)
+// 	ibmCloudApiKeyA = valA
+// 	ibmCloudApiKeyBEnvVarName := "TF_VAR_ibmcloud_api_key_ext"
+// 	ibmCloudApiKeyB := ""
+// 	valB, presentB := os.LookupEnv(ibmCloudApiKeyBEnvVarName)
+// 	require.True(t, presentB)
+// 	ibmCloudApiKeyB = valB
+// 	os.Setenv("TF_VAR_ibmcloud_api_key_account_a", ibmCloudApiKeyA)
+// 	os.Setenv("TF_VAR_ibmcloud_api_key_account_b", ibmCloudApiKeyB)
+
+// 	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
+// 		Testing:       t,
+// 		Prefix:        prefix,
+// 		TerraformDir:  TwoVpcsExampleTerraformDir,
+// 		ResourceGroup: resourceGroup,
+// 	})
+// 	const ibmcloudApiKeyVar = "TF_VAR_ibmcloud_api_key"
+
+// 	options.TerraformVars = map[string]interface{}{
+// 		"transit_gateway_name": fmt.Sprintf("%s-%s", options.Prefix, "crosstg"),
+// 		// using the same region of the target account
+// 		"region_account_a": permanentResources["gestaging_vpc_region"],
+// 		"region_account_b": permanentResources["gestaging_vpc_region"],
+// 		"prefix_account_a": fmt.Sprintf("%s-%s", options.Prefix, "a"),
+// 		// using existing vpc crn
+// 		"existing_vpc_crn_account_b": permanentResources["gestaging_vpc_crn"],
+// 		"resource_group_account_a":   options.ResourceGroup,
+// 		"resource_group_account_b":   permanentResources["gestaging_rg"],
+// 	}
+
+// 	return options
+// }
 
 func TestRunBasicExample(t *testing.T) {
 	t.Parallel()

diff --git a/versions.tf b/versions.tf
@@ -1,5 +1,5 @@
 terraform {
-  required_version = ">= 1.0.0, <1.6.0"
+  required_version = ">= 1.0.0, <1.7.0"
   required_providers {
     # Use "greater than or equal to" range in modules
     ibm = {
+7 −0		.github/workflows/ci.yml
+6 −0		common-go-assets/common-permanent-resources.yaml
+19 −0		examples/Dockerfile
+2 −0		examples/Readme.md
+9 −0		examples/mock_tf_code/main.tf
+10 −0		examples/mock_tf_code/outputs.tf
+4 −0		examples/mock_tf_code/provider.tf
+28 −0		examples/mock_tf_code/variables.tf
+9 −0		examples/mock_tf_code/version.tf
+9 −6		module-assets/.pre-commit-config.yaml
+1 −1		module-assets/ci/golangci-lint.sh
+88 −73		module-assets/ci/install-deps.sh
+8 −0		module-assets/ci/run-tests.sh
+1 −1		scripts/update-source/requirements.txt
+1 −0		tests/Readme.md
+3 −0		tests/go.mod
+0 −0		tests/go.sum
+43 −0		tests/sample.go