Skip to content

Commit 7759598

Browse files
aatreyee257aatreyee257
authored
feat: Updated the DA to use the new Observability DAs in its dependency list (#142)
1 parent 8c05f73 commit 7759598

File tree

3 files changed

+147
-13
lines changed

3 files changed

+147
-13
lines changed

‎ibm_catalog.json‎

Lines changed: 92 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,16 @@
3838
"description": "Optional integration with [Cloud automation for Secrets Manager](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-secrets-manager-6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global) for centrally managing TLS certificates required by IBM MQ on Cloud."
3939
},
4040
{
41-
"title": "Observability",
42-
"description": "Optional integration with [Cloud automation for Observability](https://cloud.ibm.com/catalog/7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3/architecture/deploy-arch-ibm-observability-a3137d28-79e0-479d-8a24-758ebd5a0eab-global) services such as Log Analysis and Monitoring to support IBM MQ on Cloud instance monitoring and logging."
41+
"title": "Sets up logging for the MQ cloud instance",
42+
"description": "Optionally, you can deploy Cloud automation for Cloud Logs to route, alert, and visualize platform logs that are generated by your MQ cloud instance.[Learn more](https://cloud.ibm.com/docs/mqcloud?topic=mqcloud-logging)"
43+
},
44+
{
45+
"title": "Sets up monitoring operational metrics for the MQ cloud instance",
46+
"description": "Optionally, you can deploy Cloud automation for Cloud Monitoring to measure how users and applications interact with your MQ cloud instance. [Learn more](https://cloud.ibm.com/docs/mqcloud?topic=mqcloud-monitor_sysdig)"
47+
},
48+
{
49+
"title": "Sets up activity tracking for the MQ cloud instance",
50+
"description": "Optionally, you can deploy Cloud automation for Activity Tracker Event Routing to route and securely store auditing events that are related to your MQ cloud instance. [Lear more](https://cloud.ibm.com/docs/mqcloud?topic=mqcloud-at_events)"
4351
}
4452
],
4553
"support_details": "This product is in the community registry, as such support is handled through the [original repo](https://github.com/terraform-ibm-modules/terraform-ibm-mq-cloud). If you experience issues kindly open an issue in that repository [here](https://github.com/terraform-ibm-modules/terraform-ibm-mq-cloud/issues). Please note that this product is not currently supported through the IBM Cloud Support Center.",
@@ -148,13 +156,13 @@
148156
"dependencies": [
149157
{
150158
"name": "deploy-arch-ibm-secrets-manager",
151-
"description": "Configure Secrets Manager for securely storing generated secrets.",
159+
"description": "Configure Secrets Manager for centrally managing TLS certificates.",
152160
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
153161
"flavors": [
154162
"fully-configurable"
155163
],
156164
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
157-
"version": "v2.6.3",
165+
"version": "v2.8.6",
158166
"optional": true,
159167
"on_by_default": true,
160168
"default_flavor": "fully-configurable",
@@ -186,12 +194,12 @@
186194
]
187195
},
188196
{
189-
"name": "deploy-arch-ibm-observability",
190-
"description": "Configure IBM Cloud Logs, Cloud Monitoring and Activity Tracker event routing for analysing logs and metrics generated by the MQ on Cloud instance.",
197+
"name": "deploy-arch-ibm-cloud-logs",
198+
"description": "Configure IBM Cloud Logs instance to analyse the platform logs.",
191199
"flavors": [
192-
"instances"
200+
"fully-configurable"
193201
],
194-
"id": "a3137d28-79e0-479d-8a24-758ebd5a0eab-global",
202+
"id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
195203
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
196204
"input_mapping": [
197205
{
@@ -200,28 +208,76 @@
200208
"reference_version": true
201209
},
202210
{
203-
"dependency_input": "enable_platform_metrics",
204-
"version_input": "enable_platform_metrics",
211+
"dependency_input": "region",
212+
"version_input": "region",
205213
"reference_version": true
206214
},
207215
{
208216
"dependency_input": "logs_routing_tenant_regions",
209217
"version_input": "logs_routing_tenant_regions",
210218
"reference_version": true
219+
}
220+
],
221+
"optional": true,
222+
"on_by_default": true,
223+
"version": "v1.6.11"
224+
},
225+
{
226+
"name": "deploy-arch-ibm-cloud-monitoring",
227+
"description": "Configure IBM Cloud Monitoring to collect the platform metrics.",
228+
"flavors": [
229+
"fully-configurable"
230+
],
231+
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
232+
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
233+
"input_mapping": [
234+
{
235+
"dependency_input": "prefix",
236+
"version_input": "prefix",
237+
"reference_version": true
211238
},
212239
{
213240
"dependency_input": "region",
214241
"version_input": "region",
215242
"reference_version": true
243+
},
244+
{
245+
"dependency_input": "enable_platform_metrics",
246+
"version_input": "enable_platform_metrics",
247+
"reference_version": true
216248
}
217249
],
218250
"optional": true,
219251
"on_by_default": true,
220-
"version": "v3.0.3"
252+
"version": "v1.6.4"
253+
},
254+
{
255+
"name": "deploy-arch-ibm-activity-tracker",
256+
"description": "Configure Activity Tracker Event Routing to route the auditing events.",
257+
"flavors": [
258+
"fully-configurable"
259+
],
260+
"id": "918453c3-4f97-4583-8c4a-83ef12fc7916-global",
261+
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
262+
"input_mapping": [
263+
{
264+
"dependency_input": "prefix",
265+
"version_input": "prefix",
266+
"reference_version": true
267+
},
268+
{
269+
"dependency_input": "region",
270+
"version_input": "region",
271+
"reference_version": true
272+
}
273+
],
274+
"optional": true,
275+
"on_by_default": true,
276+
"version": "v1.2.25"
221277
},
222278
{
223279
"name": "deploy-arch-ibm-account-infra-base",
224-
"description": "Cloud automation for account configuration organizes your IBM Cloud account with a ready-made set of resource groups by default. When you enable the “with account settings” option, it also applies baseline security and governance settings.",
280+
"description": "Organize your IBM Cloud account with preconfigured resource groups. If not selected, the default resource group is used. Optionally, expand to apply recommended security controls via \"with Account Settings\" variation.",
225281
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
226282
"flavors": [
227283
"resource-group-only",
@@ -243,6 +299,30 @@
243299
"optional": true,
244300
"on_by_default": false,
245301
"version": "v3.0.7"
302+
},
303+
{
304+
"name": "deploy-arch-ibm-scc-workload-protection",
305+
"description": "Configure an IBM Cloud Security and Compliance Center Workload Protection instance to help you manage security and compliance for your organization.",
306+
"id": "4322cf44-2289-49aa-a719-dd79e39b14dc-global",
307+
"version": "v1.11.4",
308+
"flavors": [
309+
"fully-configurable"
310+
],
311+
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
312+
"optional": true,
313+
"on_by_default": true,
314+
"input_mapping": [
315+
{
316+
"dependency_input": "prefix",
317+
"version_input": "prefix",
318+
"reference_version": true
319+
},
320+
{
321+
"dependency_input": "region",
322+
"version_input": "region",
323+
"reference_version": true
324+
}
325+
]
246326
}
247327
],
248328
"dependency_version_2": true,

