Skip to content

fix: module updates #138

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

Closed
wants to merge 14 commits into from
Closed

fix: module updates #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b83081d
chore: update member version
huayuenh Oct 10, 2025
636abd9
chore: update members
huayuenh Oct 10, 2025
e32722e
chore: update members
huayuenh Oct 10, 2025
1ce5385
chore: update member details
huayuenh Oct 10, 2025
96227a2
chore: update member
huayuenh Oct 10, 2025
e77c07d
chore: update member setting
huayuenh Oct 10, 2025
c8371a2
chore: update member details
huayuenh Oct 10, 2025
828bd22
chore: update members
huayuenh Oct 11, 2025
c47b518
chore: member update
huayuenh Oct 11, 2025
ddb5607
chore: update defaults
huayuenh Oct 11, 2025
e28c44f
chore: update test
huayuenh Oct 13, 2025
6102567
chore: update default
huayuenh Oct 13, 2025
d3bbb81
chore: update defaults
huayuenh Oct 13, 2025
7832778
chore: update default
huayuenh Oct 13, 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 ibm_catalog.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@
{
"key": "use_legacy_ref",
"type": "boolean",
"default_value": true,
"default_value": false,
"description": "Set to `true` to use the legacy secret reference format for Secrets Manager secrets.",
"required": false
}
Expand Down Expand Up @@ -973,7 +973,7 @@
{
"key": "use_legacy_ref",
"type": "boolean",
"default_value": true,
"default_value": false,
"description": "Set to `true` to use the legacy secret reference format for Secrets Manager secrets.",
"required": false
}
Expand Down
38 changes: 19 additions & 19 deletions kubernetes/stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,15 +465,11 @@
{
"inputs": [
{
"name": "resource_group_name",
"name": "existing_resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"value": true
},
{
"name": "cos_instance_name",
"name": "instance_name",
"value": "evidence"
},
{
Expand All @@ -482,7 +478,7 @@
}
],
"name": "2 - Cloud Object Storage",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.30851389-2ab5-4be5-8674-7ef756cb372d-global"
},
{
"inputs": [
Expand Down Expand Up @@ -514,15 +510,23 @@
"inputs": [
{
"name": "existing_cos_instance_crn",
"value": "ref:../../members/3 - Cloud Object Bucket/outputs/cos_instance_id"
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
},
{
"name": "enable_collecting_failed_events",
"value": true
},
{
"name": "kms_encryption_enabled",
"value": true
},
{
"name": "kms_endpoint_url",
"value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint"
},
{
"name": "skip_cos_kms_auth_policy",
"value": true
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "existing_kms_instance_crn",
Expand All @@ -533,25 +537,21 @@
"value": "private"
},
{
"name": "resource_group_name",
"name": "existing_resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"value": true
},
{
"name": "region",
"value": "ref:../../inputs/en_region"
}
],
"name": "4 - Event Notifications",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa8ebdf4-db44-4e25-9846-9278b516cd73-global"
},
{
"inputs": [
{
"name": "resource_group_name",
"name": "existing_resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
Expand Down Expand Up @@ -584,7 +584,7 @@
}
],
"name": "5 - Secrets Manager",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3d0da0a9-0327-44fc-8796-edf8e0017e25-global"
},
{
"name": "6 - DevSecOps Toolchains",
Expand Down Expand Up @@ -628,7 +628,7 @@
},
{
"name": "enable_cos",
"value" : "true"
"value" : true
},
{
"name" : "cos_bucket_name",
Expand Down
40 changes: 20 additions & 20 deletions stack_definition.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,15 +426,11 @@
{
"inputs": [
{
"name": "resource_group_name",
"name": "existing_resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"value": true
},
{
"name": "cos_instance_name",
"name": "instance_name",
"value": "evidence"
},
{
Expand All @@ -443,9 +439,9 @@
}
],
"name": "2 - Cloud Object Storage",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fef2dae0-dc1a-4e7f-a663-dba29dfbc01a-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.30851389-2ab5-4be5-8674-7ef756cb372d-global"
},
{
{
"inputs": [
{
"name": "bucket_name",
Expand Down Expand Up @@ -475,15 +471,23 @@
"inputs": [
{
"name": "existing_cos_instance_crn",
"value": "ref:../../members/3 - Cloud Object Bucket/outputs/cos_instance_id"
"value": "ref:../../members/2 - Cloud Object Storage/outputs/cos_instance_id"
},
{
"name": "enable_collecting_failed_events",
"value": true
},
{
"name": "kms_encryption_enabled",
"value": true
},
{
"name": "kms_endpoint_url",
"value": "ref:../../members/1 - Key Management/outputs/kms_private_endpoint"
},
{
"name": "skip_cos_kms_auth_policy",
"value": true
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "existing_kms_instance_crn",
Expand All @@ -494,25 +498,21 @@
"value": "private"
},
{
"name": "resource_group_name",
"name": "existing_resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
"name": "use_existing_resource_group",
"value": true
},
{
"name": "region",
"value": "ref:../../inputs/en_region"
}
],
"name": "4 - Event Notifications",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.88d7308d-c2c8-4977-92cf-f85d99e27d00-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.fa8ebdf4-db44-4e25-9846-9278b516cd73-global"
},
{
"inputs": [
{
"name": "resource_group_name",
"name": "existing_resource_group_name",
"value": "ref:../../members/1 - Key Management/outputs/resource_group_name"
},
{
Expand Down Expand Up @@ -545,7 +545,7 @@
}
],
"name": "5 - Secrets Manager",
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.4e7a383f-6295-4edc-b29f-858d28862e6d-global"
"version_locator": "7a4d68b4-cf8b-40cd-a3d1-f49aff526eb3.3d0da0a9-0327-44fc-8796-edf8e0017e25-global"
},
{
"name": "6 - DevSecOps Toolchains",
Expand Down Expand Up @@ -589,7 +589,7 @@
},
{
"name": "enable_cos",
"value" : "true"
"value" : true
},
{
"name": "cos_bucket_name",
Expand Down
17 changes: 9 additions & 8 deletions tests/pr_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,16 @@ func TestProjectsFullTest(t *testing.T) {

options.StackMemberInputs = map[string]map[string]interface{}{
"5 - Secrets Manager": {
"resource_group_name": "default",
"existing_resource_group_name": "default",
"existing_secrets_manager_instance_crn": permanentResources["secretsManagerCRN"],
},
"7 - DevSecOps Toolchains": {
"autostart": "false",
"create_cos_api_key": "false",
"create_secret_group": "false",
"create_signing_key": "false",
"create_ibmcloud_api_key": "false",
"6 - DevSecOps Toolchains": {
"autostart": false,
"create_cos_api_key": false,
"create_secret_group": false,
"create_signing_key": false,
"create_ibmcloud_api_key": false,
"enable_cos": false,
},
}

Expand All @@ -59,7 +60,7 @@ func TestProjectsFullTest(t *testing.T) {
"use_existing_resource_group": "true",
"create_cd_instance": false,
"region": "us-south",
"enable_cos": "false",
"enable_cos": false,
"existing_secrets_manager_crn": permanentResources["secretsManagerCRN"],
"ibmcloud_api_key": options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], // always required by the stack
"app_repo_existing_url": "https://us-south.git.cloud.ibm.com/padraic.edwards/hello-compliance-app-app-repo",
Expand Down