Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions common-permanent-resources.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# secrets-manager
secretsManagerCRN: "crn:v1:bluemix:public:secrets-manager:us-south:a/c0dd3c8ded7e90009ef600e2eacc6294:b84f9d33-fb37-4130-882f-0857d11016cf::"
10 changes: 5 additions & 5 deletions ibm_catalog.json
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,8 @@
},
{
"key": "use_existing_resource_group",
"type": "boolean",
"default_value": false,
"type": "string",
"default_value": "false",
"description": "Setting to `true` will treat the `resource_group_name` as an existing resource group. Setting `false` will provision a new resource group based on the value in `resource_group_name`.",
"required": false
},
Expand Down Expand Up @@ -284,7 +284,7 @@
"key": "project_names",
"required": false,
"type": "array",
"default_value": "[\"CI_Project\", \"CD_Project\"]",
"default_value": ["CI_Project", "CD_Project"],
"description": "The names of the projects to add the IBM Cloud Code Engine."
}
],
Expand Down Expand Up @@ -564,8 +564,8 @@
},
{
"key": "use_existing_resource_group",
"type": "boolean",
"default_value": false,
"type": "string",
"default_value": "false",
"description": "Setting to `true` will treat the `resource_group_name` as an existing resource group. Setting `false` will provision a new resource group based on the value in `resource_group_name`.",
"required": false
},
Expand Down
17 changes: 16 additions & 1 deletion stack_definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@
"required": false,
"type": "array",
"hidden": false,
"default": "[\"CI_Project\",\"CD_Project\"]"
"value": [
"CI_Project",
"CD_Project"
]
},
{
"name": "app_repo_branch",
Expand All @@ -150,6 +153,14 @@
"hidden": false,
"default": "",
"required": false
},
{
"name": "existing_secrets_manager_crn",
"required": false,
"type": "string",
"hidden": false,
"default": "__NULL__",
"custom_config": {}
}
],
"members": [
Expand Down Expand Up @@ -279,6 +290,10 @@
"name": "prefix",
"value": "ref:../../inputs/prefix"
},
{
"name": "existing_secrets_manager_crn",
"value": "ref:../../inputs/existing_secrets_manager_crn"
},
{
"name": "existing_kms_instance_crn",
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"
Expand Down
17 changes: 9 additions & 8 deletions tests/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,18 @@ toolchain go1.23.1

require (
github.com/stretchr/testify v1.9.0
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.3
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.41.0
)

require (
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
github.com/IBM-Cloud/power-go-client v1.8.1 // indirect
github.com/IBM/cloud-databases-go-sdk v0.7.0 // indirect
github.com/IBM/go-sdk-core/v5 v5.17.5 // indirect
github.com/IBM/platform-services-go-sdk v0.69.1 // indirect
github.com/IBM/project-go-sdk v0.3.0 // indirect
github.com/IBM/vpc-go-sdk v0.58.0 // indirect
github.com/IBM/platform-services-go-sdk v0.69.2 // indirect
github.com/IBM/project-go-sdk v0.3.6 // indirect
github.com/IBM/schematics-go-sdk v0.3.0 // indirect
github.com/IBM/vpc-go-sdk v0.60.0 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
Expand Down Expand Up @@ -44,7 +45,7 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gruntwork-io/terratest v0.47.1 // indirect
github.com/gruntwork-io/terratest v0.47.2 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
Expand All @@ -64,12 +65,12 @@ require (
go.opentelemetry.io/otel v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
golang.org/x/crypto v0.27.0 // indirect
golang.org/x/crypto v0.28.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/net v0.25.0 // indirect
golang.org/x/sync v0.8.0 // indirect
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/sys v0.26.0 // indirect
golang.org/x/text v0.19.0 // indirect
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading