Skip to content

remove account config dep #117

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 10 commits into from
Oct 17, 2025
Merged

remove account config dep #117

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a2c88ce
remove ac dep
daniel-butler-irl Oct 14, 2025
fd28bab
add rg mapping
daniel-butler-irl Oct 14, 2025
eace99c
update versions
daniel-butler-irl Oct 17, 2025
e5f13c0
update cloud logs version
daniel-butler-irl Oct 17, 2025
cff6fbd
Update ibm_catalog.json
daniel-butler-irl Oct 17, 2025
0ff80c1
filx line end
daniel-butler-irl Oct 17, 2025
51d41b3
fix typo
daniel-butler-irl Oct 17, 2025
e54320a
fix type for real ;)
daniel-butler-irl Oct 17, 2025
12d73d8
update common dev
daniel-butler-irl Oct 17, 2025
57e32e6
fix configuration name
daniel-butler-irl Oct 17, 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
4 changes: 2 additions & 2 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "go.sum|^.secrets.baseline$",
"lines": null
},
"generated_at": "2025-04-17T11:02:06Z",
"generated_at": "2025-10-17T12:05:48Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -88,7 +88,7 @@
}
]
},
"version": "0.13.1+ibm.62.dss",
"version": "0.13.1+ibm.64.dss",
"word_list": {
"file": null,
"hash": null
Expand Down
48 changes: 43 additions & 5 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,10 @@
},
{
"key": "prefix",
"required": true,
"default_value": "dev",
"random_string": {
"length": 4
},
"value_constraints": [
{
"type": "regex",
Expand Down Expand Up @@ -169,6 +172,21 @@
}
]
},
{
"key": "existing_resource_group",
"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. [Learn more](https://cloud.ibm.com/docs/account?topic=account-rgs&interface=ui#create_rgs) about how to create a resource group.",
"virtual": true
},
{
"key": "enable_activity_tracker_event_routing_to_cloud_logs"
},
Expand Down Expand Up @@ -350,7 +368,7 @@
"name": "deploy-arch-ibm-cos",
"description": "Enable this to create an IBM Cloud Object Storage(COS) instance. The buckets to store events will be created by the Activity Tracker Event Routing deployable architecture.",
"id": "68921490-2778-4930-ac6d-bae7be6cd958-global",
"version": "v10.2.21",
"version": "v10.5.0",
"flavors": [
"instance"
],
Expand All @@ -362,6 +380,11 @@
"dependency_output": "cos_instance_crn",
"version_input": "existing_cos_instance_crn"
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
"dependency_input": "prefix",
"version_input": "prefix",
Expand All @@ -377,7 +400,7 @@
"name": "deploy-arch-ibm-kms",
"description": "Enable when you want to create your own managed keys to encrypt the buckets. Select only if existing KMS instance or Key is not provided. ",
"id": "2cad4789-fa90-4886-9c9e-857081c273ee-global",
"version": "v5.1.27",
"version": "v5.4.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -402,6 +425,11 @@
"dependency_input": "region",
"version_input": "region",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
]
},
Expand All @@ -413,7 +441,7 @@
"fully-configurable"
],
"id": "63d8ae58-fbf3-41ce-b844-0fb5b85882ab-global",
"version": "v1.6.28",
"version": "v1.9.0",
"optional": true,
"on_by_default": true,
"input_mapping": [
Expand All @@ -429,14 +457,19 @@
{
"version_input": "enable_activity_tracker_event_routing_to_cloud_logs",
"value": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
]
},
{
"name": "deploy-arch-ibm-cloud-monitoring",
"description": "Configure IBM Cloud Monitoring to collect the platform metrics.",
"id": "73debdbf-894f-4c14-81c7-5ece3a70b67d-global",
"version": "v1.7.2",
"version": "v1.9.0",
"flavors": [
"fully-configurable"
],
Expand All @@ -457,6 +490,11 @@
"dependency_input": "region",
"version_input": "region",
"reference_version": true
},
{
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ func TestActivityTrackerDefaultConfiguration(t *testing.T) {
"deploy-arch-ibm-activity-tracker",
"fully-configurable",
map[string]interface{}{
"prefix": options.Prefix,
"region": validRegions[rand.Intn(len(validRegions))],
"region": validRegions[rand.Intn(len(validRegions))],
"existing_resource_group": resourceGroup,
},
)

Expand Down
2 changes: 1 addition & 1 deletion variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ variable "eventstreams_targets" {

validation {
condition = alltrue([for es_target in var.eventstreams_targets : (es_target.service_to_service_enabled == true && es_target.api_key == null) || (es_target.service_to_service_enabled == false && es_target.api_key != null)])
error_message = "The value of `api_key` should not be provided if 'service_to_service_enabled' is set to tru for event stream targets. If you want to use 'api_key', set 'service_to_service_enabled' to false."
error_message = "The value of `api_key` should not be provided if 'service_to_service_enabled' is set to true for event stream targets. If you want to use 'api_key', set 'service_to_service_enabled' to false."
}
}

Expand Down