Skip to content

Commit a7c5dbf

Browse files
authored
fix: examples (#282)
1 parent 1fdcbf9 commit a7c5dbf

File tree

11 files changed

+24
-28
lines changed

11 files changed

+24
-28
lines changed

examples/default/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "terraform_devsecops_alm" {
2-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.1.0"
2+
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.1.1"
33
ibmcloud_api_key = var.ibmcloud_api_key
44
toolchain_resource_group = var.toolchain_resource_group
55
toolchain_region = var.toolchain_region

examples/default/version.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
# Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
55
ibm = {
66
source = "IBM-Cloud/ibm"
7-
version = "1.55.0"
7+
version = ">=1.57.0"
88
}
99
}
1010
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "terraform_devsecops_alm" {
2-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.1.0"
2+
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.1.1"
33
ibmcloud_api_key = var.ibmcloud_api_key
44
toolchain_resource_group = var.toolchain_resource_group
55
toolchain_region = var.toolchain_region

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ variable "create_ci_toolchain" {
7070
variable "create_cd_toolchain" {
7171
description = "Boolean flag which determines if the DevSecOps CD toolchain is created."
7272
type = bool
73-
default = false
73+
default = true
7474
}
7575

7676
variable "create_cc_toolchain" {
7777
description = "Boolean flag which determines if the DevSecOps CC toolchain is created."
7878
type = bool
79-
default = false
79+
default = true
8080
}
8181

8282
variable "ci_app_repo_clone_from_url" {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
# Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
55
ibm = {
66
source = "IBM-Cloud/ibm"
7-
version = "1.55.0"
7+
version = ">=1.57.0"
88
}
99
}
1010
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "terraform_devsecops_alm" {
2-
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.1.0"
2+
source = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.1.1"
33
ibmcloud_api_key = var.ibmcloud_api_key
44
toolchain_resource_group = var.toolchain_resource_group
55
toolchain_region = var.toolchain_region

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ variable "create_ci_toolchain" {
7070
variable "create_cd_toolchain" {
7171
description = "Boolean flag which determines if the DevSecOps CD toolchain is created."
7272
type = bool
73-
default = false
73+
default = true
7474
}
7575

7676
variable "create_cc_toolchain" {
7777
description = "Boolean flag which determines if the DevSecOps CC toolchain is created."
7878
type = bool
79-
default = false
79+
default = true
8080
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
# Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
55
ibm = {
66
source = "IBM-Cloud/ibm"
7-
version = "1.55.0"
7+
version = ">=1.57.0"
88
}
99
}
1010
}

module-metadata.json

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5673,14 +5673,12 @@
56735673
}
56745674
},
56755675
"compliance_cc_toolchain_url": {
5676-
"name": "toolchain_url",
5677-
"description": "The CC toolchain URL.",
5678-
"value": "module.devsecops_cc_toolchain.toolchain_url",
5676+
"name": "compliance_cc_toolchain_url",
5677+
"description": "The Compliance CC Toolchain URL",
56795678
"pos": {
56805679
"filename": "outputs.tf",
56815680
"line": 60
5682-
},
5683-
"type": "TypeString"
5681+
}
56845682
},
56855683
"compliance_cd_toolchain_id": {
56865684
"name": "compliance_cd_toolchain_id",
@@ -5691,14 +5689,12 @@
56915689
}
56925690
},
56935691
"compliance_cd_toolchain_url": {
5694-
"name": "toolchain_url",
5695-
"description": "The CD toolchain URL.",
5696-
"value": "module.devsecops_cd_toolchain.toolchain_url",
5692+
"name": "compliance_cd_toolchain_url",
5693+
"description": "The Compliance CD Toolchain URL",
56975694
"pos": {
56985695
"filename": "outputs.tf",
56995696
"line": 55
5700-
},
5701-
"type": "TypeString"
5697+
}
57025698
},
57035699
"compliance_ci_toolchain_id": {
57045700
"name": "compliance_ci_toolchain_id",
@@ -5709,14 +5705,12 @@
57095705
}
57105706
},
57115707
"compliance_ci_toolchain_url": {
5712-
"name": "toolchain_url",
5713-
"description": "The CI toolchain URL.",
5714-
"value": "module.devsecops_ci_toolchain.toolchain_url",
5708+
"name": "compliance_ci_toolchain_url",
5709+
"description": "The Compliance CI Toolchain URL",
57155710
"pos": {
57165711
"filename": "outputs.tf",
57175712
"line": 50
5718-
},
5719-
"type": "TypeString"
5713+
}
57205714
},
57215715
"evidence_repo_url": {
57225716
"name": "evidence_repo_url",

outputs.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ output "app_repo_url" {
4949

5050
output "compliance_ci_toolchain_url" {
5151
description = "The Compliance CI Toolchain URL"
52-
value = module.devsecops_ci_toolchain[0].toolchain_url
52+
value = try(module.devsecops_ci_toolchain[0].toolchain_url, "")
5353
}
5454

5555
output "compliance_cd_toolchain_url" {
5656
description = "The Compliance CD Toolchain URL"
57-
value = module.devsecops_cd_toolchain[0].toolchain_url
57+
value = try(module.devsecops_cd_toolchain[0].toolchain_url, "")
5858
}
5959

6060
output "compliance_cc_toolchain_url" {
6161
description = "The Compliance CC Toolchain URL"
62-
value = module.devsecops_cc_toolchain[0].toolchain_url
62+
value = try(module.devsecops_cc_toolchain[0].toolchain_url, "")
6363
}
6464

6565
output "ci_pipeline_id" {

0 commit comments

Comments
 (0)