ci: update tests (#587)

Author: huayuenh

examples/default/main.tf

@@ -1,5 +1,5 @@
 module "terraform_devsecops_alm" {
-  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.7.0"
+  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.8.0"
   ibmcloud_api_key         = var.ibmcloud_api_key
   toolchain_resource_group = var.toolchain_resource_group
   toolchain_region         = var.toolchain_region

examples/default/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "= 1.70.0"
+      version = "= 1.79.1"
     }
   }
 }

examples/devsecops-ci-toolchain-bring-your-own-app/main.tf

@@ -1,5 +1,5 @@
 module "terraform_devsecops_alm" {
-  source                            = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.7.0"
+  source                            = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.8.0"
   ibmcloud_api_key                  = var.ibmcloud_api_key
   toolchain_resource_group          = var.toolchain_resource_group
   toolchain_region                  = var.toolchain_region

examples/devsecops-ci-toolchain-bring-your-own-app/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "= 1.70.0"
+      version = "= 1.79.1"
     }
   }
 }

examples/devsecops-ci-toolchain-with-key-protect/main.tf

@@ -1,5 +1,5 @@
 module "terraform_devsecops_alm" {
-  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.7.0"
+  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.8.0"
   ibmcloud_api_key         = var.ibmcloud_api_key
   toolchain_resource_group = var.toolchain_resource_group
   toolchain_region         = var.toolchain_region

examples/devsecops-ci-toolchain-with-key-protect/version.tf

@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "= 1.70.0"
+      version = "= 1.79.1"
     }
   }
 }

tests/other_test.go

@@ -16,11 +16,6 @@ func TestRunNonDefaultExample(t *testing.T) {
 	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
 		Testing:      t,
 		TerraformDir: nonDefaultExampleTerraformDir,
-		IgnoreUpdates: testhelper.Exemptions{ // Ignore for consistency check
-			List: []string{
-				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.pipeline_cc.ibm_cd_tekton_pipeline_trigger.cc_pipeline_timed_trigger[0]",
-			},
-		},
 		TerraformVars: map[string]interface{}{
 			"enable_secrets_manager": false,
 			"enable_key_protect":     false,

tests/pr_test.go

@@ -20,11 +20,6 @@ func TestRunDefaultExample(t *testing.T) {
 	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
 		Testing:      t,
 		TerraformDir: defaultExampleTerraformDir,
-		IgnoreUpdates: testhelper.Exemptions{ // Ignore for consistency check
-			List: []string{
-				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.pipeline_cc.ibm_cd_tekton_pipeline_trigger.cc_pipeline_timed_trigger[0]",
-			},
-		},
 		TerraformVars: map[string]interface{}{
 			"enable_secrets_manager": false,
 			"enable_key_protect":     false,
@@ -42,11 +37,6 @@ func TestRunAppExample(t *testing.T) {
 	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
 		Testing:      t,
 		TerraformDir: appExampleDir,
-		IgnoreUpdates: testhelper.Exemptions{ // Ignore for consistency check
-			List: []string{
-				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.pipeline_cc.ibm_cd_tekton_pipeline_trigger.cc_pipeline_timed_trigger[0]",
-			},
-		},
 	})
 
 	output, err := options.RunTestConsistency()
@@ -60,11 +50,6 @@ func TestRunKPExample(t *testing.T) {
 	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
 		Testing:      t,
 		TerraformDir: kpExampleDir,
-		IgnoreUpdates: testhelper.Exemptions{ // Ignore for consistency check
-			List: []string{
-				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.pipeline_cc.ibm_cd_tekton_pipeline_trigger.cc_pipeline_timed_trigger[0]",
-			},
-		},
 	})
 
 	output, err := options.RunTestConsistency()
@@ -81,14 +66,11 @@ func TestRunUpgradeExample(t *testing.T) {
 	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
 		Testing:      t,
 		TerraformDir: defaultExampleTerraformDir,
-		IgnoreUpdates: testhelper.Exemptions{ // Ignore for consistency check
-			List: []string{
-				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.pipeline_cc.ibm_cd_tekton_pipeline_trigger.cc_pipeline_timed_trigger[0]",
-			},
-		},
-		IgnoreDestroys: testhelper.Exemptions{ // Terraform resource created but unused. Needs to be destroyed. Can remove exemption in subsequent release.
+		IgnoreDestroys: testhelper.Exemptions{ // Terraform resource custom cos tool being replaced by dedicated cos tool integration. Can remove in subsequent release
 			List: []string{
-				"module.terraform_devsecops_alm.random_string.webhook_secret[0]",
+				"module.terraform_devsecops_alm.module.devsecops_ci_toolchain[0].module.integrations.ibm_cd_toolchain_tool_custom.cos_integration[0]",
+				"module.terraform_devsecops_alm.module.devsecops_cd_toolchain[0].module.integrations.ibm_cd_toolchain_tool_custom.cos_integration[0]",
+				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.integrations.ibm_cd_toolchain_tool_custom.cos_integration[0]",
 			},
 		},
 	})