Skip to content

fix(deps): update DA dependencies #375

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 3 commits into from
Oct 20, 2025
Merged

fix(deps): update DA dependencies #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66c89bd
fix(deps): update DA dependencies
ocofaigh Oct 20, 2025
e157e2c
bump dep
ocofaigh Oct 20, 2025
099208d
update
ocofaigh Oct 20, 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
84 changes: 35 additions & 49 deletions ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,32 @@
},
{
"key": "prefix",
"required": true
"default_value": "dev",
"random_string": {
"length": 4
},
"value_constraints": [
{
"type": "regex",
"description": "Prefix must begin with a lowercase letter and may contain only lowercase letters, digits, and hyphens '-'. It must not end with a hyphen('-'), and cannot contain consecutive hyphens ('--'). It should not exceed 16 characters.",
"value": "^$|^__NULL__$|^[a-z](?!.*--)(?:[a-z0-9-]{0,14}[a-z0-9])?$"
}
]
},
{
"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. [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": "secrets_manager_region",
Expand Down Expand Up @@ -334,14 +359,6 @@
"service_name": "secrets-manager",
"notes": "[optional] Required for creating an Secrets Manager instance."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Operator",
"crn:v1:bluemix:public:iam::::role:Administrator"
],
"service_name": "iam-identity",
"notes": "[Optional] Required for Cloud automation for account configuration is enabled."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::role:Viewer"
Expand All @@ -363,15 +380,15 @@
"crn:v1:bluemix:public:iam::::role:Editor"
],
"service_name": "sysdig-monitor",
"notes": "[Optional] Required if you are consuming the Observability deployable architecture which sets up Cloud Monitoring."
"notes": "[Optional] Required if configuring a Cloud Monitoring instance."
},
{
"role_crns": [
"crn:v1:bluemix:public:iam::::serviceRole:Manager",
"crn:v1:bluemix:public:iam::::role:Editor"
],
"service_name": "logs",
"notes": "[Optional] Required if you are consuming the Observability deployable architecture which sets up Cloud Logs."
"notes": "[Optional] Required if configuring a Cloud Logs instance."
},
{
"role_crns": [
Expand All @@ -392,9 +409,9 @@
],
"dependencies": [
{
"name": "deploy-arch-ibm-secrets-manager",
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
"version": "v2.10.0",
"name": "deploy-arch-secrets-manager-private-cert-engine",
"id": "571d2eb7-e416-40a4-aa95-be05e6155af8-global",
"version": "v1.10.1",
"flavors": [
"fully-configurable"
],
Expand All @@ -411,38 +428,8 @@
"reference_version": true
},
{
"dependency_input": "region",
"version_input": "secrets_manager_region",
"reference_version": true
},
{
"dependency_input": "service_plan",
"version_input": "secrets_manager_service_plan",
"reference_version": true
},
{
"dependency_output": "secrets_manager_crn",
"version_input": "existing_secrets_manager_crn"
}
]
},
{
"name": "deploy-arch-secrets-manager-private-cert-engine",
"id": "571d2eb7-e416-40a4-aa95-be05e6155af8-global",
"version": "v1.8.0",
"flavors": [
"fully-configurable"
],
"catalog_id": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3",
"optional": true,
"on_by_default": true,
"ignore_auto_referencing": [
"*"
],
"input_mapping": [
{
"dependency_input": "prefix",
"version_input": "prefix",
"dependency_input": "existing_resource_group_name",
"version_input": "existing_resource_group_name",
"reference_version": true
},
{
Expand All @@ -451,9 +438,8 @@
"reference_version": true
},
{
"dependency_input": "existing_secrets_manager_crn",
"version_input": "existing_secrets_manager_crn",
"reference_version": true
"dependency_output": "secrets_manager_crn",
"version_input": "existing_secrets_manager_crn"
},
{
"dependency_input": "secrets_manager_service_plan",
Expand Down
5 changes: 5 additions & 0 deletions solutions/fully-configurable/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@ output "secret_crn" {
description = "Private certificates secrets manager secret CRN"
value = module.secrets_manager_private_cert.secret_crn
}

output "secrets_manager_crn" {
description = "The CRN of the Secrets Manager instance"
value = var.existing_secrets_manager_crn
}
1 change: 0 additions & 1 deletion tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,6 @@ func TestAddonsDefaultConfiguration(t *testing.T) {
"deploy-arch-secrets-manager-private-cert",
"fully-configurable",
map[string]interface{}{
"prefix": options.Prefix,
"secrets_manager_region": "eu-de",
"secrets_manager_service_plan": "trial",
},
Expand Down