Skip to content

Commit bf84e1b

Browse files
daniel-butler-irldaniel-butler-irl
committed
remove ac and add rg mappings
1 parent d115246 commit bf84e1b

File tree

3 files changed

+35
-40
lines changed

3 files changed

+35
-40
lines changed

‎.secrets.baseline‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$|^../.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2024-03-27T22:08:26Z",
6+
"generated_at": "2025-10-14T15:19:27Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -77,7 +77,7 @@
7777
}
7878
],
7979
"results": {},
80-
"version": "0.13.1+ibm.62.dss",
80+
"version": "0.13.1+ibm.64.dss",
8181
"word_list": {
8282
"file": null,
8383
"hash": null

‎ibm_catalog.json‎

Lines changed: 28 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"solution"
2222
],
2323
"short_description": "Create and configure a Secrets Manager instance with optional security, logging, and notification services",
24-
"long_description": "This deployable architecture is used to provision and configure an [IBM Cloud Secrets Manager](https://www.ibm.com/products/secrets-manager) instance. It optionally supports creating and configuring the following:\n* [an IBM Cloud account](https://cloud.ibm.com/docs/account?topic=account-account-getting-started) to set up basic account settings.\n* [Key Protect](https://cloud.ibm.com/docs/key-protect?topic=key-protect-getting-started-tutorial) for data encryption by using your own managed keys.\n* [Cloud Logs](https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-getting-started) for logging and monitoring platform logs.\n* [Cloud Monitoring](https://cloud.ibm.com/docs/monitoring?topic=monitoring-getting-started) to measure how users and applications interact with the Secrets Manager instance.\n* [Event Notifications](https://cloud.ibm.com/docs/event-notifications?topic=event-notifications-getting-started) to send notifications of events to other users, or destinations, by using email, SMS or other supported delivery channels.\n\nℹ️ This deployable architecture is a part of a larger collection that IBM provides. Each deployable architecture focuses on a single IBM Cloud service. You can use these deployable architectures on their own to automate deployments by following an [IaC approach](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-understanding-projects), or you can [combine them together](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-config-stack) to deploy a more complex end-to-end solution architecture.",
24+
"long_description": "This deployable architecture is used to provision and configure an [IBM Cloud Secrets Manager](https://www.ibm.com/products/secrets-manager) instance. It optionally supports creating [Key Protect](https://cloud.ibm.com/docs/key-protect?topic=key-protect-getting-started-tutorial) for data encryption by using your own managed keys.\n* [Cloud Logs](https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-getting-started) for logging and monitoring platform logs.\n* [Cloud Monitoring](https://cloud.ibm.com/docs/monitoring?topic=monitoring-getting-started) to measure how users and applications interact with the Secrets Manager instance.\n* [Event Notifications](https://cloud.ibm.com/docs/event-notifications?topic=event-notifications-getting-started) to send notifications of events to other users, or destinations, by using email, SMS or other supported delivery channels.\n\nℹ️ This deployable architecture is a part of a larger collection that IBM provides. Each deployable architecture focuses on a single IBM Cloud service. You can use these deployable architectures on their own to automate deployments by following an [IaC approach](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-understanding-projects), or you can [combine them together](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-config-stack) to deploy a more complex end-to-end solution architecture.",
2525
"offering_docs_url": "https://github.com/terraform-ibm-modules/terraform-ibm-secrets-manager/blob/main/README.md",
2626
"offering_icon_url": "https://raw.githubusercontent.com/terraform-ibm-modules/terraform-ibm-secrets-manager/main/images/secrets_manager.svg",
2727
"provider_name": "IBM",
@@ -401,13 +401,6 @@
401401
],
402402
"service_name": "kms",
403403
"notes": "[Optional] Required if you are creating and configuring a Key Protect instance for key encryption."
404-
},
405-
{
406-
"role_crns": [
407-
"crn:v1:bluemix:public:iam::::role:Administrator"
408-
],
409-
"service_name": "iam-identity",
410-
"notes": "[Optional] Required to deploy Cloud automation for account configuration, which creates foundational IBM Cloud account resources, like IAM settings, trusted profiles, access groups, and resource groups."
411404
}
412405
],
413406
"architecture": {
@@ -429,31 +422,6 @@
429422
]
430423
},
431424
"dependencies": [
432-
{
433-
"name": "deploy-arch-ibm-account-infra-base",
434-
"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.",
435-
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
436-
"flavors": [
437-
"resource-group-only",
438-
"resource-groups-with-account-settings"
439-
],
440-
"default_flavor": "resource-group-only",
441-
"id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global",
442-
"input_mapping": [
443-
{
444-
"dependency_input": "prefix",
445-
"version_input": "prefix",
446-
"reference_version": true
447-
},
448-
{
449-
"dependency_output": "security_resource_group_name",
450-
"version_input": "existing_resource_group_name"
451-
}
452-
],
453-
"optional": true,
454-
"on_by_default": false,
455-
"version": "v3.0.23"
456-
},
457425
{
458426
"name": "deploy-arch-ibm-kms",
459427
"id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
@@ -467,6 +435,11 @@
467435
"dependency_output": "kms_instance_crn",
468436
"version_input": "existing_kms_instance_crn"
469437
},
438+
{
439+
"dependency_input": "existing_resource_group_name",
440+
"version_input": "resource_group",
441+
"reference_version": true
442+
},
470443
{
471444
"version_input": "kms_encryption_enabled",
472445
"value": true
@@ -484,7 +457,7 @@
484457
],
485458
"optional": true,
486459
"on_by_default": true,
487-
"version": "v5.1.27"
460+
"version": "v5.3.6"
488461
},
489462
{
490463
"name": "deploy-arch-ibm-cloud-logs",
@@ -500,6 +473,11 @@
500473
"version_input": "prefix",
501474
"reference_version": true
502475
},
476+
{
477+
"dependency_input": "existing_resource_group_name",
478+
"version_input": "resource_group",
479+
"reference_version": true
480+
},
503481
{
504482
"dependency_input": "region",
505483
"version_input": "region",
@@ -528,6 +506,11 @@
528506
"dependency_output": "cloud_monitoring_crn",
529507
"version_input": "existing_monitoring_crn"
530508
},
509+
{
510+
"dependency_input": "existing_resource_group_name",
511+
"version_input": "resource_group",
512+
"reference_version": true
513+
},
531514
{
532515
"dependency_input": "prefix",
533516
"version_input": "prefix",
@@ -546,7 +529,7 @@
546529
],
547530
"optional": true,
548531
"on_by_default": true,
549-
"version": "v1.7.2"
532+
"version": "v1.8.7"
550533
},
551534
{
552535
"name": "deploy-arch-ibm-activity-tracker",
@@ -562,6 +545,11 @@
562545
"version_input": "prefix",
563546
"reference_version": true
564547
},
548+
{
549+
"dependency_input": "existing_resource_group_name",
550+
"version_input": "resource_group",
551+
"reference_version": true
552+
},
565553
{
566554
"dependency_input": "region",
567555
"version_input": "region",
@@ -585,6 +573,11 @@
585573
"dependency_output": "crn",
586574
"version_input": "existing_event_notifications_instance_crn"
587575
},
576+
{
577+
"dependency_input": "existing_resource_group_name",
578+
"version_input": "resource_group",
579+
"reference_version": true
580+
},
588581
{
589582
"dependency_input": "prefix",
590583
"version_input": "prefix",

‎tests/pr_test.go‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,10 @@ func TestAddonsDefaultConfiguration(t *testing.T) {
224224
"deploy-arch-ibm-secrets-manager",
225225
"fully-configurable",
226226
map[string]interface{}{
227-
"prefix": options.Prefix,
228-
"region": validRegions[rand.Intn(len(validRegions))],
229-
"service_plan": "trial",
227+
"prefix": options.Prefix,
228+
"region": validRegions[rand.Intn(len(validRegions))],
229+
"service_plan": "trial",
230+
"existing_resource_group": options.ResourceGroup,
230231
},
231232
)
232233

@@ -273,6 +274,7 @@ func TestAddonsExistingSecretsManager(t *testing.T) {
273274
"prefix": options.Prefix,
274275
"region": permanentResources["privateOnlySecMgrRegion"],
275276
"existing_secrets_manager_crn": permanentResources["privateOnlySecMgrCRN"],
277+
"existing_resource_group": options.ResourceGroup,
276278
"service_plan": "__NULL__", // Plan not needed if using existing instance
277279
"skip_secrets_manager_iam_auth_policy": true, // Skip s2s auth policy for IAM engine - it already exists for the existing Secrets Manager instance
278280
"secret_groups": []string{}, // Don't create any secret groups in existing instance (The default 'General' group already exists)

0 commit comments

Comments
 (0)