Skip to content

Commit 9b2a3af

Browse files
ocofaighocofaigh
authored
feat: remove Account Config DA from customize DA flow, add default value for prefix using random string generator and update logic that handles default resource group lookup (#1071)
1 parent 81ceeaa commit 9b2a3af

File tree

4 files changed

+39
-46
lines changed

4 files changed

+39
-46
lines changed

‎ibm_catalog.json‎

Lines changed: 36 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
"crn:v1:bluemix:public:iam::::role:Administrator"
120120
],
121121
"service_name": "All Identity and Access enabled services",
122-
"notes": "[Optional] Required to create new resource groups with account settings when enabling the Account Configuration integration."
122+
"notes": "[Optional] Required to to create trusted profile for App Configuration aggregator which is used for compliance scanning."
123123
},
124124
{
125125
"role_crns": [
@@ -200,6 +200,10 @@
200200
{
201201
"key": "prefix",
202202
"required": true,
203+
"default_value": "dev",
204+
"random_string": {
205+
"length": 4
206+
},
203207
"value_constraints": [
204208
{
205209
"type": "regex",
@@ -545,31 +549,6 @@
545549
}
546550
],
547551
"dependencies": [
548-
{
549-
"name": "deploy-arch-ibm-account-infra-base",
550-
"description": "Organizes your IBM Cloud account with preconfigured resource groups. If not selected, the default resource group is used. Optionally, it can expand to apply recommended security controls via \"with Account Settings\" variation. ",
551-
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
552-
"flavors": [
553-
"resource-group-only",
554-
"resource-groups-with-account-settings"
555-
],
556-
"default_flavor": "resource-group-only",
557-
"id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global",
558-
"input_mapping": [
559-
{
560-
"dependency_input": "prefix",
561-
"version_input": "prefix",
562-
"reference_version": true
563-
},
564-
{
565-
"dependency_output": "workload_resource_group_name",
566-
"version_input": "existing_resource_group_name"
567-
}
568-
],
569-
"optional": true,
570-
"on_by_default": false,
571-
"version": "v3.0.23"
572-
},
573552
{
574553
"name": "deploy-arch-ibm-kms",
575554
"id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
@@ -588,6 +567,11 @@
588567
"version_input": "prefix",
589568
"reference_version": true
590569
},
570+
{
571+
"dependency_input": "existing_resource_group_name",
572+
"version_input": "existing_resource_group_name",
573+
"reference_version": true
574+
},
591575
{
592576
"dependency_input": "region",
593577
"version_input": "region",
@@ -609,7 +593,7 @@
609593
],
610594
"optional": true,
611595
"on_by_default": true,
612-
"version": "v5.1.27"
596+
"version": "v5.4.0"
613597
},
614598
{
615599
"name": "deploy-arch-ibm-cos",
@@ -641,7 +625,7 @@
641625
],
642626
"optional": true,
643627
"on_by_default": true,
644-
"version": "v10.2.21"
628+
"version": "v10.5.0"
645629
},
646630
{
647631
"name": "deploy-arch-ibm-cloud-logs",
@@ -651,7 +635,7 @@
651635
"fully-configurable"
652636
],
653637
"id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
654-
"version": "v1.6.28",
638+
"version": "v1.9.0",
655639
"optional": true,
656640
"on_by_default": true,
657641
"input_mapping": [
@@ -660,6 +644,11 @@
660644
"version_input": "prefix",
661645
"reference_version": true
662646
},
647+
{
648+
"dependency_input": "existing_resource_group_name",
649+
"version_input": "existing_resource_group_name",
650+
"reference_version": true
651+
},
663652
{
664653
"dependency_input": "existing_cos_instance_crn",
665654
"version_input": "existing_cos_instance_crn",
@@ -686,7 +675,7 @@
686675
"name": "deploy-arch-ibm-cloud-monitoring",
687676
"description": "Sets up a Cloud Monitoring instance to collect the platform metrics.",
688677
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
689-
"version": "v1.7.2",
678+
"version": "v1.9.0",
690679
"flavors": [
691680
"fully-configurable"
692681
],
@@ -699,6 +688,11 @@
699688
"version_input": "enable_platform_metrics",
700689
"reference_version": true
701690
},
691+
{
692+
"dependency_input": "existing_resource_group_name",
693+
"version_input": "existing_resource_group_name",
694+
"reference_version": true
695+
},
702696
{
703697
"dependency_input": "prefix",
704698
"version_input": "prefix",
@@ -708,24 +702,14 @@
708702
"dependency_input": "region",
709703
"version_input": "region",
710704
"reference_version": true
711-
},
712-
{
713-
"dependency_input": "existing_cos_instance_crn",
714-
"version_input": "existing_cos_instance_crn",
715-
"reference_version": true
716-
},
717-
{
718-
"dependency_input": "existing_kms_instance_crn",
719-
"version_input": "existing_kms_instance_crn",
720-
"reference_version": true
721705
}
722706
]
723707
},
724708
{
725709
"name": "deploy-arch-ibm-activity-tracker",
726710
"description": "Configure Activity Tracker Event Routing to route the auditing events.",
727711
"id": "918453c3-4f97-4583-8c4a-83ef12fc7916-global",
728-
"version": "v1.2.34",
712+
"version": "v1.4.3",
729713
"flavors": [
730714
"fully-configurable"
731715
],
@@ -738,6 +722,11 @@
738722
"version_input": "prefix",
739723
"reference_version": true
740724
},
725+
{
726+
"dependency_input": "existing_resource_group_name",
727+
"version_input": "existing_resource_group_name",
728+
"reference_version": true
729+
},
741730
{
742731
"dependency_input": "region",
743732
"version_input": "region",
@@ -759,7 +748,7 @@
759748
"name": "deploy-arch-ibm-scc-workload-protection",
760749
"description": "Configure an IBM Cloud Security and Compliance Center Workload Protection instance to help you manage security and compliance for your organization.",
761750
"id": "4322cf44-2289-49aa-a719-dd79e39b14dc-global",
762-
"version": "v1.12.3",
751+
"version": "v1.14.0",
763752
"flavors": [
764753
"fully-configurable"
765754
],
@@ -776,6 +765,11 @@
776765
"dependency_input": "region",
777766
"version_input": "region",
778767
"reference_version": true
768+
},
769+
{
770+
"dependency_input": "existing_resource_group_name",
771+
"version_input": "existing_resource_group_name",
772+
"reference_version": true
779773
}
780774
]
781775
}

‎solutions/fully-configurable/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ locals {
88

99
module "resource_group" {
1010
source = "terraform-ibm-modules/resource-group/ibm"
11-
version = "1.3.0"
11+
version = "1.4.0"
1212
existing_resource_group_name = var.existing_resource_group_name
1313
}
1414

‎solutions/fully-configurable/variables.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ variable "provider_visibility" {
2121

2222
variable "existing_resource_group_name" {
2323
type = string
24-
description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used."
25-
default = null
24+
description = "The name of an existing resource group to provision the resources. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group."
25+
default = "Default"
2626
}
2727

2828
variable "prefix" {

‎tests/pr_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,6 @@ func TestVpcAddonDefaultConfiguration(t *testing.T) {
419419
"deploy-arch-ibm-slz-vpc",
420420
"fully-configurable",
421421
map[string]interface{}{
422-
"prefix": options.Prefix,
423422
"region": "us-south",
424423
},
425424
)

0 commit comments

Comments
 (0)