diff --git a/ibm_catalog.json b/ibm_catalog.json index 0b27605..5c563f1 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -107,26 +107,19 @@ ], "notes": "[Optional] Required to create the containers-kubernetes-key needed by the OpenShift cluster on IBM Cloud." }, - { - "role_crns": [ - "crn:v1:bluemix:public:iam::::role:Administrator" - ], - "service_name": "All Account Management services", - "notes": "[Optional] Required to create new resource groups when enabling the Account Configuration integration." - }, { "role_crns": [ "crn:v1:bluemix:public:iam::::role:Administrator" ], "service_name": "All Identity and Access enabled services", - "notes": "[Optional] Required to create new resource groups with account settings when enabling the Account Configuration integration." + "notes": "[Optional] Required to to create trusted profile for App Configuration aggregator which is used for compliance scanning." }, { "service_name": "is.vpc", "role_crns": [ "crn:v1:bluemix:public:iam::::role:Administrator" ], - "notes": "[Optional] Required for creating Virtual Private Cloud(VPC)." + "notes": "[Optional] Required for creating Virtual Private Cloud (VPC)." }, { "service_name": "cloud-object-storage", @@ -211,16 +204,36 @@ { "key": "prefix", "required": true, + "default_value": "dev", + "random_string": { + "length": 4 + }, "value_constraints": [ { "type": "regex", - "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters", + "description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters.", "value": "^$|^__NULL__$|^[a-z](?!.*--)(?:[a-z0-9-]{0,14}[a-z0-9])?$" } ] }, + { + "key": "existing_resource_group_name", + "display_name": "resource_group", + "custom_config": { + "type": "resource_group", + "grouping": "deployment", + "original_grouping": "deployment", + "config_constraints": { + "identifier": "rg_name" + } + }, + "default_value": "Default", + "description": "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group.", + "virtual": true + }, { "key": "cluster_id", + "display_name": "cluster", "custom_config": { "type": "cluster_var", "grouping": "deployment", @@ -230,6 +243,7 @@ }, { "key": "cluster_resource_group_id", + "display_name": "cluster_resource_group", "required": true, "custom_config": { "type": "resource_group", @@ -668,7 +682,7 @@ "required": true, "virtual": true, "type": "number", - "default_value": 2, + "default_value": 1, "description": "Number of worker nodes in each zone of the cluster." }, { @@ -694,39 +708,19 @@ "description": "The operating system installed on the worker nodes. [Learn more](https://cloud.ibm.com/docs/openshift?topic=openshift-vpc-flavors)." }, { - "key": "allow_public_access_to_cluster", + "key": "allow_public_access_to_cluster_management", "type": "boolean", "required": true, "virtual": true, - "default_value": false, - "options": [ - { - "displayname": "true", - "value": "true" - }, - { - "displayname": "false", - "value": "false" - } - ], - "description": "When set to `true`, public endpoint will be enabled for the cluster which will allow access to master node of the cluster from outside the VPC network." + "default_value": true, + "description": "Set to true to access the cluster through a public cloud service endpoint. [Learn More](https://cloud.ibm.com/docs/openshift?topic=openshift-access_cluster)." }, { "key": "allow_outbound_traffic", "type": "boolean", "required": true, "virtual": true, - "default_value": false, - "options": [ - { - "displayname": "true", - "value": "true" - }, - { - "displayname": "false", - "value": "false" - } - ], + "default_value": true, "description": "Set to true to allow public outbound access from the cluster workers." }, { @@ -735,7 +729,13 @@ "default_value": "{\n zone-1 = [\n {\n name = \"subnet-a\"\n cidr = \"10.10.10.0/24\"\n public_gateway = true\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ],\n zone-2 = [\n {\n name = \"subnet-b\"\n cidr = \"10.20.10.0/24\"\n public_gateway = true\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ],\n zone-3 = [\n {\n name = \"subnet-c\"\n cidr = \"10.30.10.0/24\"\n public_gateway = true\n acl_name = \"vpc-acl\"\n no_addr_prefix = false\n }\n ]\n }", "description": "List of subnets for the vpc. For each item in each array, a subnet will be created. Items can be either CIDR blocks or total ipv4 addresses. Public gateways will be enabled only in zones where a gateway has been created. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#subnets-).", "required": false, - "virtual": true + "hidden": true, + "virtual": true, + "custom_config": { + "grouping": "deployment", + "original_grouping": "deployment", + "type": "code_editor" + } }, { "key": "network_acls", @@ -744,20 +744,13 @@ "description": "The list of ACLs to create. Provide at least one rule for each ACL. [Learn more](https://github.com/terraform-ibm-modules/terraform-ibm-landing-zone-vpc/blob/main/solutions/fully-configurable/DA-types.md#network-acls-).", "required": false, "virtual": true, + "hidden": true, "custom_config": { "type": "code_editor", "grouping": "deployment", "original_grouping": "deployment" } }, - { - "key": "cloud_logs_instance_name", - "type": "string", - "required": true, - "virtual": true, - "default_value": "cloud-logs", - "description": "The name of the Cloud Logs Instance." - }, { "key": "secrets_manager_service_plan", "type": "string", @@ -833,7 +826,7 @@ "name": "deploy-arch-ibm-cloud-logs", "description": "Create IBM Cloud Logs Instance for storing and analysing platform and application logs .", "id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global", - "version": "v1.6.28", + "version": "v1.9.0", "flavors": [ "fully-configurable" ], @@ -852,8 +845,8 @@ "reference_version": true }, { - "dependency_input": "cloud_logs_instance_name", - "version_input": "cloud_logs_instance_name", + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", "reference_version": true }, { @@ -887,6 +880,11 @@ "dependency_output": "cluster_id", "version_input": "cluster_id" }, + { + "dependency_input": "existing_resource_group_name", + "version_input": "existing_resource_group_name", + "reference_version": true + }, { "dependency_output": "resource_group_id", "version_input": "cluster_resource_group_id" @@ -921,8 +919,8 @@ "reference_version": true }, { - "dependency_input": "allow_public_access_to_cluster", - "version_input": "allow_public_access_to_cluster", + "dependency_input": "allow_public_access_to_cluster_management", + "version_input": "allow_public_access_to_cluster_management", "reference_version": true }, { @@ -971,7 +969,7 @@ "reference_version": true } ], - "version": "v3.63.1" + "version": "v3.66.0" } ], "dependency_version_2": true, diff --git a/tests/pr_test.go b/tests/pr_test.go index c2e9872..dadf37a 100644 --- a/tests/pr_test.go +++ b/tests/pr_test.go @@ -286,7 +286,6 @@ func TestAgentDefaultConfiguration(t *testing.T) { "fully-configurable", map[string]interface{}{ "region": "eu-de", - "prefix": options.Prefix, }, )