diff --git a/README.md b/README.md index 828b81ca..b3a2d21e 100644 --- a/README.md +++ b/README.md @@ -65,9 +65,9 @@ statement instead the previous block. | Name | Source | Version | |------|--------|---------| -| [devsecops\_cc\_toolchain](#module\_devsecops\_cc\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain | v1.4.0 | -| [devsecops\_cd\_toolchain](#module\_devsecops\_cd\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain | v1.4.0 | -| [devsecops\_ci\_toolchain](#module\_devsecops\_ci\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain | v1.4.0 | +| [devsecops\_cc\_toolchain](#module\_devsecops\_cc\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain | v1.5.0 | +| [devsecops\_cd\_toolchain](#module\_devsecops\_cd\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain | v1.5.0 | +| [devsecops\_ci\_toolchain](#module\_devsecops\_ci\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain | v1.5.0 | | [prereqs](#module\_prereqs) | ./prereqs | n/a | ### Resources @@ -637,6 +637,7 @@ statement instead the previous block. | [app\_repo\_url](#output\_app\_repo\_url) | The App Repo URL | | [cc\_pipeline\_id](#output\_cc\_pipeline\_id) | The CC pipeline Id | | [cd\_pipeline\_id](#output\_cd\_pipeline\_id) | The CD pipeline Id | +| [change\_management\_repo\_url](#output\_change\_management\_repo\_url) | The Change Management Repo URL. | | [ci\_pipeline\_id](#output\_ci\_pipeline\_id) | The CI pipeline Id | | [compliance\_cc\_toolchain\_id](#output\_compliance\_cc\_toolchain\_id) | The ID of the Compliance CC Toolchain | | [compliance\_cc\_toolchain\_url](#output\_compliance\_cc\_toolchain\_url) | The Compliance CC Toolchain URL | diff --git a/code-engine/README.md b/code-engine/README.md index a08b9d65..c74937a8 100644 --- a/code-engine/README.md +++ b/code-engine/README.md @@ -42,9 +42,9 @@ statement instead the previous block. | Name | Source | Version | |------|--------|---------| -| [devsecops\_cc\_toolchain](#module\_devsecops\_cc\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain | v1.4.0 | -| [devsecops\_cd\_toolchain](#module\_devsecops\_cd\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain | v1.4.0 | -| [devsecops\_ci\_toolchain](#module\_devsecops\_ci\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain | v1.4.0 | +| [devsecops\_cc\_toolchain](#module\_devsecops\_cc\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain | v1.5.0 | +| [devsecops\_cd\_toolchain](#module\_devsecops\_cd\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain | v1.5.0 | +| [devsecops\_ci\_toolchain](#module\_devsecops\_ci\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain | v1.5.0 | | [prereqs](#module\_prereqs) | ./prereqs | n/a | ### Resources diff --git a/code-engine/main.tf b/code-engine/main.tf index fa28fdab..6e65bc59 100644 --- a/code-engine/main.tf +++ b/code-engine/main.tf @@ -102,7 +102,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=v1.4.0" + source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain?ref=v1.5.0" 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:", "") @@ -371,7 +371,7 @@ module "devsecops_ci_toolchain" { module "devsecops_cd_toolchain" { count = var.create_cd_toolchain ? 1 : 0 depends_on = [ibm_resource_instance.cd_instance] - source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain?ref=v1.4.0" + source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain?ref=v1.5.0" ibmcloud_api_key = var.ibmcloud_api_key toolchain_name = (var.prefix == "") ? local.cd_toolchain_name : format("${var.prefix}-%s", local.cd_toolchain_name) @@ -621,7 +621,7 @@ module "devsecops_cd_toolchain" { module "devsecops_cc_toolchain" { count = var.create_cc_toolchain ? 1 : 0 depends_on = [ibm_resource_instance.cd_instance] - source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain?ref=v1.4.0" + source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain?ref=v1.5.0" ibmcloud_api_key = var.ibmcloud_api_key toolchain_name = (var.prefix == "") ? local.cc_toolchain_name : format("${var.prefix}-%s", local.cc_toolchain_name) toolchain_description = var.cc_toolchain_description diff --git a/code-engine/outputs.tf b/code-engine/outputs.tf index 4595d70b..a642f085 100644 --- a/code-engine/outputs.tf +++ b/code-engine/outputs.tf @@ -57,6 +57,11 @@ output "compliance_cd_toolchain_url" { value = try(module.devsecops_cd_toolchain[0].toolchain_url, "") } +output "change_management_repo_url" { + description = "The Change Management Repo URL." + value = try(module.devsecops_cd_toolchain[0].change_management_repo_url, "") +} + output "compliance_cc_toolchain_url" { description = "The Compliance CC Toolchain URL" value = try(module.devsecops_cc_toolchain[0].toolchain_url, "") diff --git a/examples/default/main.tf b/examples/default/main.tf index d86db8d6..7c9226db 100644 --- 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.8.0" + source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.9.2" 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 index 0c86079b..d74ba4bb 100644 --- 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.60.0" + version = "= 1.65.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 index cdc198fc..77d18036 100644 --- 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.8.0" + source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.9.2" 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/version.tf b/examples/devsecops-ci-toolchain-bring-your-own-app/version.tf index 0c86079b..d74ba4bb 100644 --- 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.60.0" + version = "= 1.65.0" } } } diff --git a/examples/devsecops-ci-toolchain-with-key-protect/main.tf b/examples/devsecops-ci-toolchain-with-key-protect/main.tf index c7083f84..fa4dc084 100644 --- 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.8.0" + source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.9.2" 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/version.tf b/examples/devsecops-ci-toolchain-with-key-protect/version.tf index 0c86079b..d74ba4bb 100644 --- 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.60.0" + version = "= 1.65.0" } } } diff --git a/main.tf b/main.tf index bf922fe0..c84384d6 100644 --- a/main.tf +++ b/main.tf @@ -86,7 +86,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=v1.4.0" + source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain?ref=v1.5.0" 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:", "") @@ -332,7 +332,7 @@ module "devsecops_ci_toolchain" { module "devsecops_cd_toolchain" { count = var.create_cd_toolchain ? 1 : 0 depends_on = [ibm_resource_instance.cd_instance] - source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain?ref=v1.4.0" + source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain?ref=v1.5.0" ibmcloud_api_key = var.ibmcloud_api_key toolchain_name = (var.prefix == "") ? local.cd_toolchain_name : format("${var.prefix}-%s", local.cd_toolchain_name) @@ -563,7 +563,7 @@ module "devsecops_cd_toolchain" { module "devsecops_cc_toolchain" { count = var.create_cc_toolchain ? 1 : 0 depends_on = [ibm_resource_instance.cd_instance] - source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain?ref=v1.4.0" + source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain?ref=v1.5.0" ibmcloud_api_key = var.ibmcloud_api_key toolchain_name = (var.prefix == "") ? local.cc_toolchain_name : format("${var.prefix}-%s", local.cc_toolchain_name) toolchain_description = var.cc_toolchain_description diff --git a/outputs.tf b/outputs.tf index 4595d70b..a642f085 100644 --- a/outputs.tf +++ b/outputs.tf @@ -57,6 +57,11 @@ output "compliance_cd_toolchain_url" { value = try(module.devsecops_cd_toolchain[0].toolchain_url, "") } +output "change_management_repo_url" { + description = "The Change Management Repo URL." + value = try(module.devsecops_cd_toolchain[0].change_management_repo_url, "") +} + output "compliance_cc_toolchain_url" { description = "The Compliance CC Toolchain URL" value = try(module.devsecops_cc_toolchain[0].toolchain_url, "")