Skip to content

Commit 17b6f40

Browse files
authored
feat: remove Account Config DA from customize DA flow, add default value for prefix using random string generator and update logic that handles default resource group lookup (#286)
1 parent 10d2824 commit 17b6f40

File tree

2 files changed

+33
-17
lines changed

2 files changed

+33
-17
lines changed

ibm_catalog.json

Lines changed: 33 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,6 @@
7373
"service_name": "iam-groups",
7474
"notes": "[Optional] Required for managing IAM access groups."
7575
},
76-
{
77-
"role_crns": [
78-
"crn:v1:bluemix:public:iam::::role:Administrator"
79-
],
80-
"service_name": "All Account Management services",
81-
"notes": "[Optional] Required to create new resource groups when enabling the Account Configuration integration."
82-
},
83-
{
84-
"role_crns": [
85-
"crn:v1:bluemix:public:iam::::role:Administrator"
86-
],
87-
"service_name": "All Identity and Access enabled services",
88-
"notes": "[Optional] Required to create new resource groups with account settings when enabling the Account Configuration integration."
89-
},
9076
{
9177
"role_crns": [
9278
"crn:v1:bluemix:public:iam::::role:Viewer"
@@ -169,7 +155,33 @@
169155
},
170156
{
171157
"key": "prefix",
172-
"required": true
158+
"required": true,
159+
"default_value": "dev",
160+
"random_string": {
161+
"length": 4
162+
},
163+
"value_constraints": [
164+
{
165+
"type": "regex",
166+
"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.",
167+
"value": "^$|^__NULL__$|^[a-z](?!.*--)(?:[a-z0-9-]{0,14}[a-z0-9])?$"
168+
}
169+
]
170+
},
171+
{
172+
"key": "existing_resource_group_name",
173+
"display_name": "resource_group",
174+
"custom_config": {
175+
"type": "resource_group",
176+
"grouping": "deployment",
177+
"original_grouping": "deployment",
178+
"config_constraints": {
179+
"identifier": "rg_name"
180+
}
181+
},
182+
"default_value": "Default",
183+
"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.",
184+
"virtual": true
173185
},
174186
{
175187
"key": "secrets_manager_region",
@@ -311,7 +323,7 @@
311323
"name": "deploy-arch-ibm-secrets-manager",
312324
"description": "Configure Secrets Manager to deploy public certificates engine.",
313325
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
314-
"version": "v2.10.0",
326+
"version": "v2.11.0",
315327
"flavors": [
316328
"fully-configurable"
317329
],
@@ -324,6 +336,11 @@
324336
"version_input": "prefix",
325337
"reference_version": true
326338
},
339+
{
340+
"dependency_input": "existing_resource_group_name",
341+
"version_input": "existing_resource_group_name",
342+
"reference_version": true
343+
},
327344
{
328345
"dependency_input": "region",
329346
"version_input": "secrets_manager_region",

tests/pr_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@ func TestSecretManagerDefaultConfiguration(t *testing.T) {
211211
"deploy-arch-secrets-manager-public-cert-engine",
212212
"fully-configurable",
213213
map[string]interface{}{
214-
"prefix": options.Prefix,
215214
"acme_letsencrypt_private_key_secrets_manager_secret_crn": permanentResources["acme_letsencrypt_private_key_secret_crn"], // pragma: allowlist secret
216215
"secrets_manager_region": "eu-de",
217216
"secrets_manager_service_plan": "__NULL__",

0 commit comments

Comments
 (0)