Skip to content

Commit ed8a582

Browse files
shemaushemau
committed
fix: further review comments
1 parent 08e52de commit ed8a582

File tree

2 files changed

+26
-199
lines changed

2 files changed

+26
-199
lines changed

‎ibm_catalog.json

Lines changed: 26 additions & 198 deletions
Original file line numberDiff line numberDiff line change
@@ -56,191 +56,6 @@
5656
"service_name": "mqcloud"
5757
}
5858
],
59-
"configuration" : [
60-
{
61-
"key": "ibmcloud_api_key",
62-
"display_name": "IBM Cloud API Key",
63-
"description": "IBM Cloud API Key to use for provisioning resources"
64-
},
65-
{
66-
"key": "existing_resource_group_name",
67-
"display_name": "Resource group",
68-
"required": true,
69-
"custom_config": {
70-
"type": "resource_group",
71-
"grouping": "deployment",
72-
"original_grouping": "deployment",
73-
"config_constraints": {
74-
"identifier": "rg_name"
75-
}
76-
}
77-
},
78-
{
79-
"key": "region",
80-
"required": true,
81-
"default_value": "us-east"
82-
},
83-
{
84-
"key": "prefix",
85-
"required": true,
86-
"description": "Prefix to add to all resources created by this solution. To not use any prefix value, you can enter the string `__NULL__`."
87-
},
88-
{
89-
"key": "resource_tags",
90-
"display_name": "Resource tags",
91-
"description": "Metadata labels to be applied to the resources",
92-
"custom_config": {
93-
"grouping": "deployment",
94-
"original_grouping": "deployment",
95-
"config_constraints": {
96-
"type": "string"
97-
}
98-
}
99-
},
100-
{
101-
"key": "existing_mq_capacity_crn",
102-
"display_name": "Capacity instance CRN",
103-
"required": true
104-
},
105-
{
106-
"key": "deployment_name",
107-
"display_name": "Deployment instance name"
108-
},
109-
{
110-
"key": "existing_mq_deployment_crn",
111-
"display_name": "Deployment instance CRN"
112-
},
113-
{
114-
"key": "queue_manager_name",
115-
"display_name": "Queue Manager name"
116-
},
117-
{
118-
"key": "queue_manager_display_name",
119-
"display_name": "Queue Manager display name"
120-
},
121-
{
122-
"key": "queue_manager_size",
123-
"options": [
124-
{
125-
"displayname": "xsmall",
126-
"value": "xsmall"
127-
},
128-
{
129-
"displayname": "small",
130-
"value": "small"
131-
},
132-
{
133-
"displayname": "medium",
134-
"value": "medium"
135-
},
136-
{
137-
"displayname": "large",
138-
"value": "large"
139-
}
140-
]
141-
},
142-
{
143-
"key": "existing_queue_manager_name",
144-
"display_name": "Existing Queue Manager name"
145-
},
146-
{
147-
"key": "application_name",
148-
"display_name": "Application name"
149-
},
150-
{
151-
"key": "existing_application_name",
152-
"display_name": "Existing application name"
153-
},
154-
{
155-
"key": "user_name",
156-
"display_name": "User name"
157-
},
158-
{
159-
"key": "user_email",
160-
"display_name": "User email"
161-
},
162-
{
163-
"key": "existing_secrets_manager_crn",
164-
"display_name": "Secrets Manager instance CRN"
165-
},
166-
{
167-
"key": "secrets_manager_endpoint_type",
168-
"display_name": "Secrets Manager endpoint type"
169-
},
170-
{
171-
"key": "existing_secret_group_id",
172-
"display_name": "Existing secret group ID"
173-
},
174-
{
175-
"key": "secret_group_name",
176-
"display_name": "Secret group name"
177-
}
178-
],
179-
"architecture": {
180-
"descriptions": "This architecture supports creating and configuring an MQ on Cloud instance.",
181-
"features": [
182-
{
183-
"title": "Creates an MQ on Cloud deployment instance.",
184-
"description": "Creates and configures an MQ on Cloud deployment instance."
185-
},
186-
{
187-
"title": "Creates a queue manager",
188-
"description": "Creates a queue manager"
189-
}
190-
],
191-
"diagrams": [
192-
{
193-
"diagram": {
194-
"caption": "IBM MQ on Cloud",
195-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-mq-cloud/main/reference-architecture/deployable-architecture-mqcloud.svg",
196-
"type": "image/svg+xml"
197-
},
198-
"description": "This architecture supports creating and configuring MQ on Cloud resources"
199-
}
200-
]
201-
}
202-
},
203-
{
204-
"label": "Addons variation",
205-
"name": "addons-variation",
206-
"install_type": "fullstack",
207-
"working_directory": "solutions/standard",
208-
"compliance": {
209-
"authority": "scc-v3",
210-
"profiles": []
211-
},
212-
"iam_permissions": [
213-
{
214-
"role_crns": [
215-
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
216-
"crn:v1:bluemix:public:iam::::role:Editor"
217-
],
218-
"service_name": "mqcloud"
219-
}
220-
],
221-
"architecture": {
222-
"descriptions": "This architecture supports creating and configuring an MQ on Cloud instance.",
223-
"features": [
224-
{
225-
"title": "Creates an MQ on Cloud deployment instance.",
226-
"description": "Creates and configures an MQ on Cloud deployment instance."
227-
},
228-
{
229-
"title": "Creates a queue manager",
230-
"description": "Creates a queue manager"
231-
}
232-
],
233-
"diagrams": [
234-
{
235-
"diagram": {
236-
"caption": "IBM MQ on Cloud",
237-
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-mq-cloud/main/reference-architecture/deployable-architecture-mqcloud.svg",
238-
"type": "image/svg+xml"
239-
},
240-
"description": "This architecture supports creating and configuring MQ on Cloud resources"
241-
}
242-
]
243-
},
24459
"dependencies": [
24560
{
24661
"name": "testing-deploy-arch-ibm-secrets-manager",
@@ -337,7 +152,7 @@
337152
}
338153
],
339154
"dependency_version_2": true,
340-
"configuration": [
155+
"configuration" : [
341156
{
342157
"key": "ibmcloud_api_key",
343158
"display_name": "IBM Cloud API Key",
@@ -346,7 +161,6 @@
346161
{
347162
"key": "existing_resource_group_name",
348163
"display_name": "Resource group",
349-
"description": "The name of the existing resource group in which to provision resources to.",
350164
"required": true,
351165
"custom_config": {
352166
"type": "resource_group",
@@ -360,15 +174,7 @@
360174
{
361175
"key": "region",
362176
"required": true,
363-
"default_value": "us-east",
364-
"display_name": "Cloud region",
365-
"description": "The cloud region where the resources will be created",
366-
"options": [
367-
{
368-
"displayname": "Washington (us-east)",
369-
"value": "us-east"
370-
}
371-
]
177+
"default_value": "us-east"
372178
},
373179
{
374180
"key": "prefix",
@@ -402,15 +208,14 @@
402208
},
403209
{
404210
"key": "queue_manager_name",
405-
"display_name": "Queue Manager Name"
211+
"display_name": "Queue Manager name"
406212
},
407213
{
408214
"key": "queue_manager_display_name",
409215
"display_name": "Queue Manager display name"
410216
},
411217
{
412218
"key": "queue_manager_size",
413-
"display_name": "Queue Manager size",
414219
"options": [
415220
{
416221
"displayname": "xsmall",
@@ -467,6 +272,29 @@
467272
"display_name": "Secret group name"
468273
}
469274
],
275+
"architecture": {
276+
"descriptions": "This architecture supports creating and configuring an MQ on Cloud instance.",
277+
"features": [
278+
{
279+
"title": "Creates an MQ on Cloud deployment instance.",
280+
"description": "Creates and configures an MQ on Cloud deployment instance."
281+
},
282+
{
283+
"title": "Creates a queue manager",
284+
"description": "Creates a queue manager"
285+
}
286+
],
287+
"diagrams": [
288+
{
289+
"diagram": {
290+
"caption": "IBM MQ on Cloud",
291+
"url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-mq-cloud/main/reference-architecture/deployable-architecture-mqcloud.svg",
292+
"type": "image/svg+xml"
293+
},
294+
"description": "This architecture supports creating and configuring MQ on Cloud resources"
295+
}
296+
]
297+
},
470298
"swappable_dependencies": []
471299
}
472300
]

‎solutions/standard/variables.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ variable "region" {
1717
variable "prefix" {
1818
type = string
1919
description = "Prefix to add to all resources created by this deployable architecture. To not use any prefix value, you can set this value to `null` or an empty string."
20-
default = "dev"
2120
}
2221

2322
variable "existing_resource_group_name" {

0 commit comments

Comments
 (0)