fix: surface variables for deployment repo(#643)

Author: huayuenh

README.md

@@ -226,6 +226,7 @@ statement instead the previous block.
 | <a name="input_cd_change_management_repo_git_provider"></a> [cd\_change\_management\_repo\_git\_provider](#input\_cd\_change\_management\_repo\_git\_provider) | Git provider for the change management repo. If not set will default to `hostedgit`. | `string` | `""` | no |
 | <a name="input_cd_change_management_repo_git_token_secret_crn"></a> [cd\_change\_management\_repo\_git\_token\_secret\_crn](#input\_cd\_change\_management\_repo\_git\_token\_secret\_crn) | The CRN for the Change Management repository Git Token. | `string` | `""` | no |
 | <a name="input_cd_change_management_repo_git_token_secret_name"></a> [cd\_change\_management\_repo\_git\_token\_secret\_name](#input\_cd\_change\_management\_repo\_git\_token\_secret\_name) | Name of the Git token secret in the secret provider. | `string` | `""` | no |
+| <a name="input_cd_change_management_repo_name"></a> [cd\_change\_management\_repo\_name](#input\_cd\_change\_management\_repo\_name) | The repository name. | `string` | `""` | no |
 | <a name="input_cd_change_management_repo_secret_group"></a> [cd\_change\_management\_repo\_secret\_group](#input\_cd\_change\_management\_repo\_secret\_group) | Secret group for the Change Management repository secret. Defaults to the value set in `sm_secret_group` if not set. Only used with `Secrets Manager`. | `string` | `""` | no |
 | <a name="input_cd_change_repo_clone_from_url"></a> [cd\_change\_repo\_clone\_from\_url](#input\_cd\_change\_repo\_clone\_from\_url) | Override the default management repository, which is cloned into the application repository. Note, using clone\_if\_not\_exists mode, so if the application repository already exists the repository contents are unchanged. | `string` | `""` | no |
 | <a name="input_cd_cluster_name"></a> [cd\_cluster\_name](#input\_cd\_cluster\_name) | Name of the cluster where the application is deployed. | `string` | `""` | no |
@@ -258,6 +259,7 @@ statement instead the previous block.
 | <a name="input_cd_deployment_repo_existing_url"></a> [cd\_deployment\_repo\_existing\_url](#input\_cd\_deployment\_repo\_existing\_url) | Override to bring your own existing deployment repository URL, which is used directly instead of cloning the default deployment sample. | `string` | `""` | no |
 | <a name="input_cd_deployment_repo_git_token_secret_crn"></a> [cd\_deployment\_repo\_git\_token\_secret\_crn](#input\_cd\_deployment\_repo\_git\_token\_secret\_crn) | The CRN for the Deployment repository Git Token. | `string` | `""` | no |
 | <a name="input_cd_deployment_repo_git_token_secret_name"></a> [cd\_deployment\_repo\_git\_token\_secret\_name](#input\_cd\_deployment\_repo\_git\_token\_secret\_name) | Name of the Git token secret in the secret provider. | `string` | `""` | no |
+| <a name="input_cd_deployment_repo_name"></a> [cd\_deployment\_repo\_name](#input\_cd\_deployment\_repo\_name) | The repository name. | `string` | `""` | no |
 | <a name="input_cd_deployment_repo_secret_group"></a> [cd\_deployment\_repo\_secret\_group](#input\_cd\_deployment\_repo\_secret\_group) | Secret group for the Deployment repository secret. Defaults to the value set in `sm_secret_group` if not set. Only used with `Secrets Manager`. | `string` | `""` | no |
 | <a name="input_cd_doi_toolchain_id"></a> [cd\_doi\_toolchain\_id](#input\_cd\_doi\_toolchain\_id) | The ID of the toolchain containing the DevOps Insights integration. This variable is used to link the DevOps Insights toolcard to a specific instance. | `string` | `""` | no |
 | <a name="input_cd_enable_change_management_repo"></a> [cd\_enable\_change\_management\_repo](#input\_cd\_enable\_change\_management\_repo) | Set to `true` to enable the Change Management Repo integration. | `string` | `true` | no |

ibm_catalog.json

@@ -694,6 +694,13 @@
               "description": "Name of the Git token secret in the secret provider.",
               "required": false
             },
+            {
+              "key": "cd_change_management_repo_name",
+              "type": "string",
+              "default_value": "",
+              "description": "The repository name.",
+              "required": false
+            },
             {
               "key": "cd_change_management_repo_secret_group",
               "type": "string",
@@ -826,6 +833,13 @@
               "description": "Name of the Git token secret in the secret provider.",
               "required": false
             },
+            {
+              "key": "cd_deployment_repo_name",
+              "type": "string",
+              "default_value": "",
+              "description": "The repository name.",
+              "required": false
+            },
             {
               "key": "cd_deployment_repo_secret_group",
               "type": "string",
@@ -2800,6 +2814,13 @@
               "description": "Name of the Git token secret in the secret provider.",
               "required": false
             },
+            {
+              "key": "cd_change_management_repo_name",
+              "type": "string",
+              "default_value": "",
+              "description": "The repository name.",
+              "required": false
+            },
             {
               "key": "cd_change_management_repo_secret_group",
               "type": "string",
@@ -2939,6 +2960,13 @@
               "description": "Name of the Git token secret in the secret provider.",
               "required": false
             },
+            {
+              "key": "cd_deployment_repo_name",
+              "type": "string",
+              "default_value": "",
+              "description": "The repository name.",
+              "required": false
+            },
             {
               "key": "cd_deployment_repo_secret_group",
               "type": "string",

main.tf

@@ -787,6 +787,7 @@ module "devsecops_cd_toolchain" {
   #CHANGE MANAGEMENT REPO
   enable_change_management_repo           = var.cd_enable_change_management_repo
   change_repo_clone_from_url              = var.cd_change_repo_clone_from_url
+  change_management_repo_name             = var.cd_change_management_repo_name
   change_management_repo_blind_connection = local.repo_blind_connection
   change_management_repo_root_url         = local.repo_root_url
   change_management_repo_title            = local.repo_title
@@ -801,6 +802,7 @@ module "devsecops_cd_toolchain" {
   deployment_repo_clone_to_git_id       = (var.cd_deployment_repo_clone_to_git_id == "") ? var.repo_git_id : var.cd_deployment_repo_clone_to_git_id
   deployment_repo_clone_from_url        = var.cd_deployment_repo_clone_from_url
   deployment_repo_clone_from_branch     = var.cd_deployment_repo_clone_from_branch
+  deployment_repo_name                  = var.cd_deployment_repo_name
   deployment_repo_existing_url          = (var.use_app_repo_for_cd_deploy) ? try(module.devsecops_ci_toolchain[0].app_repo_url, "") : var.cd_deployment_repo_existing_url
   deployment_repo_existing_branch       = (var.use_app_repo_for_cd_deploy) ? try(module.devsecops_ci_toolchain[0].app_repo_branch, "") : var.cd_deployment_repo_existing_branch
   deployment_repo_blind_connection      = var.repo_blind_connection

solutions/code-engine/README.md

@@ -107,6 +107,7 @@ No resources.
 | <a name="input_cd_change_management_repo_auth_type"></a> [cd\_change\_management\_repo\_auth\_type](#input\_cd\_change\_management\_repo\_auth\_type) | Select the method of authentication that is used to access the Git repository. Valid values are 'oauth' or 'pat'. Defaults to `oauth` when unset. `pat` is a git `personal access token`. | `string` | `""` | no |
 | <a name="input_cd_change_management_repo_git_token_secret_crn"></a> [cd\_change\_management\_repo\_git\_token\_secret\_crn](#input\_cd\_change\_management\_repo\_git\_token\_secret\_crn) | The CRN for the Change Management repository Git Token. | `string` | `""` | no |
 | <a name="input_cd_change_management_repo_git_token_secret_name"></a> [cd\_change\_management\_repo\_git\_token\_secret\_name](#input\_cd\_change\_management\_repo\_git\_token\_secret\_name) | Name of the Git token secret in the secret provider. | `string` | `""` | no |
+| <a name="input_cd_change_management_repo_name"></a> [cd\_change\_management\_repo\_name](#input\_cd\_change\_management\_repo\_name) | The repository name. | `string` | `""` | no |
 | <a name="input_cd_change_management_repo_secret_group"></a> [cd\_change\_management\_repo\_secret\_group](#input\_cd\_change\_management\_repo\_secret\_group) | Secret group for the Change Management repository secret. Defaults to the value set in `sm_secret_group` if not set. Only used with `Secrets Manager`. | `string` | `""` | no |
 | <a name="input_cd_change_repo_clone_from_url"></a> [cd\_change\_repo\_clone\_from\_url](#input\_cd\_change\_repo\_clone\_from\_url) | Override the default management repository, which is cloned into the application repository. Note, using clone\_if\_not\_exists mode, so if the application repository already exists the repository contents are unchanged. | `string` | `""` | no |
 | <a name="input_cd_cluster_name"></a> [cd\_cluster\_name](#input\_cd\_cluster\_name) | Name of the cluster where the application is deployed. | `string` | `""` | no |
@@ -128,6 +129,7 @@ No resources.
 | <a name="input_cd_deployment_repo_existing_url"></a> [cd\_deployment\_repo\_existing\_url](#input\_cd\_deployment\_repo\_existing\_url) | Override to bring your own existing deployment repository URL, which is used directly instead of cloning the default deployment sample. | `string` | `""` | no |
 | <a name="input_cd_deployment_repo_git_token_secret_crn"></a> [cd\_deployment\_repo\_git\_token\_secret\_crn](#input\_cd\_deployment\_repo\_git\_token\_secret\_crn) | The CRN for the Deployment repository Git Token. | `string` | `""` | no |
 | <a name="input_cd_deployment_repo_git_token_secret_name"></a> [cd\_deployment\_repo\_git\_token\_secret\_name](#input\_cd\_deployment\_repo\_git\_token\_secret\_name) | Name of the Git token secret in the secret provider. | `string` | `""` | no |
+| <a name="input_cd_deployment_repo_name"></a> [cd\_deployment\_repo\_name](#input\_cd\_deployment\_repo\_name) | The repository name. | `string` | `""` | no |
 | <a name="input_cd_deployment_repo_secret_group"></a> [cd\_deployment\_repo\_secret\_group](#input\_cd\_deployment\_repo\_secret\_group) | Secret group for the Deployment repository secret. Defaults to the value set in `sm_secret_group` if not set. Only used with `Secrets Manager`. | `string` | `""` | no |
 | <a name="input_cd_doi_toolchain_id"></a> [cd\_doi\_toolchain\_id](#input\_cd\_doi\_toolchain\_id) | The ID of the toolchain containing the DevOps Insights integration. This variable is used to link the DevOps Insights toolcard to a specific instance. | `string` | `""` | no |
 | <a name="input_cd_enable_change_management_repo"></a> [cd\_enable\_change\_management\_repo](#input\_cd\_enable\_change\_management\_repo) | Set to `true` to enable the Change Management Repo integration. | `string` | `true` | no |

solutions/code-engine/main.tf

@@ -200,6 +200,7 @@ module "devsecops_da" {
   cd_change_management_repo_auth_type             = var.cd_change_management_repo_auth_type
   cd_change_management_repo_git_token_secret_crn  = var.cd_change_management_repo_git_token_secret_crn
   cd_change_management_repo_git_token_secret_name = var.cd_change_management_repo_git_token_secret_name
+  cd_change_management_repo_name                  = var.cd_change_management_repo_name
   cd_change_management_repo_secret_group          = var.cd_change_management_repo_secret_group
   cd_change_repo_clone_from_url                   = var.cd_change_repo_clone_from_url
   cd_enable_change_management_repo                = var.cd_enable_change_management_repo
@@ -222,6 +223,7 @@ module "devsecops_da" {
   cd_deployment_repo_existing_url                 = var.cd_deployment_repo_existing_url
   cd_deployment_repo_git_token_secret_crn         = var.cd_deployment_repo_git_token_secret_crn
   cd_deployment_repo_git_token_secret_name        = var.cd_deployment_repo_git_token_secret_name
+  cd_deployment_repo_name                         = var.cd_deployment_repo_name
   cd_deployment_repo_secret_group                 = var.cd_deployment_repo_secret_group
   cd_doi_toolchain_id                             = var.cd_doi_toolchain_id
   continuous_delivery_service_name                = var.continuous_delivery_service_name

solutions/code-engine/variables.tf

@@ -1300,6 +1300,12 @@ variable "cd_change_repo_clone_from_url" {
   default     = ""
 }
 
+variable "cd_change_management_repo_name" {
+  type        = string
+  description = "The repository name."
+  default     = ""
+}
+
 variable "cd_cluster_name" {
   type        = string
   description = "Name of the cluster where the application is deployed."
@@ -1366,6 +1372,12 @@ variable "cd_deployment_repo_clone_from_url" {
   default     = ""
 }
 
+variable "cd_deployment_repo_name" {
+  type        = string
+  description = "The repository name."
+  default     = ""
+}
+
 variable "cd_deployment_repo_clone_to_git_id" {
   type        = string
   description = "By default absent, else custom server GUID, or other options for 'git_id' field in the browser UI."

solutions/kubernetes/README.md

@@ -106,6 +106,7 @@ No resources.
 | <a name="input_cd_change_management_repo_auth_type"></a> [cd\_change\_management\_repo\_auth\_type](#input\_cd\_change\_management\_repo\_auth\_type) | Select the method of authentication that is used to access the Git repository. Valid values are 'oauth' or 'pat'. Defaults to `oauth` when unset. `pat` is a git `personal access token`. | `string` | `""` | no |
 | <a name="input_cd_change_management_repo_git_token_secret_crn"></a> [cd\_change\_management\_repo\_git\_token\_secret\_crn](#input\_cd\_change\_management\_repo\_git\_token\_secret\_crn) | The CRN for the Change Management repository Git Token. | `string` | `""` | no |
 | <a name="input_cd_change_management_repo_git_token_secret_name"></a> [cd\_change\_management\_repo\_git\_token\_secret\_name](#input\_cd\_change\_management\_repo\_git\_token\_secret\_name) | Name of the Git token secret in the secret provider. | `string` | `""` | no |
+| <a name="input_cd_change_management_repo_name"></a> [cd\_change\_management\_repo\_name](#input\_cd\_change\_management\_repo\_name) | The repository name. | `string` | `""` | no |
 | <a name="input_cd_change_management_repo_secret_group"></a> [cd\_change\_management\_repo\_secret\_group](#input\_cd\_change\_management\_repo\_secret\_group) | Secret group for the Change Management repository secret. Defaults to the value set in `sm_secret_group` if not set. Only used with `Secrets Manager`. | `string` | `""` | no |
 | <a name="input_cd_change_repo_clone_from_url"></a> [cd\_change\_repo\_clone\_from\_url](#input\_cd\_change\_repo\_clone\_from\_url) | Override the default management repository, which is cloned into the application repository. Note, using clone\_if\_not\_exists mode, so if the application repository already exists the repository contents are unchanged. | `string` | `""` | no |
 | <a name="input_cd_cluster_name"></a> [cd\_cluster\_name](#input\_cd\_cluster\_name) | Name of the cluster where the application is deployed. | `string` | `""` | no |
@@ -127,6 +128,7 @@ No resources.
 | <a name="input_cd_deployment_repo_existing_url"></a> [cd\_deployment\_repo\_existing\_url](#input\_cd\_deployment\_repo\_existing\_url) | Override to bring your own existing deployment repository URL, which is used directly instead of cloning the default deployment sample. | `string` | `""` | no |
 | <a name="input_cd_deployment_repo_git_token_secret_crn"></a> [cd\_deployment\_repo\_git\_token\_secret\_crn](#input\_cd\_deployment\_repo\_git\_token\_secret\_crn) | The CRN for the Deployment repository Git Token. | `string` | `""` | no |
 | <a name="input_cd_deployment_repo_git_token_secret_name"></a> [cd\_deployment\_repo\_git\_token\_secret\_name](#input\_cd\_deployment\_repo\_git\_token\_secret\_name) | Name of the Git token secret in the secret provider. | `string` | `""` | no |
+| <a name="input_cd_deployment_repo_name"></a> [cd\_deployment\_repo\_name](#input\_cd\_deployment\_repo\_name) | The repository name. | `string` | `""` | no |
 | <a name="input_cd_deployment_repo_secret_group"></a> [cd\_deployment\_repo\_secret\_group](#input\_cd\_deployment\_repo\_secret\_group) | Secret group for the Deployment repository secret. Defaults to the value set in `sm_secret_group` if not set. Only used with `Secrets Manager`. | `string` | `""` | no |
 | <a name="input_cd_doi_toolchain_id"></a> [cd\_doi\_toolchain\_id](#input\_cd\_doi\_toolchain\_id) | The ID of the toolchain containing the DevOps Insights integration. This variable is used to link the DevOps Insights toolcard to a specific instance. | `string` | `""` | no |
 | <a name="input_cd_enable_change_management_repo"></a> [cd\_enable\_change\_management\_repo](#input\_cd\_enable\_change\_management\_repo) | Set to `true` to enable the Change Management Repo integration. | `string` | `true` | no |

solutions/kubernetes/main.tf

@@ -199,6 +199,7 @@ module "devsecops_da" {
   cd_change_management_repo_auth_type             = var.cd_change_management_repo_auth_type
   cd_change_management_repo_git_token_secret_crn  = var.cd_change_management_repo_git_token_secret_crn
   cd_change_management_repo_git_token_secret_name = var.cd_change_management_repo_git_token_secret_name
+  cd_change_management_repo_name                  = var.cd_change_management_repo_name
   cd_change_management_repo_secret_group          = var.cd_change_management_repo_secret_group
   cd_change_repo_clone_from_url                   = var.cd_change_repo_clone_from_url
   cd_enable_change_management_repo                = var.cd_enable_change_management_repo
@@ -221,6 +222,7 @@ module "devsecops_da" {
   cd_deployment_repo_existing_url                 = var.cd_deployment_repo_existing_url
   cd_deployment_repo_git_token_secret_crn         = var.cd_deployment_repo_git_token_secret_crn
   cd_deployment_repo_git_token_secret_name        = var.cd_deployment_repo_git_token_secret_name
+  cd_deployment_repo_name                         = var.cd_deployment_repo_name
   cd_deployment_repo_secret_group                 = var.cd_deployment_repo_secret_group
   cd_doi_toolchain_id                             = var.cd_doi_toolchain_id
   continuous_delivery_service_name                = var.continuous_delivery_service_name

solutions/kubernetes/variables.tf

@@ -1292,6 +1292,12 @@ variable "cd_change_repo_clone_from_url" {
   default     = ""
 }
 
+variable "cd_change_management_repo_name" {
+  type        = string
+  description = "The repository name."
+  default     = ""
+}
+
 variable "cd_cluster_name" {
   type        = string
   description = "Name of the cluster where the application is deployed."
@@ -1358,6 +1364,12 @@ variable "cd_deployment_repo_clone_from_url" {
   default     = ""
 }
 
+variable "cd_deployment_repo_name" {
+  type        = string
+  description = "The repository name."
+  default     = ""
+}
+
 variable "cd_deployment_repo_clone_to_git_id" {
   type        = string
   description = "By default absent, else custom server GUID, or other options for 'git_id' field in the browser UI."

variables.tf

@@ -2026,6 +2026,12 @@ variable "cd_change_repo_clone_from_url" {
   default     = ""
 }
 
+variable "cd_change_management_repo_name" {
+  type        = string
+  description = "The repository name."
+  default     = ""
+}
+
 variable "cd_cluster_name" {
   type        = string
   description = "Name of the cluster where the application is deployed."
@@ -2168,6 +2174,12 @@ variable "cd_deployment_repo_clone_from_url" {
   default     = ""
 }
 
+variable "cd_deployment_repo_name" {
+  type        = string
+  description = "The repository name."
+  default     = ""
+}
+
 variable "cd_deployment_repo_clone_to_git_id" {
   type        = string
   description = "By default absent, else custom server GUID, or other options for 'git_id' field in the browser UI."