feat: Sync with main

* Sync DA code with main DA
* Prefix now required input by user

Author: rajatagarwal-ibm

.catalog-onboard-pipeline.yaml

@@ -3,17 +3,12 @@ apiVersion: v1
 offerings:
   - name: testing-deploy-arch-ibm-scc
     kind: solution
-    catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
-    offering_id: 9423f9bc-1290-4c71-a9ac-01898bfa7ccc
+    catalog_id: f64499c8-eb50-4985-bf91-29f9e605a433
+    offering_id: b773b1d4-69bb-48db-a657-2307015eb9c1
     variations:
       - name: instances
         mark_ready: true
         install_type: fullstack
         scc:
           instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
           region: us-south
-      - name: agents
-        mark_ready: true
-        install_type: extension
-        pre_validation: "tests/scripts/pre-validation-deploy-slz-roks-and-scc-wp-instances.sh"
-        post_validation: "tests/scripts/post-validation-destroy-slz-roks-and-scc-wp-instances.sh"

.releaserc

@@ -10,6 +10,9 @@
     }],
     ["@semantic-release/exec", {
       "successCmd": "echo \"SEMVER_VERSION=${nextRelease.version}\" >> $GITHUB_ENV"
+    }],
+    ["@semantic-release/exec",{
+      "publishCmd": "./ci/trigger-catalog-onboarding-pipeline.sh --version=v${nextRelease.version}"
     }]
   ]
 }

README.md