‎reference-architecture/deployable-architecture-mqcloud.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎tests/pr_test.go‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ import (
77
"testing"
88

99
"github.com/stretchr/testify/assert"
10+
"github.com/stretchr/testify/require"
11+
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/cloudinfo"
1012
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/common"
13+
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testaddons"
1114
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testhelper"
1215
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testschematic"
1316
)
@@ -189,3 +192,54 @@ func TestRunStandardSolutionUpgradeSchematics(t *testing.T) {
189192
assert.NoError(t, err, "Schematic Upgrade Test had an unexpected error")
190193
}
191194
}
195+
196+
func TestMqCloudDefaultConfiguration(t *testing.T) {
197+
t.Parallel()
198+
199+
options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{
200+
Testing: t,
201+
Prefix: "mq-def",
202+
ResourceGroup: resourceGroup,
203+
QuietMode: true, // Suppress logs except on failure
204+
})
205+
206+
options.AddonConfig = cloudinfo.NewAddonConfigTerraform(
207+
options.Prefix,
208+
"deploy-arch-ibm-mq-cloud",
209+
"fully-configurable",
210+
map[string]interface{}{
211+
"prefix": options.Prefix,
212+
"region": "us-east",
213+
"enable_platform_metrics": false,
214+
"logs_routing_tenant_regions": []string{},
215+
"existing_mq_capacity_crn": permanentResources["mq_capacity_crn"],
216+
"secrets_manager_region": "us-south",
217+
"secrets_manager_service_plan": "standard",
218+
"queue_manager_name": "da_qm",
219+
},
220+
)
221+
222+
err := options.RunAddonTest()
223+
require.NoError(t, err)
224+
}
225+
226+
// TestDependencyPermutations runs dependency permutations for the Event Notifications and all its dependencies
227+
func TestMqCloudDependencyPermutations(t *testing.T) {
228+
t.Skip("Skipping dependency permutations until the test is fixed")
229+
options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{
230+
Testing: t,
231+
Prefix: "mq-perm",
232+
AddonConfig: cloudinfo.AddonConfig{
233+
OfferingName: "deploy-arch-ibm-mq-cloud",
234+
OfferingFlavor: "fully-configurable",
235+
Inputs: map[string]interface{}{
236+
"prefix": "mq-perm",
237+
"region": "us-east",
238+
"existing_resource_group_name": resourceGroup,
239+
},
240+
},
241+
})
242+
243+
err := options.RunAddonPermutationTest()
244+
assert.NoError(t, err, "Dependency permutation test should not fail")
245+
}

0 commit comments

Comments
 (0)