Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 33 additions & 16 deletions ibm_catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,20 +73,6 @@
"service_name": "iam-groups",
"notes": "[Optional] Required for managing IAM access groups."
},
{
"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."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Viewer"
Expand Down Expand Up @@ -169,7 +155,33 @@
},
{
"key": "prefix",
"required": true
"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.",
"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": "secrets_manager_region",
Expand Down Expand Up @@ -311,7 +323,7 @@
"name": "deploy-arch-ibm-secrets-manager",
"description": "Configure Secrets Manager to deploy public certificates engine.",
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
"version": "v2.10.0",
"version": "v2.11.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -324,6 +336,11 @@
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "region",
"version_input": "secrets_manager_region",
Expand Down
1 change: 0 additions & 1 deletion tests/pr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ func TestSecretManagerDefaultConfiguration(t *testing.T) {
"deploy-arch-secrets-manager-public-cert-engine",
"fully-configurable",
map[string]interface{}{
"prefix": options.Prefix,
"acme_letsencrypt_private_key_secrets_manager_secret_crn": permanentResources["acme_letsencrypt_private_key_secret_crn"], // pragma: allowlist secret
"secrets_manager_region": "eu-de",
"secrets_manager_service_plan": "__NULL__",
Expand Down