ci: update tests, enable upgrade test (#519)

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.3.0"
+  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.5.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/main.tf

@@ -1,5 +1,5 @@
 module "terraform_devsecops_alm" {
-  source                            = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.3.0"
+  source                            = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.5.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/main.tf

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

tests/other_test.go

@@ -18,9 +18,7 @@ func TestRunNonDefaultExample(t *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",
-				"module.terraform_devsecops_alm.module.devsecops_cd_toolchain[0].module.integrations.ibm_cd_toolchain_tool_securitycompliance.scc_tool[0]",
-				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.integrations.ibm_cd_toolchain_tool_securitycompliance.scc_tool[0]",
+				"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{}{

tests/pr_test.go

@@ -22,9 +22,7 @@ func TestRunDefaultExample(t *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",
-				"module.terraform_devsecops_alm.module.devsecops_cd_toolchain[0].module.integrations.ibm_cd_toolchain_tool_securitycompliance.scc_tool[0]",
-				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.integrations.ibm_cd_toolchain_tool_securitycompliance.scc_tool[0]",
+				"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{}{
@@ -46,9 +44,7 @@ func TestRunAppExample(t *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",
-				"module.terraform_devsecops_alm.module.devsecops_cd_toolchain[0].module.integrations.ibm_cd_toolchain_tool_securitycompliance.scc_tool[0]",
-				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.integrations.ibm_cd_toolchain_tool_securitycompliance.scc_tool[0]",
+				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.pipeline_cc.ibm_cd_tekton_pipeline_trigger.cc_pipeline_timed_trigger[0]",
 			},
 		},
 	})
@@ -66,9 +62,7 @@ func TestRunKPExample(t *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",
-				"module.terraform_devsecops_alm.module.devsecops_cd_toolchain[0].module.integrations.ibm_cd_toolchain_tool_securitycompliance.scc_tool[0]",
-				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.integrations.ibm_cd_toolchain_tool_securitycompliance.scc_tool[0]",
+				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.pipeline_cc.ibm_cd_tekton_pipeline_trigger.cc_pipeline_timed_trigger[0]",
 			},
 		},
 	})
@@ -82,13 +76,20 @@ func TestRunUpgradeExample(t *testing.T) {
 	t.Parallel()
 
 	// TODO: Remove this line after the first merge to primary branch is complete to enable upgrade test
-	t.Skip("Skipping upgrade test until initial code is in primary branch")
+	//t.Skip("Skipping upgrade test until initial code is in primary branch")
 
 	options := testhelper.TestOptionsDefault(&testhelper.TestOptions{
 		Testing:      t,
 		TerraformDir: defaultExampleTerraformDir,
 		IgnoreUpdates: testhelper.Exemptions{ // Ignore for consistency check
-			List: []string{},
+			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.
+			List: []string{
+				"module.terraform_devsecops_alm.random_string.webhook_secret[0]",
+			},
 		},
 	})