Skip to content

Commit a1edce9

Browse files
chore: fix tests (#63)
* chore: fix tests * chore: update tests * chore: fix default * chore: turn off secret creation
1 parent 9b46e65 commit a1edce9

File tree

6 files changed

+121
-45
lines changed

6 files changed

+121
-45
lines changed

common-permanent-resources.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# secrets-manager
2+
secretsManagerCRN: "crn:v1:bluemix:public:secrets-manager:us-south:a/c0dd3c8ded7e90009ef600e2eacc6294:b84f9d33-fb37-4130-882f-0857d11016cf::"

ibm_catalog.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,8 @@
254254
},
255255
{
256256
"key": "use_existing_resource_group",
257-
"type": "boolean",
258-
"default_value": false,
257+
"type": "string",
258+
"default_value": "false",
259259
"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`.",
260260
"required": false
261261
},
@@ -284,7 +284,7 @@
284284
"key": "project_names",
285285
"required": false,
286286
"type": "array",
287-
"default_value": "[\"CI_Project\", \"CD_Project\"]",
287+
"default_value": ["CI_Project", "CD_Project"],
288288
"description": "The names of the projects to add the IBM Cloud Code Engine."
289289
}
290290
],
@@ -564,8 +564,8 @@
564564
},
565565
{
566566
"key": "use_existing_resource_group",
567-
"type": "boolean",
568-
"default_value": false,
567+
"type": "string",
568+
"default_value": "false",
569569
"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`.",
570570
"required": false
571571
},

stack_definition.json

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,10 @@
135135
"required": false,
136136
"type": "array",
137137
"hidden": false,
138-
"default": "[\"CI_Project\",\"CD_Project\"]"
138+
"value": [
139+
"CI_Project",
140+
"CD_Project"
141+
]
139142
},
140143
{
141144
"name": "app_repo_branch",
@@ -150,6 +153,14 @@
150153
"hidden": false,
151154
"default": "",
152155
"required": false
156+
},
157+
{
158+
"name": "existing_secrets_manager_crn",
159+
"required": false,
160+
"type": "string",
161+
"hidden": false,
162+
"default": "__NULL__",
163+
"custom_config": {}
153164
}
154165
],
155166
"members": [
@@ -279,6 +290,10 @@
279290
"name": "prefix",
280291
"value": "ref:../../inputs/prefix"
281292
},
293+
{
294+
"name": "existing_secrets_manager_crn",
295+
"value": "ref:../../inputs/existing_secrets_manager_crn"
296+
},
282297
{
283298
"name": "existing_kms_instance_crn",
284299
"value": "ref:../../members/1 - Key Management/outputs/kms_instance_crn"

tests/go.mod

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@ toolchain go1.23.1
66

77
require (
88
github.com/stretchr/testify v1.9.0
9-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.38.3
9+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.41.0
1010
)
1111

1212
require (
1313
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
1414
github.com/IBM-Cloud/power-go-client v1.8.1 // indirect
1515
github.com/IBM/cloud-databases-go-sdk v0.7.0 // indirect
1616
github.com/IBM/go-sdk-core/v5 v5.17.5 // indirect
17-
github.com/IBM/platform-services-go-sdk v0.69.1 // indirect
18-
github.com/IBM/project-go-sdk v0.3.0 // indirect
19-
github.com/IBM/vpc-go-sdk v0.58.0 // indirect
17+
github.com/IBM/platform-services-go-sdk v0.69.2 // indirect
18+
github.com/IBM/project-go-sdk v0.3.6 // indirect
19+
github.com/IBM/schematics-go-sdk v0.3.0 // indirect
20+
github.com/IBM/vpc-go-sdk v0.60.0 // indirect
2021
github.com/Microsoft/go-winio v0.6.1 // indirect
2122
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2223
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
@@ -44,7 +45,7 @@ require (
4445
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4546
github.com/google/go-cmp v0.6.0 // indirect
4647
github.com/google/uuid v1.6.0 // indirect
47-
github.com/gruntwork-io/terratest v0.47.1 // indirect
48+
github.com/gruntwork-io/terratest v0.47.2 // indirect
4849
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
4950
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
5051
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
@@ -64,12 +65,12 @@ require (
6465
go.opentelemetry.io/otel v1.16.0 // indirect
6566
go.opentelemetry.io/otel/metric v1.16.0 // indirect
6667
go.opentelemetry.io/otel/trace v1.16.0 // indirect
67-
golang.org/x/crypto v0.27.0 // indirect
68+
golang.org/x/crypto v0.28.0 // indirect
6869
golang.org/x/mod v0.17.0 // indirect
6970
golang.org/x/net v0.25.0 // indirect
7071
golang.org/x/sync v0.8.0 // indirect
71-
golang.org/x/sys v0.25.0 // indirect
72-
golang.org/x/text v0.18.0 // indirect
72+
golang.org/x/sys v0.26.0 // indirect
73+
golang.org/x/text v0.19.0 // indirect
7374
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
7475
gopkg.in/warnings.v0 v0.1.2 // indirect
7576
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)