Skip to content

map RG #978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 16, 2025
Merged

map RG #978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f174757
map RG
daniel-butler-irl Oct 14, 2025
004ceaa
update rg name input
daniel-butler-irl Oct 15, 2025
a344edd
update prefix
daniel-butler-irl Oct 15, 2025
70efefc
update test to remove prefix
daniel-butler-irl Oct 15, 2025
df6e757
update rg module
daniel-butler-irl Oct 15, 2025
7598c58
update names
daniel-butler-irl Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
144 changes: 141 additions & 3 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@
},
{
"key": "prefix",
"default_value": "dev",
"random_string": {
"length": 4
},
"value_constraints": [
{
"type": "regex",
Expand Down Expand Up @@ -133,9 +137,7 @@
"config_constraints": {
"identifier": "rg_name"
}
},
"default_value": "Default",
"description": "The name of an existing resource group to provision the resources."
}
},
{
"key": "instance_name"
Expand Down Expand Up @@ -298,6 +300,10 @@
{
"key": "prefix",
"required": true,
"default_value": "dev",
"random_string": {
"length": 4
},
"value_constraints": [
{
"type": "regex",
Expand All @@ -306,6 +312,21 @@
}
]
},
{
"key": "existing_resource_group_name",
"display_name": "resource_group",
"custom_config": {
"type": "resource_group",
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"identifier": "rg_name"
}
},
"default_value": "Default",
"description": "The name of an existing resource group to provision the resources.",
"virtual": true
},
{
"key": "cross_region_location",
"required": true,
Expand Down Expand Up @@ -590,6 +611,11 @@
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
]
},
Expand All @@ -614,6 +640,11 @@
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
],
"optional": true,
Expand Down Expand Up @@ -645,6 +676,11 @@
"dependency_input": "enable_platform_metrics",
"version_input": "enable_platform_metrics",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
]
}
Expand Down Expand Up @@ -717,6 +753,10 @@
},
{
"key": "prefix",
"default_value": "dev",
"random_string": {
"length": 4
},
"required": true,
"value_constraints": [
{
Expand All @@ -726,6 +766,21 @@
}
]
},
{
"key": "existing_resource_group_name",
"display_name": "resource_group",
"custom_config": {
"type": "resource_group",
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"identifier": "rg_name"
}
},
"default_value": "Default",
"description": "The name of an existing resource group to provision the resources.",
"virtual": true
},
{
"key": "cross_region_location",
"required": true,
Expand Down Expand Up @@ -971,6 +1026,11 @@
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
]
},
Expand All @@ -995,6 +1055,11 @@
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
],
"optional": true,
Expand Down Expand Up @@ -1026,6 +1091,11 @@
"dependency_input": "enable_platform_metrics",
"version_input": "enable_platform_metrics",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
]
}
Expand Down Expand Up @@ -1113,6 +1183,10 @@
},
{
"key": "prefix",
"default_value": "dev",
"random_string": {
"length": 4
},
"required": true,
"value_constraints": [
{
Expand All @@ -1122,6 +1196,21 @@
}
]
},
{
"key": "existing_resource_group_name",
"display_name": "resource_group",
"custom_config": {
"type": "resource_group",
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"identifier": "rg_name"
}
},
"default_value": "Default",
"description": "The name of an existing resource group to provision the resources.",
"virtual": true
},
{
"key": "region",
"required": true,
Expand Down Expand Up @@ -1439,6 +1528,11 @@
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
]
},
Expand All @@ -1462,6 +1556,11 @@
"version_input": "kms_encryption_enabled",
"value": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "kms_endpoint_type",
"version_input": "kms_endpoint_type",
Expand Down Expand Up @@ -1495,6 +1594,11 @@
"dependency_output": "cloud_monitoring_crn",
"version_input": "monitoring_crn"
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "prefix",
"version_input": "prefix",
Expand Down Expand Up @@ -1576,6 +1680,10 @@
},
{
"key": "prefix",
"default_value": "dev",
"random_string": {
"length": 4
},
"required": true,
"value_constraints": [
{
Expand All @@ -1585,6 +1693,21 @@
}
]
},
{
"key": "existing_resource_group_name",
"display_name": "resource_group",
"custom_config": {
"type": "resource_group",
"grouping": "deployment",
"original_grouping": "deployment",
"config_constraints": {
"identifier": "rg_name"
}
},
"default_value": "Default",
"description": "The name of an existing resource group to provision the resources.",
"virtual": true
},
{
"key": "region",
"required": true,
Expand Down Expand Up @@ -1856,6 +1979,11 @@
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
]
},
Expand All @@ -1880,6 +2008,11 @@
"dependency_input": "prefix",
"version_input": "prefix",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
],
"optional": true,
Expand Down Expand Up @@ -1911,6 +2044,11 @@
"dependency_input": "enable_platform_metrics",
"version_input": "enable_platform_metrics",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion solutions/instance/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

module "resource_group" {
source = "terraform-ibm-modules/resource-group/ibm"
version = "1.3.0"
version = "1.4.0"
existing_resource_group_name = var.existing_resource_group_name
}

Expand Down
4 changes: 2 additions & 2 deletions solutions/instance/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ variable "prefix" {

variable "existing_resource_group_name" {
type = string
description = "The name of an existing resource group to provision the resources. If not provided the default resource group will be used."
default = null
description = "The name of an existing resource group to provision the resources."
default = "Default"
}

variable "instance_name" {
Expand Down
8 changes: 4 additions & 4 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,8 +642,8 @@ func TestRegionalBucketAddonDefault(t *testing.T) {
"deploy-arch-ibm-cos",
"regional-bucket-fully-configurable",
map[string]interface{}{
"prefix": options.Prefix,
"bucket_name": "test",
"bucket_name": "test",
"existing_resource_group_name": resourceGroup,
},
)

Expand All @@ -666,8 +666,8 @@ func TestCrossRegionalBucketAddonDefault(t *testing.T) {
"deploy-arch-ibm-cos",
"cross-regional-bucket-fully-configurable",
map[string]interface{}{
"prefix": options.Prefix,
"bucket_name": "test",
"bucket_name": "test",
"existing_resource_group_name": resourceGroup,
},
)

Expand Down