@@ -10,11 +10,10 @@
 [![Renovate enabled](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovatebot.com/)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 
-This repository contains the following infrastructure as code solutions:
+This repository contains the following infrastructure as code solution:
 - [Security and Compliance Center instances solution](./solutions/instances)
-- [Security and Compliance Center Workload Protection agents solution](./solutions/agents)
 
-:exclamation: **Important:** These solutions are not intended to be called by other modules because they contain a provider configuration and are not compatible with the `for_each`, `count`, and `depends_on` arguments. For more information see [Providers Within Modules](https://developer.hashicorp.com/terraform/language/modules/develop/providers)
+:exclamation: **Important:** This solution is not intended to be called by other modules because it contains a provider configuration and is not compatible with the `for_each`, `count`, and `depends_on` arguments. For more information see [Providers Within Modules](https://developer.hashicorp.com/terraform/language/modules/develop/providers)
 
 <!-- Leave this section as is so that your module has a link to local development environment set up steps for contributors to follow -->
 ## Contributing

common-dev-assets

@@ -8,3 +8,4 @@ CRA_TARGETS:
       TF_VAR_resource_group_name: "test"
       TF_VAR_existing_kms_instance_crn: "crn:v1:bluemix:public:hs-crypto:us-south:a/abac0df06b644a9cabc6e44f55b3880e:e6dce284-e80f-46e1-a3c1-830f7adff7a9::"
       TF_VAR_provider_visibility: "public"
+      TF_VAR_prefix: "scc-cra"

cra-config.yaml

@@ -22,7 +22,7 @@
         "solution"
       ],
       "short_description": "Creates and configures IBM Security and Compliance Center resources",
-      "long_description": "Looking for the released version? Go [here](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-scc-9423f9bc-1290-4c71-a9ac-01898bfa7ccc-global). Stay here if you want to try an experimental version with upcoming features. \n\nThis architecture supports creating and configuring IBM Security and Compliance Center resources.",
+      "long_description": "Looking for the released version? Go [here](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-scc-9423f9bc-1290-4c71-a9ac-01898bfa7ccc-global). Stay here if you want to try an experimental version with the [Optional and swappable components](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-choose-plan-process#optional-swappable) capability. \n\nThis architecture supports creating and configuring IBM Security and Compliance Center resources.",
       "offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-scc-da/blob/main/solutions/instances/README.md",
       "offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-scc-da/main/images/scc-icon.svg",
       "provider_name": "IBM",
@@ -45,7 +45,7 @@
         {
           "label": "Instances",
           "name": "instances",
-          "install_type": "extension",
+          "install_type": "fullstack",
           "working_directory": "solutions/instances",
           "compliance": {
             "authority": "scc-v3",
@@ -90,7 +90,7 @@
             {
               "key": "prefix",
               "required": true,
-              "description": "The prefix to add to all resources that this solution creates. To not use any prefix value, you can enter the string `__NULL__`."
+              "description": "The prefix to add to all resources that this solution creates (e.g `prod`, `test`, `dev`). To not use any prefix value, you can enter the string `__NULL__`."
             },
             {
               "key": "existing_monitoring_crn",
@@ -274,6 +274,10 @@
               "key": "en_source_name",
               "required": false
             },
+            {
+              "key": "en_source_description",
+              "required": false
+            },
             {
               "key": "scc_instance_tags",
               "required": false
@@ -347,7 +351,7 @@
               "required": false
             },
             {
-              "key": "existing_activity_tracker_crn",
+              "key": "ibmcloud_kms_api_key",
               "required": false
             },
             {
@@ -361,6 +365,10 @@
             {
               "key": "scc_en_reply_to_email",
               "required": false
+            },
+            {
+              "key": "cbr_rules",
+              "required": false
             }
           ],
           "iam_permissions": [
@@ -420,11 +428,19 @@
                 "standard"
               ],
               "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
+              "ignore_auto_referencing": [
+                "*"
+              ],
               "input_mapping": [
                 {
                   "dependency_output": "kms_instance_crn",
                   "version_input": "existing_kms_instance_crn"
                 },
+                {
+                  "dependency_input": "prefix",
+                  "version_input": "prefix",
+                  "reference_version": true
+                },
                 {
                   "dependency_input": "region",
                   "version_input": "scc_region",
@@ -442,6 +458,9 @@
                 "standard"
               ],
               "id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global",
+              "ignore_auto_referencing": [
+                "*"
+              ],
               "input_mapping": [
                 {
                   "dependency_output": "audit_resource_group_name",
@@ -450,11 +469,16 @@
                 {
                   "version_input": "use_existing_resource_group",
                   "value": true
+                },
+                {
+                  "dependency_input": "prefix",
+                  "version_input": "prefix",
+                  "reference_version": true
                 }
               ],
               "optional": true,
               "on_by_default": true,
-              "version": "^1.11.6"
+              "version": "^v1.18.2"
             },
             {
               "name": "testing-deploy-arch-ibm-event-notifications",
@@ -472,31 +496,49 @@
                   "dependency_input": "region",
                   "version_input": "scc_region",
                   "reference_version": true
+                },
+                {
+                  "dependency_input": "prefix",
+                  "version_input": "prefix",
+                  "reference_version": true
                 }
               ],
+              "ignore_auto_referencing": [
+                "*"
+              ],
               "optional": true,
               "on_by_default": true,
-              "version": "^1.0.1"
+              "version": "^1.0.8"
             },
             {
               "name": "testing-deploy-arch-ibm-observability",
               "flavors": [
-                "instances"
+                "standard"
               ],
               "id": "daf2cf91-2384-4205-b7f4-621299a4896d-global",
               "catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
-              "input_mapping": [{
-                "dependency_output": "cloud_monitoring_crn",
-                "version_input": "existing_monitoring_crn"
-              },
-              {
-                "dependency_input": "region",
-                "version_input": "scc_region",
-                "reference_version": true
-              }],
+              "input_mapping": [
+                {
+                  "dependency_output": "cloud_monitoring_crn",
+                  "version_input": "existing_monitoring_crn"
+                },
+                {
+                  "dependency_input": "region",
+                  "version_input": "scc_region",
+                  "reference_version": true
+                },
+                {
+                  "dependency_input": "prefix",
+                  "version_input": "prefix",
+                  "reference_version": true
+                }
+              ],
+              "ignore_auto_referencing": [
+                "*"
+              ],
               "optional": true,
               "on_by_default": true,
-              "version": "^1.0.7"
+              "version": "^1.3.0"
             }
           ],
           "dependency_version_2": true