deprecate standard

Author: whoffler

.catalog-onboard-pipeline.yaml

@@ -6,12 +6,6 @@ offerings:
     catalog_id: 7df1e4ca-d54c-4fd0-82ce-3d13247308cd
     offering_id: 7ee5876d-6e30-49d1-be25-259a442085e8
     variations:
-      - name: standard
-        mark_ready: true
-        install_type: fullstack
-        scc:
-          instance_id: 1c7d5f78-9262-44c3-b779-b28fe4d88c37
-          region: us-south
       - name: fully-configurable
         mark_ready: true
         install_type: fullstack

common-dev-assets

@@ -50,10 +50,10 @@
       ],
       "flavors": [
         {
-          "label": "Standard",
-          "name": "standard",
+          "label": "Fully configurable",
+          "name": "fully-configurable",
           "install_type": "fullstack",
-          "working_directory": "solutions/standard",
+          "working_directory": "solutions/fully-configurable",
           "compliance": {
             "authority": "scc-v3",
             "profiles": [
@@ -112,12 +112,16 @@
               ]
             },
             {
-              "key": "use_existing_resource_group",
-              "required": true
-            },
-            {
-              "key": "resource_group_name",
-              "required": true
+              "key": "existing_resource_group_name",
+              "required": true,
+              "custom_config": {
+                "type": "resource_group",
+                "grouping": "deployment",
+                "original_grouping": "deployment",
+                "config_constraints": {
+                  "identifier": "rg_name"
+                }
+              }
             },
             {
               "key": "prefix",
@@ -197,6 +201,9 @@
                 }
               ]
             },
+            {
+              "key": "service_endpoints"
+            },
             {
               "key": "elasticsearch_version",
               "required": false,
@@ -224,7 +231,7 @@
               "key": "tags"
             },
             {
-              "key": "access_tags"
+              "key": "elasticsearch_access_tags"
             },
             {
               "key": "auto_scaling"

ibm_catalog.json

@@ -238,8 +238,8 @@ variable "existing_kms_instance_crn" {
   description = "The CRN of a Key Protect or Hyper Protect Crypto Services instance. Required to create a new encryption key and key ring which will be used to encrypt both deployment data and backups. Applies only if `use_ibm_owned_encryption_key` is false. To use an existing key, pass values for `existing_kms_key_crn` and/or `existing_backup_kms_key_crn`. Bare in mind that backups encryption is only available in certain regions. See [Bring your own key for backups](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-key-protect&interface=ui#key-byok) and [Using the HPCS Key for Backup encryption](https://cloud.ibm.com/docs/cloud-databases?topic=cloud-databases-hpcs#use-hpcs-backups)."
   default     = null
   validation {
-    condition     = var.existing_kms_instance_crn == null && var.existing_kms_key_crn == null ? var.use_ibm_owned_encryption_key == true : true || var.existing_kms_instance_crn != null ? var.use_ibm_owned_encryption_key == false : true
-    error_message = "When setting 'existing_kms_instance_crn', the 'use_ibm_owned_encryption_key' variable must be set to false. If 'existing_kms_instance_crn' and 'existing_kms_key_crn' are null the 'use_ibm_owned_encryption_key' variable must be set to true."
+    condition     = var.existing_elasticsearch_instance_crn == null ? var.existing_kms_instance_crn == null && var.existing_kms_key_crn == null ? var.use_ibm_owned_encryption_key == true : true || var.existing_kms_instance_crn != null ? var.use_ibm_owned_encryption_key == false : true : true
+    error_message = "When creating a new elasticsearch instance and setting 'existing_kms_instance_crn', the 'use_ibm_owned_encryption_key' variable must be set to false. If 'existing_kms_instance_crn' and 'existing_kms_key_crn' are null the 'use_ibm_owned_encryption_key' variable must be set to true."
   }
 }