fix: tests, upgrade ci module (#614)

Author: huayuenh

README.md

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

examples/default/main.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.79.1"
+      version = ">= 1.79.2, < 2.0.0"
     }
   }
 }

examples/default/version.tf

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

@@ -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.79.1"
+      version = ">= 1.79.2, < 2.0.0"
     }
   }
 }

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

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

@@ -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.79.1"
+      version = ">= 1.79.2, < 2.0.0"
     }
   }
 }

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

@@ -1,6 +1,6 @@
 # workaround for Schematics automatically setting a null value to false for bool type
 # Issue for the enable_key_protect and enable_secrets_manager inputs as the logic fails with regard to
-# determing whether to use the enable_secrets_manager or the toolchain specific counter parts ci/cd/cc_enable_secrets_manager
+# determining whether to use the enable_secrets_manager or the toolchain specific counter parts ci/cd/cc_enable_secrets_manager
 # this could be addressed manually by ticking a setting in Schematics for each of the inputs
 locals {
 
@@ -332,7 +332,7 @@ module "prereqs" {
 module "devsecops_ci_toolchain" {
   count                    = var.create_ci_toolchain ? 1 : 0
   depends_on               = [ibm_resource_instance.cd_instance]
-  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain?ref=v2.7.0"
+  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain?ref=v2.7.1"
   ibmcloud_api_key         = var.ibmcloud_api_key
   toolchain_name           = (var.prefix == "") ? local.ci_toolchain_name : format("${var.prefix}-%s", local.ci_toolchain_name)
   toolchain_region         = (var.ci_toolchain_region == "") ? var.toolchain_region : replace(replace(var.ci_toolchain_region, "ibm:yp:", ""), "ibm:ys1:", "")
@@ -460,6 +460,7 @@ module "devsecops_ci_toolchain" {
   compliance_pipeline_existing_repo_url      = var.compliance_pipeline_existing_repo_url
   compliance_pipeline_source_repo_url        = var.compliance_pipeline_source_repo_url
   compliance_pipelines_repo_name             = var.compliance_pipeline_repo_name
+  compliance_pipelines_repo_is_private_repo  = var.compliance_pipelines_repo_is_private_repo
 
   #PIPELINE CONFIG REPO
   pipeline_config_repo_existing_url   = local.ci_pipeline_config_repo_existing_url
@@ -720,6 +721,7 @@ module "devsecops_cd_toolchain" {
   compliance_pipeline_existing_repo_url      = var.compliance_pipeline_existing_repo_url
   compliance_pipeline_source_repo_url        = var.compliance_pipeline_source_repo_url
   compliance_pipelines_repo_name             = var.compliance_pipeline_repo_name
+  compliance_pipelines_repo_is_private_repo  = var.compliance_pipelines_repo_is_private_repo
 
   #PIPELINE CONFIG REPO
   pipeline_config_repo_existing_url   = local.cd_pipeline_config_repo_existing_url
@@ -996,6 +998,7 @@ module "devsecops_cc_toolchain" {
   compliance_pipeline_existing_repo_url      = var.compliance_pipeline_existing_repo_url
   compliance_pipeline_source_repo_url        = var.compliance_pipeline_source_repo_url
   compliance_pipelines_repo_name             = var.compliance_pipeline_repo_name
+  compliance_pipelines_repo_is_private_repo  = var.compliance_pipelines_repo_is_private_repo
 
   #PIPELINE CONFIG REPO
   pipeline_config_repo_existing_url   = local.cc_pipeline_config_repo_existing_url

ibm_catalog.json

@@ -12,7 +12,7 @@ locals {
   # updated_at  = "2024-07-05T22:05:57.000Z"
   # }
   # 2) Use index to find the index of the object containing the correct name
-  # 3) retrive that object from the list and get the ID from it
+  # 3) retrieve that object from the list and get the ID from it
   secret_group_list = (var.sm_exists) ? data.ibm_sm_secret_groups.secret_groups[0].secret_groups : []
   secret_group_id   = try(local.secret_group_list[index(local.secret_group_list[*].name, var.sm_secret_group_name)].id, "")