fix: examples (#282)

terraform-ibm-modules · Oct 16, 2023 · a7c5dbf · a7c5dbf
1 parent 1fdcbf9
commit a7c5dbf
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 28 deletions.
diff --git a/examples/default/main.tf b/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=v1.1.0"
+  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.1.1"
   ibmcloud_api_key         = var.ibmcloud_api_key
   toolchain_resource_group = var.toolchain_resource_group
   toolchain_region         = var.toolchain_region

diff --git a/examples/default/version.tf b/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.55.0"
+      version = ">=1.57.0"
     }
   }
 }
diff --git a/examples/devsecops-ci-toolchain-bring-your-own-app/main.tf b/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=v1.1.0"
+  source                            = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.1.1"
   ibmcloud_api_key                  = var.ibmcloud_api_key
   toolchain_resource_group          = var.toolchain_resource_group
   toolchain_region                  = var.toolchain_region

diff --git a/examples/devsecops-ci-toolchain-bring-your-own-app/variables.tf b/examples/devsecops-ci-toolchain-bring-your-own-app/variables.tf
@@ -70,13 +70,13 @@ variable "create_ci_toolchain" {
 variable "create_cd_toolchain" {
   description = "Boolean flag which determines if the DevSecOps CD toolchain is created."
   type        = bool
-  default     = false
+  default     = true
 }
 
 variable "create_cc_toolchain" {
   description = "Boolean flag which determines if the DevSecOps CC toolchain is created."
   type        = bool
-  default     = false
+  default     = true
 }
 
 variable "ci_app_repo_clone_from_url" {

diff --git a/examples/devsecops-ci-toolchain-bring-your-own-app/version.tf b/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.55.0"
+      version = ">=1.57.0"
     }
   }
 }
diff --git a/examples/devsecops-ci-toolchain-with-key-protect/main.tf b/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=v1.1.0"
+  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.1.1"
   ibmcloud_api_key         = var.ibmcloud_api_key
   toolchain_resource_group = var.toolchain_resource_group
   toolchain_region         = var.toolchain_region

diff --git a/examples/devsecops-ci-toolchain-with-key-protect/variables.tf b/examples/devsecops-ci-toolchain-with-key-protect/variables.tf
@@ -70,11 +70,11 @@ variable "create_ci_toolchain" {
 variable "create_cd_toolchain" {
   description = "Boolean flag which determines if the DevSecOps CD toolchain is created."
   type        = bool
-  default     = false
+  default     = true
 }
 
 variable "create_cc_toolchain" {
   description = "Boolean flag which determines if the DevSecOps CC toolchain is created."
   type        = bool
-  default     = false
+  default     = true
 }
diff --git a/examples/devsecops-ci-toolchain-with-key-protect/version.tf b/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.55.0"
+      version = ">=1.57.0"
     }
   }
 }
diff --git a/module-metadata.json b/module-metadata.json
@@ -5673,14 +5673,12 @@
       }
     },
     "compliance_cc_toolchain_url": {
-      "name": "toolchain_url",
-      "description": "The CC toolchain URL.",
-      "value": "module.devsecops_cc_toolchain.toolchain_url",
+      "name": "compliance_cc_toolchain_url",
+      "description": "The Compliance CC Toolchain URL",
       "pos": {
         "filename": "outputs.tf",
         "line": 60
-      },
-      "type": "TypeString"
+      }
     },
     "compliance_cd_toolchain_id": {
       "name": "compliance_cd_toolchain_id",
@@ -5691,14 +5689,12 @@
       }
     },
     "compliance_cd_toolchain_url": {
-      "name": "toolchain_url",
-      "description": "The CD toolchain URL.",
-      "value": "module.devsecops_cd_toolchain.toolchain_url",
+      "name": "compliance_cd_toolchain_url",
+      "description": "The Compliance CD Toolchain URL",
       "pos": {
         "filename": "outputs.tf",
         "line": 55
-      },
-      "type": "TypeString"
+      }
     },
     "compliance_ci_toolchain_id": {
       "name": "compliance_ci_toolchain_id",
@@ -5709,14 +5705,12 @@
       }
     },
     "compliance_ci_toolchain_url": {
-      "name": "toolchain_url",
-      "description": "The CI toolchain URL.",
-      "value": "module.devsecops_ci_toolchain.toolchain_url",
+      "name": "compliance_ci_toolchain_url",
+      "description": "The Compliance CI Toolchain URL",
       "pos": {
         "filename": "outputs.tf",
         "line": 50
-      },
-      "type": "TypeString"
+      }
     },
     "evidence_repo_url": {
       "name": "evidence_repo_url",

diff --git a/outputs.tf b/outputs.tf
@@ -49,17 +49,17 @@ output "app_repo_url" {
 
 output "compliance_ci_toolchain_url" {
   description = "The Compliance CI Toolchain URL"
-  value       = module.devsecops_ci_toolchain[0].toolchain_url
+  value       = try(module.devsecops_ci_toolchain[0].toolchain_url, "")
 }
 
 output "compliance_cd_toolchain_url" {
   description = "The Compliance CD Toolchain URL"
-  value       = module.devsecops_cd_toolchain[0].toolchain_url
+  value       = try(module.devsecops_cd_toolchain[0].toolchain_url, "")
 }
 
 output "compliance_cc_toolchain_url" {
   description = "The Compliance CC Toolchain URL"
-  value       = module.devsecops_cc_toolchain[0].toolchain_url
+  value       = try(module.devsecops_cc_toolchain[0].toolchain_url, "")
 }
 
 output "ci_pipeline_id" {

diff --git a/tests/pr_test.go b/tests/pr_test.go
@@ -45,6 +45,7 @@ func TestRunAppExample(t *testing.T) {
 		IgnoreUpdates: testhelper.Exemptions{ // Ignore for consistency check
 			List: []string{
 				"module.terraform_devsecops_alm.module.devsecops_ci_toolchain[0].ibm_cd_toolchain.toolchain_instance",
+				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.pipeline_cc.ibm_cd_tekton_pipeline_trigger.cc_pipeline_timed_trigger",
 			},
 		},
 	})
@@ -63,6 +64,7 @@ func TestRunKPExample(t *testing.T) {
 		IgnoreUpdates: testhelper.Exemptions{ // Ignore for consistency check
 			List: []string{
 				"module.terraform_devsecops_alm.module.devsecops_ci_toolchain[0].ibm_cd_toolchain.toolchain_instance",
+				"module.terraform_devsecops_alm.module.devsecops_cc_toolchain[0].module.pipeline_cc.ibm_cd_tekton_pipeline_trigger.cc_pipeline_timed_trigger",
 			},
 		},
 	})