fix: update provider, auto run depends on (#495)

huayuenh · web-flow · commit 6719614aee7b · 2024-10-14T16:27:14.000+01:00
diff --git a/README.md b/README.md
@@ -57,7 +57,7 @@ statement instead the previous block.
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.67.1 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.70.0 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | = 3.2.2 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | = 3.6.2 |
 
@@ -74,16 +74,16 @@ statement instead the previous block.
 
 | Name | Type |
 |------|------|
-| [ibm_cd_tekton_pipeline_trigger.ci_pipeline_webhook](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.67.1/docs/resources/cd_tekton_pipeline_trigger) | resource |
-| [ibm_cd_tekton_pipeline_trigger_property.ci_pipeline_webhook_branch_property](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.67.1/docs/resources/cd_tekton_pipeline_trigger_property) | resource |
-| [ibm_cd_tekton_pipeline_trigger_property.ci_pipeline_webhook_name_property](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.67.1/docs/resources/cd_tekton_pipeline_trigger_property) | resource |
-| [ibm_cd_tekton_pipeline_trigger_property.ci_pipeline_webhook_repo_url_property](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.67.1/docs/resources/cd_tekton_pipeline_trigger_property) | resource |
-| [ibm_cr_namespace.cr_namespace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.67.1/docs/resources/cr_namespace) | resource |
-| [ibm_resource_instance.cd_instance](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.67.1/docs/resources/resource_instance) | resource |
+| [ibm_cd_tekton_pipeline_trigger.ci_pipeline_webhook](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.70.0/docs/resources/cd_tekton_pipeline_trigger) | resource |
+| [ibm_cd_tekton_pipeline_trigger_property.ci_pipeline_webhook_branch_property](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.70.0/docs/resources/cd_tekton_pipeline_trigger_property) | resource |
+| [ibm_cd_tekton_pipeline_trigger_property.ci_pipeline_webhook_name_property](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.70.0/docs/resources/cd_tekton_pipeline_trigger_property) | resource |
+| [ibm_cd_tekton_pipeline_trigger_property.ci_pipeline_webhook_repo_url_property](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.70.0/docs/resources/cd_tekton_pipeline_trigger_property) | resource |
+| [ibm_cr_namespace.cr_namespace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.70.0/docs/resources/cr_namespace) | resource |
+| [ibm_resource_instance.cd_instance](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.70.0/docs/resources/resource_instance) | resource |
 | [null_resource.ci_pipeline_run](https://registry.terraform.io/providers/hashicorp/null/3.2.2/docs/resources/resource) | resource |
 | [random_string.resource_suffix](https://registry.terraform.io/providers/hashicorp/random/3.6.2/docs/resources/string) | resource |
 | [random_string.webhook_secret](https://registry.terraform.io/providers/hashicorp/random/3.6.2/docs/resources/string) | resource |
-| [ibm_resource_group.resource_group](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.67.1/docs/data-sources/resource_group) | data source |
+| [ibm_resource_group.resource_group](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.70.0/docs/data-sources/resource_group) | data source |
 
 ### Inputs
 
@@ -589,6 +589,7 @@ statement instead the previous block.
 | <a name="input_toolchain_region"></a> [toolchain\_region](#input\_toolchain\_region) | The region identifier that will be used, by default, for all resource creation and service instance lookup. | `string` | `"us-south"` | no |
 | <a name="input_toolchain_resource_group"></a> [toolchain\_resource\_group](#input\_toolchain\_resource\_group) | The resource group that will be used, by default, for all resource creation and service instance lookups. This can be overridden on a per resource/service basis. | `string` | `"Default"` | no |
 | <a name="input_use_app_repo_for_cd_deploy"></a> [use\_app\_repo\_for\_cd\_deploy](#input\_use\_app\_repo\_for\_cd\_deploy) | Set to `true` to use the CI sample application repository as the deployment repository in the CD pipeline. This will be set in the pipeline config integration. | `bool` | `false` | no |
+| <a name="input_worker_id"></a> [worker\_id](#input\_worker\_id) | The identifier for the pipeline worker. Applies to the CI, CD and CC pipelines. | `string` | `"public"` | no |
 
 ### Outputs
 
diff --git a/main.tf b/main.tf
@@ -268,6 +268,7 @@ module "devsecops_ci_toolchain" {
   pr_pipeline_branch       = (var.ci_compliance_pipeline_pr_branch == "") ? var.compliance_pipeline_branch : var.ci_compliance_pipeline_pr_branch
   ci_pipeline_git_tag      = (var.ci_pipeline_git_tag == "") ? var.pipeline_git_tag : var.ci_pipeline_git_tag
   pr_pipeline_git_tag      = (var.pr_pipeline_git_tag == "") ? var.pipeline_git_tag : var.pr_pipeline_git_tag
+  worker_id                = var.worker_id
 
   #SECRET PROVIDERS
   enable_key_protect     = (local.ci_enable_key_protect == "true") ? true : false
@@ -466,6 +467,7 @@ module "devsecops_cd_toolchain" {
   toolchain_resource_group = (var.cd_toolchain_resource_group == "") ? var.toolchain_resource_group : var.cd_toolchain_resource_group
   pipeline_branch          = (var.cd_compliance_pipeline_branch == "") ? var.compliance_pipeline_branch : var.cd_compliance_pipeline_branch
   pipeline_git_tag         = (var.cd_pipeline_git_tag == "") ? var.pipeline_git_tag : var.cd_pipeline_git_tag
+  worker_id                = var.worker_id
 
   #SECRET PROVIDERS
   enable_key_protect     = (local.cd_enable_key_protect == "true") ? true : false
@@ -680,6 +682,7 @@ module "devsecops_cc_toolchain" {
   authorization_policy_creation = (var.cc_authorization_policy_creation == "") ? var.authorization_policy_creation : var.cc_authorization_policy_creation
   pipeline_branch               = (var.cc_compliance_pipeline_branch == "") ? var.compliance_pipeline_branch : var.cc_compliance_pipeline_branch
   pipeline_git_tag              = (var.cc_pipeline_git_tag == "") ? var.pipeline_git_tag : var.cc_pipeline_git_tag
+  worker_id                     = var.worker_id
 
   #SECRET PROVIDERS
   enable_key_protect     = (local.cc_enable_key_protect == "true") ? true : false
@@ -860,9 +863,10 @@ module "devsecops_cc_toolchain" {
 
 # Random string for webhook token
 resource "random_string" "webhook_secret" {
-  length  = 48
-  special = false
-  upper   = false
+  depends_on = [module.devsecops_ci_toolchain[0].ci_pipeline_id, module.devsecops_ci_toolchain[0].app_repo_url]
+  length     = 48
+  special    = false
+  upper      = false
 }
 
 # Create webhook for CI pipeline
@@ -919,7 +923,8 @@ resource "null_resource" "ci_pipeline_run" {
   count = (var.autostart) ? 1 : 0
   depends_on = [
     ibm_cd_tekton_pipeline_trigger.ci_pipeline_webhook,
-    ibm_cd_tekton_pipeline_trigger_property.ci_pipeline_webhook_branch_property
+    ibm_cd_tekton_pipeline_trigger_property.ci_pipeline_webhook_branch_property,
+    ibm_cd_tekton_pipeline_trigger_property.ci_pipeline_webhook_repo_url_property
   ]
   triggers = {
     always_run = timestamp()
diff --git a/prereqs/versions.tf b/prereqs/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "= 1.67.1"
+      version = "=1.70.0"
     }
 
     external = {
diff --git a/solutions/code-engine/README.md b/solutions/code-engine/README.md
@@ -57,7 +57,7 @@ statement instead the previous block.
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.67.1 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.70.0 |
 
 ### Modules
 
@@ -570,6 +570,7 @@ No resources.
 | <a name="input_toolchain_region"></a> [toolchain\_region](#input\_toolchain\_region) | The region identifier that will be used, by default, for all resource creation and service instance lookup. This can be overridden on a per resource/service basis. | `string` | `"us-south"` | no |
 | <a name="input_toolchain_resource_group"></a> [toolchain\_resource\_group](#input\_toolchain\_resource\_group) | The resource group that will be used, by default, for all resource creation and service instance lookups. This can be overridden on a per resource/service basis. | `string` | `"Default"` | no |
 | <a name="input_use_app_repo_for_cd_deploy"></a> [use\_app\_repo\_for\_cd\_deploy](#input\_use\_app\_repo\_for\_cd\_deploy) | Set to `true` to use the CI sample application repository as the deployment repository in the CD pipeline. This will be set in the pipeline config integration. | `bool` | `true` | no |
+| <a name="input_worker_id"></a> [worker\_id](#input\_worker\_id) | The identifier for the pipeline worker. Applies to the CI, CD and CC pipelines. | `string` | `"public"` | no |
 
 ### Outputs
 
diff --git a/solutions/code-engine/main.tf b/solutions/code-engine/main.tf
@@ -143,6 +143,7 @@ module "devsecops_da" {
   toolchain_resource_group                          = var.toolchain_resource_group
   toolchain_region                                  = var.toolchain_region
   use_app_repo_for_cd_deploy                        = var.use_app_repo_for_cd_deploy
+  worker_id                                         = var.worker_id
   cc_app_group                                      = var.cc_app_group
   cc_app_repo_auth_type                             = var.cc_app_repo_auth_type
   cc_app_repo_branch                                = var.cc_app_repo_branch
diff --git a/solutions/code-engine/variables.tf b/solutions/code-engine/variables.tf
@@ -936,6 +936,11 @@ variable "toolchain_resource_group" {
   default     = "Default"
 }
 
+variable "worker_id" {
+  type        = string
+  default     = "public"
+  description = "The identifier for the pipeline worker. Applies to the CI, CD and CC pipelines."
+}
 
 ########################################################
 ##### START OF CC VARIABLES ##############
diff --git a/solutions/code-engine/version.tf b/solutions/code-engine/version.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "=1.67.1"
+      version = "=1.70.0"
     }
   }
 }
diff --git a/solutions/kubernetes/README.md b/solutions/kubernetes/README.md
@@ -57,7 +57,7 @@ statement instead the previous block.
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
-| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.67.1 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.70.0 |
 
 ### Modules
 
@@ -570,6 +570,7 @@ No resources.
 | <a name="input_toolchain_region"></a> [toolchain\_region](#input\_toolchain\_region) | The region identifier that will be used, by default, for all resource creation and service instance lookup. This can be overridden on a per resource/service basis. | `string` | `"us-south"` | no |
 | <a name="input_toolchain_resource_group"></a> [toolchain\_resource\_group](#input\_toolchain\_resource\_group) | The resource group that will be used, by default, for all resource creation and service instance lookups. This can be overridden on a per resource/service basis. | `string` | `"Default"` | no |
 | <a name="input_use_app_repo_for_cd_deploy"></a> [use\_app\_repo\_for\_cd\_deploy](#input\_use\_app\_repo\_for\_cd\_deploy) | Set to `true` to use the CI sample application repository as the deployment repository in the CD pipeline. This will be set in the pipeline config integration. | `bool` | `false` | no |
+| <a name="input_worker_id"></a> [worker\_id](#input\_worker\_id) | The identifier for the pipeline worker. Applies to the CI, CD and CC pipelines. | `string` | `"public"` | no |
 
 ### Outputs
 
diff --git a/solutions/kubernetes/main.tf b/solutions/kubernetes/main.tf
@@ -142,6 +142,7 @@ module "devsecops_da" {
   toolchain_name                                    = var.toolchain_name
   toolchain_resource_group                          = var.toolchain_resource_group
   toolchain_region                                  = var.toolchain_region
+  worker_id                                         = var.worker_id
   use_app_repo_for_cd_deploy                        = var.use_app_repo_for_cd_deploy
   cc_app_group                                      = var.cc_app_group
   cc_app_repo_auth_type                             = var.cc_app_repo_auth_type
diff --git a/solutions/kubernetes/variables.tf b/solutions/kubernetes/variables.tf
@@ -936,6 +936,11 @@ variable "toolchain_resource_group" {
   default     = "Default"
 }
 
+variable "worker_id" {
+  type        = string
+  default     = "public"
+  description = "The identifier for the pipeline worker. Applies to the CI, CD and CC pipelines."
+}
 
 ########################################################
 ##### START OF CC VARIABLES ##############
diff --git a/solutions/kubernetes/version.tf b/solutions/kubernetes/version.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "=1.67.1"
+      version = "=1.70.0"
     }
   }
 }
diff --git a/variables.tf b/variables.tf
@@ -942,6 +942,11 @@ variable "toolchain_resource_group" {
   default     = "Default"
 }
 
+variable "worker_id" {
+  type        = string
+  default     = "public"
+  description = "The identifier for the pipeline worker. Applies to the CI, CD and CC pipelines."
+}
 
 ########################################################
 ##### START OF CC VARIABLES ##############
diff --git a/version.tf b/version.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "=1.67.1"
+      version = "=1.70.0"
     }
 
     random = {

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ terraform {`
`3`	`3`	`required_providers {`
`4`	`4`	`ibm = {`
`5`	`5`	`source = "IBM-Cloud/ibm"`
`6`		`- version = "= 1.67.1"`
	`6`	`+ version = "=1.70.0"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`external = {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ terraform {`
`4`	`4`	`required_providers {`
`5`	`5`	`ibm = {`
`6`	`6`	`source = "IBM-Cloud/ibm"`
`7`		`- version = "=1.67.1"`
	`7`	`+ version = "=1.70.0"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`