Skip to content

Commit 3be5d39

Browse files
authored
fix: addressed SM dependency (add-on) config (#120)
1 parent e68ef37 commit 3be5d39

File tree

2 files changed

+78
-6
lines changed

2 files changed

+78
-6
lines changed

examples/basic/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ module "mq_on_cloud" {
3535
queue_manager_display_name = "${var.prefix}-qm-display"
3636
queue_manager_name = "${local.prefix}_qm"
3737
queue_manager_size = "xsmall"
38-
queue_manager_version = "9.4.2_2" # Pinned to current version
3938

4039
applications = {
4140
"app-${local.prefix}" = {

ibm_catalog.json

Lines changed: 78 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"fully-configurable"
6262
],
6363
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
64-
"version": "v2.6.1",
64+
"version": "v2.6.3",
6565
"optional": true,
6666
"on_by_default": true,
6767
"default_flavor": "fully-configurable",
@@ -72,12 +72,18 @@
7272
"version_input": "prefix"
7373
},
7474
{
75-
"dependency_output": "secrets_manager_crn",
76-
"version_input": "existing_secrets_manager_crn"
75+
"dependency_input": "service_plan",
76+
"version_input": "secrets_manager_service_plan",
77+
"reference_version": true
78+
},
79+
{
80+
"dependency_input": "region",
81+
"version_input": "secrets_manager_region",
82+
"reference_version": true
7783
},
7884
{
79-
"value": "us-south",
80-
"dependency_input": "region"
85+
"dependency_output": "secrets_manager_crn",
86+
"version_input": "existing_secrets_manager_crn"
8187
}
8288
]
8389
},
@@ -231,6 +237,73 @@
231237
"key": "existing_mq_capacity_crn",
232238
"required": true
233239
},
240+
{
241+
"key": "secrets_manager_region",
242+
"required": true,
243+
"virtual": true,
244+
"default_value": "us-south",
245+
"description": "The region to provision a new Secrets Manager instance in.",
246+
"options": [
247+
{
248+
"displayname": "Osaka (jp-osa)",
249+
"value": "jp-osa"
250+
},
251+
{
252+
"displayname": "Sydney (au-syd)",
253+
"value": "au-syd"
254+
},
255+
{
256+
"displayname": "Tokyo (jp-tok)",
257+
"value": "jp-tok"
258+
},
259+
{
260+
"displayname": "Frankfurt (eu-de)",
261+
"value": "eu-de"
262+
},
263+
{
264+
"displayname": "London (eu-gb)",
265+
"value": "eu-gb"
266+
},
267+
{
268+
"displayname": "Madrid (eu-es)",
269+
"value": "eu-es"
270+
},
271+
{
272+
"displayname": "Dallas (us-south)",
273+
"value": "us-south"
274+
},
275+
{
276+
"displayname": "Toronto (ca-tor)",
277+
"value": "ca-tor"
278+
},
279+
{
280+
"displayname": "Washington DC (us-east)",
281+
"value": "us-east"
282+
},
283+
{
284+
"displayname": "Sao Paulo (br-sao)",
285+
"value": "br-sao"
286+
}
287+
]
288+
},
289+
{
290+
"key": "secrets_manager_service_plan",
291+
"required": true,
292+
"virtual": true,
293+
"type": "string",
294+
"options": [
295+
{
296+
"displayname": "Standard",
297+
"value": "standard"
298+
},
299+
{
300+
"displayname": "Trial",
301+
"value": "trial"
302+
}
303+
],
304+
"default_value": "__NOT_SET__",
305+
"description": "The pricing plan to use when provisioning a Secrets Manager instance. Possible values: `standard`, `trial`. You can create only one Trial instance of Secrets Manager per account. Before you can create a new Trial instance, you must delete the existing Trial instance and its reclamation. [Learn more](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-create-instance&interface=ui#upgrade-instance-standard)."
306+
},
234307
{
235308
"key": "deployment_name"
236309
},

0 commit comments

Comments
 (0)