fix: add missing disabling of evidence repo tool integration (#626)

Author: huayuenh

README.md

@@ -529,6 +529,7 @@ statement instead the previous block.
 | <a name="input_event_notifications_tool_name"></a> [event\_notifications\_tool\_name](#input\_event\_notifications\_tool\_name) | The name of the Event Notifications integration. | `string` | `"Event Notifications"` | no |
 | <a name="input_evidence_group"></a> [evidence\_group](#input\_evidence\_group) | Specify the Git user or group for the evidence repository. | `string` | `""` | no |
 | <a name="input_evidence_repo_auth_type"></a> [evidence\_repo\_auth\_type](#input\_evidence\_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_evidence_repo_enabled"></a> [evidence\_repo\_enabled](#input\_evidence\_repo\_enabled) | Set to `true` to enable the evidence repository tool integration. | `bool` | `true` | no |
 | <a name="input_evidence_repo_existing_git_id"></a> [evidence\_repo\_existing\_git\_id](#input\_evidence\_repo\_existing\_git\_id) | Set this value to `github` for github.com, or to the GUID of a custom GitHub Enterprise server. | `string` | `""` | no |
 | <a name="input_evidence_repo_existing_git_provider"></a> [evidence\_repo\_existing\_git\_provider](#input\_evidence\_repo\_existing\_git\_provider) | Git provider for evidence repo. If not set will default to `hostedgit`. | `string` | `""` | no |
 | <a name="input_evidence_repo_existing_url"></a> [evidence\_repo\_existing\_url](#input\_evidence\_repo\_existing\_url) | Set to use an existing evidence repository. | `string` | `""` | no |

ibm_catalog.json

@@ -1534,6 +1534,13 @@
               "description": "The name of the repository integration owner.",
               "required": false
             },
+            {
+              "key": "evidence_repo_enabled",
+              "type": "boolean",
+              "default_value": true,
+              "description": "Set to `true` to enable the evidence repository tool integration.",
+              "required": false
+            },
             {
               "key": "evidence_repo_name",
               "type": "string",
@@ -3745,6 +3752,13 @@
               "description": "The name of the repository integration owner.",
               "required": false
             },
+            {
+              "key": "evidence_repo_enabled",
+              "type": "boolean",
+              "default_value": true,
+              "description": "Set to `true` to enable the evidence repository tool integration.",
+              "required": false
+            },
             {
               "key": "evidence_repo_name",
               "type": "string",

main.tf

@@ -481,6 +481,7 @@ module "devsecops_ci_toolchain" {
   pipeline_config_repo_title            = var.repo_title
 
   #EVIDENCE REPO
+  evidence_repo_enabled           = var.evidence_repo_enabled
   evidence_repo_name              = var.evidence_repo_name
   evidence_repo_existing_url      = var.evidence_repo_existing_url
   evidence_source_repo_url        = var.evidence_repo_source_url
@@ -756,6 +757,7 @@ module "devsecops_cd_toolchain" {
   pipeline_config_repo_title            = var.repo_title
 
   #EVIDENCE REPO
+  evidence_repo_enabled           = var.evidence_repo_enabled
   evidence_repo_name              = var.evidence_repo_name
   evidence_repo_url               = try(module.devsecops_ci_toolchain[0].evidence_repo_url, var.evidence_repo_existing_url)
   evidence_repo_git_provider      = local.evidence_repo_existing_git_provider
@@ -1055,6 +1057,7 @@ module "devsecops_cc_toolchain" {
   app_repo_root_url         = var.repo_root_url
 
   #EVIDENCE REPO
+  evidence_repo_enabled           = var.evidence_repo_enabled
   evidence_repo_name              = var.evidence_repo_name
   evidence_repo_url               = try(module.devsecops_ci_toolchain[0].evidence_repo_url, var.evidence_repo_existing_url)
   evidence_repo_git_provider      = local.evidence_repo_existing_git_provider

solutions/code-engine/README.md

@@ -235,6 +235,7 @@ No resources.
 | <a name="input_event_notifications_tool_name"></a> [event\_notifications\_tool\_name](#input\_event\_notifications\_tool\_name) | The name of the Event Notifications integration. | `string` | `"Event Notifications"` | no |
 | <a name="input_evidence_group"></a> [evidence\_group](#input\_evidence\_group) | Specify the Git user or group for the evidence repository. | `string` | `""` | no |
 | <a name="input_evidence_repo_auth_type"></a> [evidence\_repo\_auth\_type](#input\_evidence\_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_evidence_repo_enabled"></a> [evidence\_repo\_enabled](#input\_evidence\_repo\_enabled) | Set to `true` to enable the evidence repository tool integration. | `bool` | `true` | no |
 | <a name="input_evidence_repo_existing_git_id"></a> [evidence\_repo\_existing\_git\_id](#input\_evidence\_repo\_existing\_git\_id) | Set this value to `github` for github.com, or to the GUID of a custom GitHub Enterprise server. | `string` | `""` | no |
 | <a name="input_evidence_repo_existing_git_provider"></a> [evidence\_repo\_existing\_git\_provider](#input\_evidence\_repo\_existing\_git\_provider) | Git provider for evidence repo. If not set will default to `hostedgit`. | `string` | `""` | no |
 | <a name="input_evidence_repo_existing_url"></a> [evidence\_repo\_existing\_url](#input\_evidence\_repo\_existing\_url) | Set to use an existing evidence repository. | `string` | `""` | no |

solutions/code-engine/main.tf

@@ -77,6 +77,7 @@ module "devsecops_da" {
   evidence_repo_git_token_secret_crn              = var.evidence_repo_git_token_secret_crn
   evidence_repo_git_token_secret_name             = var.evidence_repo_git_token_secret_name
   evidence_repo_integration_owner                 = var.evidence_repo_integration_owner
+  evidence_repo_enabled                           = var.evidence_repo_enabled
   evidence_repo_name                              = var.evidence_repo_name
   evidence_repo_secret_group                      = var.evidence_repo_secret_group
   evidence_repo_source_url                        = var.evidence_repo_source_url

solutions/code-engine/variables.tf

@@ -459,6 +459,12 @@ variable "evidence_repo_integration_owner" {
   default     = ""
 }
 
+variable "evidence_repo_enabled" {
+  type        = bool
+  description = "Set to `true` to enable the evidence repository tool integration."
+  default     = true
+}
+
 variable "evidence_repo_name" {
   type        = string
   description = "Set to use a custom name for the Evidence repository."

solutions/kubernetes/README.md

@@ -234,6 +234,7 @@ No resources.
 | <a name="input_event_notifications_tool_name"></a> [event\_notifications\_tool\_name](#input\_event\_notifications\_tool\_name) | The name of the Event Notifications integration. | `string` | `"Event Notifications"` | no |
 | <a name="input_evidence_group"></a> [evidence\_group](#input\_evidence\_group) | Specify the Git user or group for the evidence repository. | `string` | `""` | no |
 | <a name="input_evidence_repo_auth_type"></a> [evidence\_repo\_auth\_type](#input\_evidence\_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_evidence_repo_enabled"></a> [evidence\_repo\_enabled](#input\_evidence\_repo\_enabled) | Set to `true` to enable the evidence repository tool integration. | `bool` | `true` | no |
 | <a name="input_evidence_repo_existing_git_id"></a> [evidence\_repo\_existing\_git\_id](#input\_evidence\_repo\_existing\_git\_id) | Set this value to `github` for github.com, or to the GUID of a custom GitHub Enterprise server. | `string` | `""` | no |
 | <a name="input_evidence_repo_existing_git_provider"></a> [evidence\_repo\_existing\_git\_provider](#input\_evidence\_repo\_existing\_git\_provider) | By default this gets set as 'hostedgit', else set to 'githubconsolidated' for GitHub repositories. | `string` | `""` | no |
 | <a name="input_evidence_repo_existing_url"></a> [evidence\_repo\_existing\_url](#input\_evidence\_repo\_existing\_url) | Set to use an existing evidence repository. | `string` | `""` | no |

solutions/kubernetes/main.tf

@@ -76,6 +76,7 @@ module "devsecops_da" {
   evidence_repo_git_token_secret_crn              = var.evidence_repo_git_token_secret_crn
   evidence_repo_git_token_secret_name             = var.evidence_repo_git_token_secret_name
   evidence_repo_integration_owner                 = var.evidence_repo_integration_owner
+  evidence_repo_enabled                           = var.evidence_repo_enabled
   evidence_repo_name                              = var.evidence_repo_name
   evidence_repo_secret_group                      = var.evidence_repo_secret_group
   evidence_repo_source_url                        = var.evidence_repo_source_url

solutions/kubernetes/variables.tf

@@ -452,6 +452,12 @@ variable "evidence_repo_integration_owner" {
   default     = ""
 }
 
+variable "evidence_repo_enabled" {
+  type        = bool
+  description = "Set to `true` to enable the evidence repository tool integration."
+  default     = true
+}
+
 variable "evidence_repo_name" {
   type        = string
   description = "Set to use a custom name for the Evidence repository."

variables.tf

@@ -522,6 +522,12 @@ variable "evidence_repo_integration_owner" {
   default     = ""
 }
 
+variable "evidence_repo_enabled" {
+  type        = bool
+  description = "Set to `true` to enable the evidence repository tool integration."
+  default     = true
+}
+
 variable "evidence_repo_name" {
   type        = string
   description = "Set to use a custom name for the Evidence repository."