Skip to content

Commit

Permalink
fix: dependencies, missing output (#446)
Browse files Browse the repository at this point in the history
  • Loading branch information
huayuenh authored Jul 22, 2024
1 parent bca4916 commit 28479be
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 18 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ statement instead the previous block.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_devsecops_cc_toolchain"></a> [devsecops\_cc\_toolchain](#module\_devsecops\_cc\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain | v1.4.0 |
| <a name="module_devsecops_cd_toolchain"></a> [devsecops\_cd\_toolchain](#module\_devsecops\_cd\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain | v1.4.0 |
| <a name="module_devsecops_ci_toolchain"></a> [devsecops\_ci\_toolchain](#module\_devsecops\_ci\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain | v1.4.0 |
| <a name="module_devsecops_cc_toolchain"></a> [devsecops\_cc\_toolchain](#module\_devsecops\_cc\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain | v1.5.0 |
| <a name="module_devsecops_cd_toolchain"></a> [devsecops\_cd\_toolchain](#module\_devsecops\_cd\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain | v1.5.0 |
| <a name="module_devsecops_ci_toolchain"></a> [devsecops\_ci\_toolchain](#module\_devsecops\_ci\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain | v1.5.0 |
| <a name="module_prereqs"></a> [prereqs](#module\_prereqs) | ./prereqs | n/a |

### Resources
Expand Down Expand Up @@ -637,6 +637,7 @@ statement instead the previous block.
| <a name="output_app_repo_url"></a> [app\_repo\_url](#output\_app\_repo\_url) | The App Repo URL |
| <a name="output_cc_pipeline_id"></a> [cc\_pipeline\_id](#output\_cc\_pipeline\_id) | The CC pipeline Id |
| <a name="output_cd_pipeline_id"></a> [cd\_pipeline\_id](#output\_cd\_pipeline\_id) | The CD pipeline Id |
| <a name="output_change_management_repo_url"></a> [change\_management\_repo\_url](#output\_change\_management\_repo\_url) | The Change Management Repo URL. |
| <a name="output_ci_pipeline_id"></a> [ci\_pipeline\_id](#output\_ci\_pipeline\_id) | The CI pipeline Id |
| <a name="output_compliance_cc_toolchain_id"></a> [compliance\_cc\_toolchain\_id](#output\_compliance\_cc\_toolchain\_id) | The ID of the Compliance CC Toolchain |
| <a name="output_compliance_cc_toolchain_url"></a> [compliance\_cc\_toolchain\_url](#output\_compliance\_cc\_toolchain\_url) | The Compliance CC Toolchain URL |
Expand Down
6 changes: 3 additions & 3 deletions code-engine/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ statement instead the previous block.

| Name | Source | Version |
|------|--------|---------|
| <a name="module_devsecops_cc_toolchain"></a> [devsecops\_cc\_toolchain](#module\_devsecops\_cc\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain | v1.4.0 |
| <a name="module_devsecops_cd_toolchain"></a> [devsecops\_cd\_toolchain](#module\_devsecops\_cd\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain | v1.4.0 |
| <a name="module_devsecops_ci_toolchain"></a> [devsecops\_ci\_toolchain](#module\_devsecops\_ci\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain | v1.4.0 |
| <a name="module_devsecops_cc_toolchain"></a> [devsecops\_cc\_toolchain](#module\_devsecops\_cc\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cc-toolchain | v1.5.0 |
| <a name="module_devsecops_cd_toolchain"></a> [devsecops\_cd\_toolchain](#module\_devsecops\_cd\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-cd-toolchain | v1.5.0 |
| <a name="module_devsecops_ci_toolchain"></a> [devsecops\_ci\_toolchain](#module\_devsecops\_ci\_toolchain) | git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-ci-toolchain | v1.5.0 |
| <a name="module_prereqs"></a> [prereqs](#module\_prereqs) | ./prereqs | n/a |

### Resources
Expand Down
6 changes: 3 additions & 3 deletions code-engine/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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:", "")
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions code-engine/outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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, "")
Expand Down
2 changes: 1 addition & 1 deletion examples/default/main.tf
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/default/version.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
2 changes: 1 addition & 1 deletion examples/devsecops-ci-toolchain-bring-your-own-app/main.tf
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
2 changes: 1 addition & 1 deletion examples/devsecops-ci-toolchain-with-key-protect/main.tf
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
6 changes: 3 additions & 3 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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:", "")
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions outputs.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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, "")
Expand Down

0 comments on commit 28479be

Please sign in to comment.