feat: json based pipeline properties

BREAKING CHANGE: All pipeline properties can now be set via JSON fields. Take note of existing pipeline properties as some settings could be reset. To ease transition, there are still several pipeline properties that can be set via variables. Properties set in the JSON input will override the values set in the variables.
terraform-ibm-modules · Sep 17, 2024 · 8859d7b · 8859d7b
1 parent 87c3d2e
commit 8859d7b
Show file tree

Hide file tree

Showing 38 changed files with 14,157 additions and 14,603 deletions.
diff --git a/.secrets.baseline b/.secrets.baseline
@@ -3,7 +3,7 @@
     "files": "go.sum|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2024-07-09T15:33:13Z",
+  "generated_at": "2024-09-05T12:51:27Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -86,6 +86,26 @@
         "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
+      }
+    ],
+    "solutions/kubernetes/provider.tf.example": [
+      {
+        "hashed_secret": "91199272d5d6a574a51722ca6f3d1148edb1a0e7",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 2,
+        "type": "Secret Keyword",
+        "verified_result": null
+      }
     ]
   },
   "version": "0.13.1+ibm.62.dss",

diff --git a/README.md b/README.md
diff --git a/code-engine/main.tf b/code-engine/main.tf
diff --git a/code-engine/version.tf b/code-engine/version.tf
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.9.5"
+  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.0.0-beta.1"
   ibmcloud_api_key         = var.ibmcloud_api_key
   toolchain_resource_group = var.toolchain_resource_group
   toolchain_region         = var.toolchain_region

diff --git a/examples/default/terraform.tfvars.example b/examples/default/terraform.tfvars.example
@@ -21,8 +21,8 @@ enable_secrets_manager   = false
 ci_registry_namespace    = "my-namespace"
 ci_registry_region       = "ibm:yp:us-south"
 ci_cluster_name          = "mycluster-free"
-ci_dev_region            = "ibm:yp:us-south"
-ci_dev_resource_group    = "Default"
+ci_cluster_region            = "ibm:yp:us-south"
+ci_cluster_resource_group    = "Default"
 ci_cluster_namespace     = "dev"
 cd_cluster_name          = "mycluster-free"
 cd_cluster_namespace     = "prod"
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.65.0"
+      version = "= 1.67.1"
     }
   }
 }
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.9.5"
+  source                            = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.0.0-beta.1"
   ibmcloud_api_key                  = var.ibmcloud_api_key
   toolchain_resource_group          = var.toolchain_resource_group
   toolchain_region                  = var.toolchain_region
@@ -14,11 +14,10 @@ module "terraform_devsecops_alm" {
   create_cd_toolchain               = var.create_cd_toolchain
   create_cc_toolchain               = var.create_cc_toolchain
   ci_app_repo_clone_from_url        = var.ci_app_repo_clone_from_url
-  ci_app_repo_clone_from_branch     = var.ci_app_repo_clone_from_branch
   ci_app_repo_existing_url          = var.ci_app_repo_existing_url
-  ci_app_repo_existing_branch       = var.ci_app_repo_existing_branch
   ci_app_repo_existing_git_provider = var.ci_app_repo_existing_git_provider
   ci_app_repo_existing_git_id       = var.ci_app_repo_existing_git_id
+  app_repo_branch                   = var.app_repo_branch
   #disabling authorization_policy_creation as it seems to be unstable for the unit tests
   authorization_policy_creation = "disabled"
 }
diff --git a/examples/devsecops-ci-toolchain-bring-your-own-app/terraform.tfvars.example b/examples/devsecops-ci-toolchain-bring-your-own-app/terraform.tfvars.example
@@ -27,8 +27,8 @@ enable_secrets_manager   = false
 ci_registry_namespace    = "my-namespace"
 ci_registry_region       = "ibm:yp:us-south"
 ci_cluster_name          = "mycluster-free"
-ci_dev_region            = "ibm:yp:us-south"
-ci_dev_resource_group    = "Default"
+ci_cluster_region            = "ibm:yp:us-south"
+ci_cluster_resource_group    = "Default"
 ci_cluster_namespace     = "dev"
 cd_cluster_name          = "mycluster-free"
 cd_cluster_namespace     = "prod"

diff --git a/examples/devsecops-ci-toolchain-bring-your-own-app/variables.tf b/examples/devsecops-ci-toolchain-bring-your-own-app/variables.tf
@@ -85,21 +85,9 @@ variable "ci_app_repo_clone_from_url" {
   default     = ""
 }
 
-variable "ci_app_repo_clone_from_branch" {
-  type        = string
-  description = "Used when app_repo_clone_from_url is provided, the default branch that is used by the CI build, usually either main or master."
-  default     = ""
-}
-
 variable "ci_app_repo_existing_url" {
   type        = string
-  description = "Override to bring your own existing application repository URL, which is used directly instead of cloning the default sample."
-  default     = ""
-}
-
-variable "ci_app_repo_existing_branch" {
-  type        = string
-  description = "Used when app_repo_existing_url is provided, the default branch that is used by the CI build, usually either main or master."
+  description = "Bring your own existing application repository by providing the URL. This will create an integration for your application repository instead of cloning the default sample. Repositories existing in a different org will require the use of Git token. See `app_repo_git_token_secret_name` under optional variables. "
   default     = ""
 }
 
@@ -114,3 +102,9 @@ variable "ci_app_repo_existing_git_id" {
   description = "By default absent, else custom server GUID, or other options for 'git_id' field in the browser UI."
   default     = ""
 }
+
+variable "app_repo_branch" {
+  type        = string
+  description = "This is the repository branch used by the default sample application. Alternatively if `app_repo_existing_url` is provided, then the branch must reflect the default branch for that repository. Typically these branches are `main` or `master`."
+  default     = ""
+}
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.65.0"
+      version = "= 1.67.1"
     }
   }
 }
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.9.5"
+  source                   = "git::https://github.com/terraform-ibm-modules/terraform-ibm-devsecops-alm?ref=v2.0.0-beta.1"
   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/terraform.tfvars.example b/examples/devsecops-ci-toolchain-with-key-protect/terraform.tfvars.example
@@ -26,8 +26,8 @@ enable_secrets_manager   = false
 ci_registry_namespace    = "my-namespace"
 ci_registry_region       = "ibm:yp:us-south"
 ci_cluster_name          = "mycluster-free"
-ci_dev_region            = "ibm:yp:us-south"
-ci_dev_resource_group    = "Default"
+ci_cluster_region            = "ibm:yp:us-south"
+ci_cluster_resource_group    = "Default"
 ci_cluster_namespace     = "dev"
 cd_cluster_name          = "mycluster-free"
 cd_cluster_namespace     = "prod"
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.65.0"
+      version = "= 1.67.1"
     }
   }
 }
diff --git a/examples/variables.tfvars.example b/examples/variables.tfvars.example
@@ -29,8 +29,8 @@ ci_cluster_namespace               = "prod"
 cd_cluster_name                    = "mycluster-free"
 cd_cluster_namespace               = "prod"
 
-ci_dev_region                      = "ibm:yp:us-south"
-ci_dev_resource_group              = "Default"
+ci_cluster_region                      = "ibm:yp:us-south"
+ci_cluster_resource_group              = "Default"
 
 #Set the region where the toolchain will be created. Using 'toolchain_region' will set the same value for each of the toolchains.
 #The regions can be explicitly set for each toolchain using the variables prefixed with 'ci', 'cd' and 'cc'