Skip to content

Commit 6c62264

Browse files
add random prefix and update versions
1 parent bf84e1b commit 6c62264

File tree

4 files changed

+23
-21
lines changed

4 files changed

+23
-21
lines changed

ibm_catalog.json

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,10 @@
131131
},
132132
{
133133
"key": "prefix",
134-
"required": true,
134+
"default_value": "dev",
135+
"random_string": {
136+
"length": 4
137+
},
135138
"value_constraints": [
136139
{
137140
"type": "regex",
@@ -187,9 +190,7 @@
187190
"config_constraints": {
188191
"identifier": "rg_name"
189192
}
190-
},
191-
"default_value": "Default",
192-
"description": "The name of an existing resource group to provision the resources."
193+
}
193194
},
194195
{
195196
"key": "provider_visibility",
@@ -437,7 +438,7 @@
437438
},
438439
{
439440
"dependency_input": "existing_resource_group_name",
440-
"version_input": "resource_group",
441+
"version_input": "existing_resource_group_name",
441442
"reference_version": true
442443
},
443444
{
@@ -457,7 +458,7 @@
457458
],
458459
"optional": true,
459460
"on_by_default": true,
460-
"version": "v5.3.6"
461+
"version": "v5.4.0"
461462
},
462463
{
463464
"name": "deploy-arch-ibm-cloud-logs",
@@ -475,7 +476,7 @@
475476
},
476477
{
477478
"dependency_input": "existing_resource_group_name",
478-
"version_input": "resource_group",
479+
"version_input": "existing_resource_group_name",
479480
"reference_version": true
480481
},
481482
{
@@ -491,7 +492,7 @@
491492
],
492493
"optional": true,
493494
"on_by_default": true,
494-
"version": "v1.6.28"
495+
"version": "v1.7.0"
495496
},
496497
{
497498
"name": "deploy-arch-ibm-cloud-monitoring",
@@ -508,7 +509,7 @@
508509
},
509510
{
510511
"dependency_input": "existing_resource_group_name",
511-
"version_input": "resource_group",
512+
"version_input": "existing_resource_group_name",
512513
"reference_version": true
513514
},
514515
{
@@ -529,7 +530,7 @@
529530
],
530531
"optional": true,
531532
"on_by_default": true,
532-
"version": "v1.8.7"
533+
"version": "v1.9.0"
533534
},
534535
{
535536
"name": "deploy-arch-ibm-activity-tracker",
@@ -547,7 +548,7 @@
547548
},
548549
{
549550
"dependency_input": "existing_resource_group_name",
550-
"version_input": "resource_group",
551+
"version_input": "existing_resource_group_name",
551552
"reference_version": true
552553
},
553554
{
@@ -558,7 +559,7 @@
558559
],
559560
"optional": true,
560561
"on_by_default": true,
561-
"version": "v1.2.34"
562+
"version": "v1.3.0"
562563
},
563564
{
564565
"name": "deploy-arch-ibm-event-notifications",
@@ -575,7 +576,7 @@
575576
},
576577
{
577578
"dependency_input": "existing_resource_group_name",
578-
"version_input": "resource_group",
579+
"version_input": "existing_resource_group_name",
579580
"reference_version": true
580581
},
581582
{
@@ -591,7 +592,7 @@
591592
],
592593
"optional": true,
593594
"on_by_default": true,
594-
"version": "v2.7.2"
595+
"version": "v2.10.0"
595596
}
596597
],
597598
"dependency_version_2": true,
@@ -668,7 +669,10 @@
668669
},
669670
{
670671
"key": "prefix",
671-
"required": true,
672+
"default_value": "dev",
673+
"random_string": {
674+
"length": 4
675+
},
672676
"value_constraints": [
673677
{
674678
"type": "regex",

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."
25+
default = "Default"
2626
}
2727

2828
variable "region" {

solutions/security-enforced/variables.tf

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

1111
variable "existing_resource_group_name" {
1212
type = string
13-
description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used."
14-
default = null
13+
description = "The name of an existing resource group to provision the resources."
14+
default = "Default"
1515
}
1616

1717
variable "region" {

tests/pr_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,6 @@ func TestAddonsDefaultConfiguration(t *testing.T) {
224224
"deploy-arch-ibm-secrets-manager",
225225
"fully-configurable",
226226
map[string]interface{}{
227-
"prefix": options.Prefix,
228227
"region": validRegions[rand.Intn(len(validRegions))],
229228
"service_plan": "trial",
230229
"existing_resource_group": options.ResourceGroup,
@@ -271,7 +270,6 @@ func TestAddonsExistingSecretsManager(t *testing.T) {
271270
"deploy-arch-ibm-secrets-manager",
272271
"fully-configurable",
273272
map[string]interface{}{
274-
"prefix": options.Prefix,
275273
"region": permanentResources["privateOnlySecMgrRegion"],
276274
"existing_secrets_manager_crn": permanentResources["privateOnlySecMgrCRN"],
277275
"existing_resource_group": options.ResourceGroup,

0 commit comments

Comments
 (0)