Skip to content

Commit a966a64

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 (#820)
1 parent 545392f commit a966a64

File tree

4 files changed

+56
-59
lines changed

4 files changed

+56
-59
lines changed

‎ibm_catalog.json‎

Lines changed: 52 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -93,19 +93,12 @@
9393
"service_name": "Resource group only",
9494
"notes": "Viewer access is required in the resource group you want to provision in."
9595
},
96-
{
97-
"role_crns": [
98-
"crn:v1:bluemix:public:iam::::role:Administrator"
99-
],
100-
"service_name": "All Account Management services",
101-
"notes": "[Optional] Required to create new resource groups when enabling the Account Configuration integration."
102-
},
10396
{
10497
"role_crns": [
10598
"crn:v1:bluemix:public:iam::::role:Administrator"
10699
],
107100
"service_name": "All Identity and Access enabled services",
108-
"notes": "[Optional] Required to create new resource groups with account settings when enabling the Account Configuration integration."
101+
"notes": "[Optional] Required to to create trusted profile for App Configuration aggregator which is used for compliance scanning."
109102
},
110103
{
111104
"role_crns": [
@@ -559,8 +552,6 @@
559552
{
560553
"key": "existing_resource_group_name",
561554
"display_name": "resource_group",
562-
"default_value": "Default",
563-
"description": "The name of an existing resource group to provision the resources.",
564555
"custom_config": {
565556
"type": "resource_group",
566557
"grouping": "deployment",
@@ -1018,7 +1009,7 @@
10181009
"name": "deploy-arch-ibm-slz-vpc",
10191010
"description": "Configure the VPC and subnets required to deploy your OpenShift cluster.",
10201011
"id": "9fc0fa64-27af-4fed-9dce-47b3640ba739-global",
1021-
"version": "v8.5.0",
1012+
"version": "v8.7.0",
10221013
"flavors": [
10231014
"fully-configurable"
10241015
],
@@ -1031,6 +1022,11 @@
10311022
"version_input": "prefix",
10321023
"reference_version": true
10331024
},
1025+
{
1026+
"dependency_input": "existing_resource_group_name",
1027+
"version_input": "existing_resource_group_name",
1028+
"reference_version": true
1029+
},
10341030
{
10351031
"dependency_input": "region",
10361032
"version_input": "region",
@@ -1052,36 +1048,11 @@
10521048
}
10531049
]
10541050
},
1055-
{
1056-
"name": "deploy-arch-ibm-account-infra-base",
1057-
"description": "Organize your IBM Cloud account using preconfigured groups and access policies to manage resource group usage. Optionally, extend security controls with IAM Account Settings validation.",
1058-
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
1059-
"flavors": [
1060-
"resource-group-only",
1061-
"resource-groups-with-account-settings"
1062-
],
1063-
"default_flavor": "resource-group-only",
1064-
"id": "63641cec-6093-4b4f-b7b0-98d2f4185cd6-global",
1065-
"input_mapping": [
1066-
{
1067-
"dependency_output": "workload_resource_group_name",
1068-
"version_input": "existing_resource_group_name"
1069-
},
1070-
{
1071-
"dependency_input": "prefix",
1072-
"version_input": "prefix",
1073-
"reference_version": true
1074-
}
1075-
],
1076-
"optional": true,
1077-
"on_by_default": false,
1078-
"version": "v3.0.23"
1079-
},
10801051
{
10811052
"name": "deploy-arch-ibm-kms",
10821053
"description": "Integrate IBM Key Protect to manage encryption keys for your cluster, securing persistent volumes and supporting compliance. If unselected, encryption is still applied using IBM-managed keys.",
10831054
"id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
1084-
"version": "v5.1.27",
1055+
"version": "v5.4.0",
10851056
"flavors": [
10861057
"fully-configurable"
10871058
],
@@ -1102,6 +1073,11 @@
11021073
"version_input": "prefix",
11031074
"reference_version": true
11041075
},
1076+
{
1077+
"dependency_input": "existing_resource_group_name",
1078+
"version_input": "existing_resource_group_name",
1079+
"reference_version": true
1080+
},
11051081
{
11061082
"dependency_input": "region",
11071083
"version_input": "region",
@@ -1113,7 +1089,7 @@
11131089
"name": "deploy-arch-ibm-cos",
11141090
"description": "Set up a Cloud Object Storage (COS) instance and bucket to serve as internal registry storage for your OpenShift cluster.",
11151091
"id": "68921490-2778-4930-ac6d-bae7be6cd958-global",
1116-
"version": "v10.2.21",
1092+
"version": "v10.5.0",
11171093
"flavors": [
11181094
"instance"
11191095
],
@@ -1129,6 +1105,11 @@
11291105
"dependency_input": "prefix",
11301106
"version_input": "prefix",
11311107
"reference_version": true
1108+
},
1109+
{
1110+
"dependency_input": "existing_resource_group_name",
1111+
"version_input": "existing_resource_group_name",
1112+
"reference_version": true
11321113
}
11331114
]
11341115
},
@@ -1140,7 +1121,7 @@
11401121
"fully-configurable"
11411122
],
11421123
"id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
1143-
"version": "v1.6.28",
1124+
"version": "v1.9.0",
11441125
"optional": true,
11451126
"on_by_default": true,
11461127
"input_mapping": [
@@ -1149,6 +1130,11 @@
11491130
"version_input": "prefix",
11501131
"reference_version": true
11511132
},
1133+
{
1134+
"dependency_input": "existing_resource_group_name",
1135+
"version_input": "existing_resource_group_name",
1136+
"reference_version": true
1137+
},
11521138
{
11531139
"dependency_input": "region",
11541140
"version_input": "region",
@@ -1175,7 +1161,7 @@
11751161
"name": "deploy-arch-ibm-cloud-monitoring",
11761162
"description": "Set up a Cloud Monitoring instance to collect platform metrics.",
11771163
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
1178-
"version": "v1.7.2",
1164+
"version": "v1.9.0",
11791165
"flavors": [
11801166
"fully-configurable"
11811167
],
@@ -1189,18 +1175,13 @@
11891175
"reference_version": true
11901176
},
11911177
{
1192-
"dependency_input": "region",
1193-
"version_input": "region",
1178+
"dependency_input": "existing_resource_group_name",
1179+
"version_input": "existing_resource_group_name",
11941180
"reference_version": true
11951181
},
11961182
{
1197-
"dependency_input": "existing_cos_instance_crn",
1198-
"version_input": "existing_cos_instance_crn",
1199-
"reference_version": true
1200-
},
1201-
{
1202-
"dependency_input": "existing_kms_instance_crn",
1203-
"version_input": "existing_kms_instance_crn",
1183+
"dependency_input": "region",
1184+
"version_input": "region",
12041185
"reference_version": true
12051186
},
12061187
{
@@ -1214,7 +1195,7 @@
12141195
"name": "deploy-arch-ibm-activity-tracker",
12151196
"description": "Configure Activity Tracker Event Routing to direct auditing events appropriately.",
12161197
"id": "918453c3-4f97-4583-8c4a-83ef12fc7916-global",
1217-
"version": "v1.2.34",
1198+
"version": "v1.4.3",
12181199
"flavors": [
12191200
"fully-configurable"
12201201
],
@@ -1232,6 +1213,11 @@
12321213
"version_input": "region",
12331214
"reference_version": true
12341215
},
1216+
{
1217+
"dependency_input": "existing_resource_group_name",
1218+
"version_input": "existing_resource_group_name",
1219+
"reference_version": true
1220+
},
12351221
{
12361222
"dependency_input": "existing_cos_instance_crn",
12371223
"version_input": "existing_cos_instance_crn",
@@ -1248,7 +1234,7 @@
12481234
"name": "deploy-arch-ibm-secrets-manager",
12491235
"description": "Provision a Secrets Manager instance to securely store and manage sensitive credentials—such as certificates—used by services integrated with your cluster.",
12501236
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
1251-
"version": "v2.10.0",
1237+
"version": "v2.11.0",
12521238
"flavors": [
12531239
"fully-configurable"
12541240
],
@@ -1261,6 +1247,11 @@
12611247
"version_input": "prefix",
12621248
"reference_version": true
12631249
},
1250+
{
1251+
"dependency_input": "existing_resource_group_name",
1252+
"version_input": "existing_resource_group_name",
1253+
"reference_version": true
1254+
},
12641255
{
12651256
"dependency_input": "region",
12661257
"version_input": "region",
@@ -1290,7 +1281,7 @@
12901281
"name": "deploy-arch-ibm-scc-workload-protection",
12911282
"description": "Integrate with Workload Protection to monitor and manage your cluster’s security posture, helping detect misconfigurations and enforce compliance.",
12921283
"id": "4322cf44-2289-49aa-a719-dd79e39b14dc-global",
1293-
"version": "v1.12.3",
1284+
"version": "v1.14.0",
12941285
"flavors": [
12951286
"fully-configurable"
12961287
],
@@ -1303,6 +1294,11 @@
13031294
"version_input": "prefix",
13041295
"reference_version": true
13051296
},
1297+
{
1298+
"dependency_input": "existing_resource_group_name",
1299+
"version_input": "existing_resource_group_name",
1300+
"reference_version": true
1301+
},
13061302
{
13071303
"dependency_input": "region",
13081304
"version_input": "region",
@@ -1390,8 +1386,6 @@
13901386
{
13911387
"key": "existing_resource_group_name",
13921388
"display_name": "resource_group",
1393-
"default_value": "Default",
1394-
"description": "The name of an existing resource group to provision the resources.",
13951389
"custom_config": {
13961390
"type": "resource_group",
13971391
"grouping": "deployment",
@@ -1404,6 +1398,10 @@
14041398
{
14051399
"key": "prefix",
14061400
"required": true,
1401+
"default_value": "dev",
1402+
"random_string": {
1403+
"length": 4
1404+
},
14071405
"value_constraints": [
14081406
{
14091407
"type": "regex",

‎solutions/fully-configurable/variables.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ variable "prefix" {
4141

4242
variable "existing_resource_group_name" {
4343
type = string
44-
description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used."
45-
default = null
44+
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."
45+
default = "Default"
4646
}
4747

4848
variable "cluster_resource_tags" {

‎solutions/quickstart/variables.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ variable "ibmcloud_api_key" {
77

88
variable "existing_resource_group_name" {
99
type = string
10-
description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used."
11-
default = null
10+
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."
11+
default = "Default"
1212
}
1313

1414
variable "provider_visibility" {

‎tests/pr_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,6 @@ func TestRoksAddonDefaultConfiguration(t *testing.T) {
270270
"deploy-arch-ibm-slz-ocp",
271271
"fully-configurable",
272272
map[string]interface{}{
273-
"prefix": options.Prefix,
274273
"region": "eu-de",
275274
},
276275
)

0 commit comments

Comments
 (0)