From 9431788d444530e58c9fc6d11e66d08b2b532ff5 Mon Sep 17 00:00:00 2001
From: akocbek <akocbek>
Date: Tue, 13 May 2025 12:11:02 +0100
Subject: [PATCH 1/3] chore: 'description' attribute removed from the
 individual variation architecture for the DA

---
 common-dev-assets |  2 +-
 ibm_catalog.json  | 32 +++++++++++++-------------------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/common-dev-assets b/common-dev-assets
index 8a13c7bc..9fdee868 160000
--- a/common-dev-assets
+++ b/common-dev-assets
@@ -1 +1 @@
-Subproject commit 8a13c7bc97e6e00b17615320a48fb89fe2a099f7
+Subproject commit 9fdee86807c74a35061fc3327c2a01215897cb7f
diff --git a/ibm_catalog.json b/ibm_catalog.json
index b531265e..72c5f388 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -30,9 +30,7 @@
           "label": "Standard",
           "name": "standard",
           "working_directory": "solutions/standard",
-          "compliance": {
-
-          },
+          "compliance": {},
           "iam_permissions": [
             {
               "service_name": "iam-identity",
@@ -60,7 +58,6 @@
             }
           ],
           "architecture": {
-            "descriptions": "",
             "features": [
               {
                 "title": "Seperate VPC for edge",
@@ -105,10 +102,10 @@
                   "caption": "Wazi as a service VSI on VPC Landing zone - Standard variation",
                   "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-zvsi/main/reference-architecture/Standard-variation.svg",
                   "type": "image/svg+xml"
-            },
-            "description": "Standard Variation"
-           }
-           ]
+                },
+                "description": "Standard Variation"
+              }
+            ]
           },
           "configuration": [
             {
@@ -139,9 +136,7 @@
           "label": "Quickstart",
           "name": "quickstart",
           "working_directory": "solutions/quickstart",
-          "compliance": {
-
-          },
+          "compliance": {},
           "iam_permissions": [
             {
               "service_name": "is.vpc",
@@ -152,7 +147,6 @@
           ],
           "release_notes_url": "",
           "architecture": {
-            "descriptions": "",
             "features": [
               {
                 "title": "Seperate VPC for edge",
@@ -194,13 +188,13 @@
             "diagrams": [
               {
                 "diagram": {
-              "caption": "Wazi as a service VSI on VPC Landing zone - QuickStart variation",
-              "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-zvsi/main/reference-architecture/QuickStart.svg",
-              "type": "image/svg+xml"
-            },
-            "description": "Quickstart variation"
-          }
-          ]
+                  "caption": "Wazi as a service VSI on VPC Landing zone - QuickStart variation",
+                  "url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-zvsi/main/reference-architecture/QuickStart.svg",
+                  "type": "image/svg+xml"
+                },
+                "description": "Quickstart variation"
+              }
+            ]
           },
           "configuration": [
             {

From c300d8939adb94891acf261678f58deac3acffc4 Mon Sep 17 00:00:00 2001
From: akocbek <106765658+akocbek@users.noreply.github.com>
Date: Wed, 14 May 2025 12:54:43 +0100
Subject: [PATCH 2/3] remove compliance: {}

---
 ibm_catalog.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ibm_catalog.json b/ibm_catalog.json
index 72c5f388..c8692ac7 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -30,7 +30,6 @@
           "label": "Standard",
           "name": "standard",
           "working_directory": "solutions/standard",
-          "compliance": {},
           "iam_permissions": [
             {
               "service_name": "iam-identity",
@@ -136,7 +135,6 @@
           "label": "Quickstart",
           "name": "quickstart",
           "working_directory": "solutions/quickstart",
-          "compliance": {},
           "iam_permissions": [
             {
               "service_name": "is.vpc",

From 850a348253debf075a62b3da5af3531a7d357947 Mon Sep 17 00:00:00 2001
From: akocbek <akocbek>
Date: Fri, 16 May 2025 11:04:50 +0100
Subject: [PATCH 3/3] resolve catalog.json pre-commit hook errors

---
 ibm_catalog.json | 86 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 78 insertions(+), 8 deletions(-)

diff --git a/ibm_catalog.json b/ibm_catalog.json
index c8692ac7..ef53f3bf 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -107,14 +107,6 @@
             ]
           },
           "configuration": [
-            {
-              "custom_config": {
-                "grouping": "deployment",
-                "original_grouping": "deployment",
-                "type": "json_editor"
-              },
-              "key": "override_json_string"
-            },
             {
               "custom_config": {
                 "config_constraints": {
@@ -127,6 +119,63 @@
               "key": "region",
               "required": true,
               "type": "string"
+            },
+            {
+              "key": "access_group_name"
+            },
+            {
+              "key": "cert_common_name"
+            },
+            {
+              "key": "certificate_template_name"
+            },
+            {
+              "key": "create_policy"
+            },
+            {
+              "key": "data_volume_names"
+            },
+            {
+              "key": "ibmcloud_api_key"
+            },
+            {
+              "key": "image_name"
+            },
+            {
+              "key": "intermediate_ca_name"
+            },
+            {
+              "key": "machine_type"
+            },
+            {
+              "key": "override"
+            },
+            {
+              "key": "ports"
+            },
+            {
+              "key": "prefix"
+            },
+            {
+              "key": "root_ca_common_name"
+            },
+            {
+              "key": "root_ca_max_ttl"
+            },
+            {
+              "key": "root_ca_name"
+            },
+            {
+              "key": "sm_service_plan"
+            },
+            {
+              "key": "ssh_public_key"
+            },
+            {
+              "key": "vpn_client_access_group_users"
+            },
+            {
+              "key": "vpn_server_routes"
             }
           ],
           "install_type": "fullstack"
@@ -215,6 +264,27 @@
               "key": "region",
               "required": true,
               "type": "string"
+            },
+            {
+              "key": "data_volume_names"
+            },
+            {
+              "key": "ibmcloud_api_key"
+            },
+            {
+              "key": "image_name"
+            },
+            {
+              "key": "machine_type"
+            },
+            {
+              "key": "ports"
+            },
+            {
+              "key": "prefix"
+            },
+            {
+              "key": "ssh_key"
             }
           ],
           "install_type": "fullstack"