fix: code engine context-dir, remove policy, bump provider version (#555)

huayuenh · web-flow · commit 497786c17b35 · 2025-03-14T10:54:23.000Z
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.70.0 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.75.2 |
 | <a name="requirement_null"></a> [null](#requirement\_null) | = 3.2.2 |
 | <a name="requirement_random"></a> [random](#requirement\_random) | = 3.6.2 |
 
@@ -74,20 +74,20 @@ statement instead the previous block.
 
 | Name | Type |
 |------|------|
-| [ibm_cd_tekton_pipeline_property.cc_pipeline_ibmcloud_api](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.70.0/docs/resources/cd_tekton_pipeline_property) | resource |
-| [ibm_cd_tekton_pipeline_property.cd_pipeline_ibmcloud_api](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.70.0/docs/resources/cd_tekton_pipeline_property) | resource |
-| [ibm_cd_tekton_pipeline_property.ci_pipeline_ibmcloud_api](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.70.0/docs/resources/cd_tekton_pipeline_property) | resource |
-| [ibm_cd_tekton_pipeline_property.pr_pipeline_ibmcloud_api](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.70.0/docs/resources/cd_tekton_pipeline_property) | 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 |
+| [ibm_cd_tekton_pipeline_property.cc_pipeline_ibmcloud_api](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/resources/cd_tekton_pipeline_property) | resource |
+| [ibm_cd_tekton_pipeline_property.cd_pipeline_ibmcloud_api](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/resources/cd_tekton_pipeline_property) | resource |
+| [ibm_cd_tekton_pipeline_property.ci_pipeline_ibmcloud_api](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/resources/cd_tekton_pipeline_property) | resource |
+| [ibm_cd_tekton_pipeline_property.pr_pipeline_ibmcloud_api](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/resources/cd_tekton_pipeline_property) | resource |
+| [ibm_cd_tekton_pipeline_trigger.ci_pipeline_webhook](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/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.75.2/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.75.2/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.75.2/docs/resources/cd_tekton_pipeline_trigger_property) | resource |
+| [ibm_cr_namespace.cr_namespace](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/resources/cr_namespace) | resource |
+| [ibm_resource_instance.cd_instance](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/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.70.0/docs/data-sources/resource_group) | data source |
+| [ibm_resource_group.resource_group](https://registry.terraform.io/providers/IBM-Cloud/ibm/1.75.2/docs/data-sources/resource_group) | data source |
 
 ### Inputs
 
diff --git a/ibm_catalog.json b/ibm_catalog.json
diff --git a/prereqs/main.tf b/prereqs/main.tf
@@ -132,16 +132,6 @@ resource "ibm_iam_service_policy" "toolchain_policy" {
   }
 }
 
-resource "ibm_iam_service_policy" "cd_policy" {
-  count          = (local.create_pipeline_service_api_key) ? 1 : 0
-  iam_service_id = ibm_iam_service_id.pipeline_service_id[0].id
-  roles          = ["Writer"]
-  resources {
-    service           = "continuous-delivery"
-    resource_group_id = data.ibm_resource_group.resource_group.id
-  }
-}
-
 resource "ibm_iam_service_policy" "kube_policy" {
   count          = ((var.create_kubernetes_access_policy == true) && (local.create_pipeline_service_api_key == true)) ? 1 : 0
   iam_service_id = ibm_iam_service_id.pipeline_service_id[0].id
diff --git a/prereqs/versions.tf b/prereqs/versions.tf
@@ -3,7 +3,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "=1.70.0"
+      version = "=1.75.2"
     }
 
     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.70.0 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.75.2 |
 
 ### Modules
 
diff --git a/solutions/code-engine/ci-properties.json b/solutions/code-engine/ci-properties.json
@@ -85,7 +85,7 @@
       {
         "name": "context-dir",
         "type": "text",
-        "value": "dockerfile-strategy"
+        "value": "."
       },
       {
         "name": "cos-api-key",
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.70.0"
+      version = "=1.75.2"
     }
   }
 }
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.70.0 |
+| <a name="requirement_ibm"></a> [ibm](#requirement\_ibm) | =1.75.2 |
 
 ### Modules
 
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.70.0"
+      version = "=1.75.2"
     }
   }
 }
diff --git a/version.tf b/version.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "=1.70.0"
+      version = "=1.75.2"
     }
 
     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.70.0"`
	`6`	`+ version = "=1.75.2"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`external = {`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@`
`85`	`85`	`{`
`86`	`86`	`"name": "context-dir",`
`87`	`87`	`"type": "text",`
`88`		`- "value": "dockerfile-strategy"`
	`88`	`+ "value": "."`
`89`	`89`	`},`
`90`	`90`	`{`
`91`	`91`	`"name": "cos-api-key",`
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.70.0"`
	`7`	`+ version = "=1.75.2"`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`	`}`