Skip to content

Commit ff072ab

Browse files
ocofaighocofaigh
authored
fix: add variables to ibm_catalog.json so they displayed in a sorted order in projects UI and mark existing_kms_instance_crn as required in the DA (#339)
* Update ibm_catalog.json * Update variables.tf * Update ibm_catalog.json * Update ibm_catalog.json
1 parent 3494832 commit ff072ab

File tree

2 files changed

+218
-3
lines changed

2 files changed

+218
-3
lines changed

‎ibm_catalog.json‎

Lines changed: 216 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,223 @@
5757
},
5858
"configuration": [
5959
{
60-
"key": "existing_kms_root_key_crn",
60+
"key": "ibmcloud_api_key"
61+
},
62+
{
63+
"key": "prefix"
64+
},
65+
{
66+
"key": "use_existing_resource_group"
67+
},
68+
{
69+
"key": "resource_group_name"
70+
},
71+
{
72+
"key": "region",
73+
"required": true,
74+
"options": [
75+
{
76+
"displayname": "Sydney (au-syd)",
77+
"value": "au-syd"
78+
},
79+
{
80+
"displayname": "Frankfurt (eu-de)",
81+
"value": "eu-de"
82+
},
83+
{
84+
"displayname": "London (eu-gb)",
85+
"value": "eu-gb"
86+
},
87+
{
88+
"displayname": "Madrid (eu-es)",
89+
"value": "eu-es"
90+
},
91+
{
92+
"displayname": "Dallas (us-south)",
93+
"value": "us-south"
94+
}
95+
]
96+
},
97+
{
98+
"key": "event_notification_name"
99+
},
100+
{
101+
"key": "service_plan",
102+
"options": [
103+
{
104+
"displayname": "lite",
105+
"value": "lite"
106+
},
107+
{
108+
"displayname": "standard",
109+
"value": "standard"
110+
}
111+
]
112+
},
113+
{
114+
"key": "service_endpoints",
115+
"options": [
116+
{
117+
"displayname": "public",
118+
"value": "public"
119+
},
120+
{
121+
"displayname": "public-and-private",
122+
"value": "public-and-private"
123+
}
124+
]
125+
},
126+
{
127+
"key": "tags"
128+
},
129+
{
130+
"key": "existing_kms_instance_crn",
131+
"required": true
132+
},
133+
{
134+
"key": "kms_endpoint_url",
61135
"required": true
136+
},
137+
{
138+
"key": "existing_kms_root_key_crn"
139+
},
140+
{
141+
"key": "kms_endpoint_type",
142+
"options": [
143+
{
144+
"displayname": "public",
145+
"value": "public"
146+
},
147+
{
148+
"displayname": "private",
149+
"value": "private"
150+
}
151+
]
152+
},
153+
{
154+
"key": "en_key_ring_name"
155+
},
156+
{
157+
"key": "en_key_name"
158+
},
159+
{
160+
"key": "cos_key_ring_name"
161+
},
162+
{
163+
"key": "cos_key_name"
164+
},
165+
{
166+
"key": "skip_en_kms_auth_policy"
167+
},
168+
{
169+
"key": "ibmcloud_kms_api_key"
170+
},
171+
{
172+
"key": "existing_cos_instance_crn"
173+
},
174+
{
175+
"key": "existing_cos_bucket_name"
176+
},
177+
{
178+
"key": "cos_bucket_name"
179+
},
180+
{
181+
"key": "skip_en_cos_auth_policy"
182+
},
183+
{
184+
"key": "skip_cos_kms_auth_policy"
185+
},
186+
{
187+
"key": "cos_instance_name"
188+
},
189+
{
190+
"key": "cos_instance_tags"
191+
},
192+
{
193+
"key": "cos_instance_access_tags"
194+
},
195+
{
196+
"key": "add_bucket_name_suffix"
197+
},
198+
{
199+
"key": "cos_plan",
200+
"options": [
201+
{
202+
"displayname": "Standard",
203+
"value": "standard"
204+
},
205+
{
206+
"displayname": "Lite",
207+
"value": "lite"
208+
},
209+
{
210+
"displayname": "One Rate",
211+
"value": "cos-one-rate-plan"
212+
}
213+
]
214+
},
215+
{
216+
"key": "cross_region_location"
217+
},
218+
{
219+
"key": "cos_bucket_region"
220+
},
221+
{
222+
"key": "archive_days"
223+
},
224+
{
225+
"key": "retention_enabled"
226+
},
227+
{
228+
"key": "management_endpoint_type_for_bucket",
229+
"options": [
230+
{
231+
"displayname": "private",
232+
"value": "private"
233+
},
234+
{
235+
"displayname": "public",
236+
"value": "public"
237+
},
238+
{
239+
"displayname": "direct",
240+
"value": "direct"
241+
}
242+
]
243+
},
244+
{
245+
"key": "existing_cos_endpoint"
246+
},
247+
{
248+
"key": "existing_secrets_manager_instance_crn"
249+
},
250+
{
251+
"key": "existing_secrets_manager_endpoint_type",
252+
"options": [
253+
{
254+
"displayname": "private",
255+
"value": "private"
256+
},
257+
{
258+
"displayname": "public",
259+
"value": "public"
260+
}
261+
]
262+
},
263+
{
264+
"key": "skip_en_sm_auth_policy"
265+
},
266+
{
267+
"key": "service_credential_secrets"
268+
},
269+
{
270+
"key": "service_credential_names"
271+
},
272+
{
273+
"key": "existing_monitoring_crn"
274+
},
275+
{
276+
"key": "existing_en_instance_crn"
62277
}
63278
],
64279
"iam_permissions": [

‎solutions/standard/variables.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ variable "existing_en_instance_crn" {
9898

9999
variable "existing_kms_instance_crn" {
100100
type = string
101-
description = "The CRN of the KMS instance (Hyper Protect Crypto Services or Key Protect instance). If the KMS instance is in different account you must also provide a value for `ibmcloud_kms_api_key`. Not required if passing an existing instance using the `existing_en_instance_crn` input."
101+
description = "The CRN of the KMS instance (Hyper Protect Crypto Services or Key Protect instance). If the KMS instance is in different account you must also provide a value for `ibmcloud_kms_api_key`."
102102
default = null
103103
}
104104

105105
variable "existing_kms_root_key_crn" {
106106
type = string
107-
description = "The key CRN of a root key, existing in the KMS instance passed in `var.existing_kms_instance_crn`, which will be used to encrypt the data encryption keys which are then used to encrypt the data. The code will create the key if one is not passed in."
107+
description = "The key CRN of a root key, existing in the KMS instance passed in the `existing_kms_instance_crn` input, which will be used to encrypt the data. If no value passed, a new key will be created in the instance provided in the `existing_kms_instance_crn` input."
108108
default = null
109109
}
110110

0 commit comments

Comments
 (0)