feat: 105 da update (#242)

terraform-ibm-modules · Sep 6, 2023 · c88930d · c88930d
1 parent fce4ec8
commit c88930d
Show file tree

Hide file tree

Showing 22 changed files with 2,944 additions and 676 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-06-07T10:44:42Z",
+  "generated_at": "2023-09-05T21:24:13Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -92,7 +92,17 @@
         "hashed_secret": "d47dcacc720a39e236679ac3e311a0d58bb6519e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4279,
+        "line_number": 5824,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
+    ],
+    "provider.tf.example": [
+      {
+        "hashed_secret": "91199272d5d6a574a51722ca6f3d1148edb1a0e7",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 2,
         "type": "Secret Keyword",
         "verified_result": null
       }

diff --git a/README.md b/README.md
diff --git a/cra-config.yaml b/cra-config.yaml
@@ -6,6 +6,5 @@ CRA_TARGETS:
     PROFILE_ID: "0e6e7b5a-817d-4344-ab6f-e5d7a9c49520" # SCC profile ID (currently set to the FSCloud 1.4.0 profile).
     SCC_INSTANCE_ID: "293a81bc-b706-4a2b-b2f8-36010a0373f6" # The SCC instance ID to use to download profile for CRA scan. If not provided, a default global value will be used.
     SCC_REGION: "us-south" # The IBM Cloud region that the SCC instance is in. If not provided, a default global value will be used.
-    # CRA_ENVIRONMENT_VARIABLES:  # An optional map of environment variables for CRA, where the key is the variable name and value is the value. Useful for providing TF_VARs.
-    #   TF_VAR_sample: "sample value"
-    #   TF_VAR_other:  "another value"
+    CRA_ENVIRONMENT_VARIABLES:  # An optional map of environment variables for CRA, where the key is the variable name and value is the value. Useful for providing TF_VARs.
+      TF_VAR_enable_secrets_manager: false
diff --git a/examples/default/main.tf b/examples/default/main.tf
@@ -1,5 +1,5 @@
 module "terraform_devsecops_alm" {
-  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.0.4"
+  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.0.5-beta.3"
   ibmcloud_api_key         = var.ibmcloud_api_key
   toolchain_resource_group = var.toolchain_resource_group
   toolchain_region         = var.toolchain_region

diff --git a/examples/default/variables.tf b/examples/default/variables.tf
@@ -34,7 +34,7 @@ variable "cluster_name" {
 variable "enable_key_protect" {
   type        = bool
   description = "Set to enable Key Protect Integrations. "
-  default     = true
+  default     = false
 }
 
 variable "enable_secrets_manager" {

diff --git a/examples/default/version.tf b/examples/default/version.tf
@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.52.1"
+      version = "1.55.0"
     }
   }
 }
diff --git a/examples/devsecops-ci-toolchain-bring-your-own-app/main.tf b/examples/devsecops-ci-toolchain-bring-your-own-app/main.tf
@@ -1,5 +1,5 @@
 module "terraform_devsecops_alm" {
-  source                            = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.0.4"
+  source                            = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.0.5-beta.3"
   ibmcloud_api_key                  = var.ibmcloud_api_key
   toolchain_resource_group          = var.toolchain_resource_group
   toolchain_region                  = var.toolchain_region

diff --git a/examples/devsecops-ci-toolchain-bring-your-own-app/variables.tf b/examples/devsecops-ci-toolchain-bring-your-own-app/variables.tf
@@ -34,7 +34,7 @@ variable "cluster_name" {
 variable "enable_key_protect" {
   type        = bool
   description = "Set to enable Key Protect Integrations. "
-  default     = true
+  default     = false
 }
 
 variable "enable_secrets_manager" {

diff --git a/examples/devsecops-ci-toolchain-bring-your-own-app/version.tf b/examples/devsecops-ci-toolchain-bring-your-own-app/version.tf
@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.52.1"
+      version = "1.55.0"
     }
   }
 }
diff --git a/examples/devsecops-ci-toolchain-with-key-protect/main.tf b/examples/devsecops-ci-toolchain-with-key-protect/main.tf
@@ -1,5 +1,5 @@
 module "terraform_devsecops_alm" {
-  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.0.4"
+  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v1.0.5-beta.3"
   ibmcloud_api_key         = var.ibmcloud_api_key
   toolchain_resource_group = var.toolchain_resource_group
   toolchain_region         = var.toolchain_region

diff --git a/examples/devsecops-ci-toolchain-with-key-protect/variables.tf b/examples/devsecops-ci-toolchain-with-key-protect/variables.tf
@@ -34,7 +34,7 @@ variable "cluster_name" {
 variable "enable_key_protect" {
   type        = bool
   description = "Set to enable Key Protect Integrations. "
-  default     = true
+  default     = false
 }
 
 variable "enable_secrets_manager" {

diff --git a/examples/devsecops-ci-toolchain-with-key-protect/version.tf b/examples/devsecops-ci-toolchain-with-key-protect/version.tf
@@ -4,7 +4,7 @@ terraform {
     # Pin to the lowest provider version of the range defined in the main module's version.tf to ensure lowest version still works
     ibm = {
       source  = "IBM-Cloud/ibm"
-      version = "1.52.1"
+      version = "1.55.0"
     }
   }
 }