Skip to content

Commit 2159aa4

Browse files
authored
fix(deps): update DA dependencies (#278)
1 parent 276fc72 commit 2159aa4

File tree

4 files changed

+86
-9
lines changed

4 files changed

+86
-9
lines changed

ibm_catalog.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@
311311
"name": "deploy-arch-ibm-secrets-manager",
312312
"description": "Configure Secrets Manager to deploy public certificates engine.",
313313
"id": "6d6ebc76-7bbd-42f5-8bc7-78f4fabd5944-global",
314-
"version": "v2.8.6",
314+
"version": "v2.10.0",
315315
"flavors": [
316316
"fully-configurable"
317317
],

tests/go.mod

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@ toolchain go1.25.1
77
require (
88
github.com/gruntwork-io/terratest v0.50.0
99
github.com/stretchr/testify v1.11.1
10-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.6
10+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.9
11+
)
12+
13+
require (
14+
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
15+
gopkg.in/go-playground/validator.v9 v9.31.0 // indirect
1116
)
1217

1318
require (
1419
dario.cat/mergo v1.0.0 // indirect
1520
github.com/IBM-Cloud/bluemix-go v0.0.0-20240719075425-078fcb3a55be // indirect
1621
github.com/IBM-Cloud/power-go-client v1.12.0 // indirect
1722
github.com/IBM/cloud-databases-go-sdk v0.8.0 // indirect
23+
github.com/IBM/go-sdk-core v1.1.0
1824
github.com/IBM/go-sdk-core/v5 v5.21.0 // indirect
1925
github.com/IBM/platform-services-go-sdk v0.86.1 // indirect
2026
github.com/IBM/project-go-sdk v0.3.6 // indirect

tests/go.sum

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ github.com/IBM-Cloud/power-go-client v1.12.0 h1:tF9Mq5GLYHebpzQT6IYB89lIxEST1E9t
66
github.com/IBM-Cloud/power-go-client v1.12.0/go.mod h1:SpTK1ttW8bfMNUVQS8qOEuWn2KOkzaCLyzfze8MG1JE=
77
github.com/IBM/cloud-databases-go-sdk v0.8.0 h1:uMFqhnc/roVTzfCaUsJ23eaHKjChhGpM1F7Mpxik0bo=
88
github.com/IBM/cloud-databases-go-sdk v0.8.0/go.mod h1:JYucI1PdwqbAd8XGdDAchxzxRP7bxOh1zUnseovHKsc=
9+
github.com/IBM/go-sdk-core v1.1.0 h1:pV73lZqr9r1xKb3h08c1uNG3AphwoV5KzUzhS+pfEqY=
10+
github.com/IBM/go-sdk-core v1.1.0/go.mod h1:2pcx9YWsIsZ3I7kH+1amiAkXvLTZtAq9kbxsfXilSoY=
911
github.com/IBM/go-sdk-core/v5 v5.9.2/go.mod h1:YlOwV9LeuclmT/qi/LAK2AsobbAP42veV0j68/rlZsE=
1012
github.com/IBM/go-sdk-core/v5 v5.21.0 h1:DUnYhvC4SoC8T84rx5omnhY3+xcQg/Whyoa3mDPIMkk=
1113
github.com/IBM/go-sdk-core/v5 v5.21.0/go.mod h1:Q3BYO6iDA2zweQPDGbNTtqft5tDcEpm6RTuqMlPcvbw=
@@ -48,6 +50,8 @@ github.com/cyphar/filepath-securejoin v0.4.1/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGL
4850
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4951
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
5052
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
53+
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
54+
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
5155
github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
5256
github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
5357
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
@@ -106,9 +110,11 @@ github.com/go-openapi/validate v0.24.0 h1:LdfDKwNbpB6Vn40xhTdNZAnfLECL81w+VX3Bum
106110
github.com/go-openapi/validate v0.24.0/go.mod h1:iyeX1sEufmv3nPbBdX3ieNviWnOZaJ1+zquzJEf2BAQ=
107111
github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
108112
github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
113+
github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
109114
github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
110115
github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
111116
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
117+
github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
112118
github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
113119
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
114120
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
@@ -193,6 +199,7 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
193199
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
194200
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
195201
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
202+
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
196203
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
197204
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
198205
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
@@ -295,8 +302,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
295302
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
296303
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
297304
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
298-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.6 h1:Tr7AlrQ+s1Nc9VOwB+It8sItnDOXhfXTxKqI2KtdyFA=
299-
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.6/go.mod h1:YBrRYc+5y5Pr9CXmY35lOqTQdlIjA4x4+3iVObXGOCE=
305+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.9 h1:ntigNnXy4Ut6eVMfBUjQ5yoIZR5Rt419+pwfle4MO5c=
306+
github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.9/go.mod h1:YBrRYc+5y5Pr9CXmY35lOqTQdlIjA4x4+3iVObXGOCE=
300307
github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
301308
github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw=
302309
github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=
@@ -509,7 +516,10 @@ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8
509516
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
510517
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
511518
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
519+
gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
512520
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
521+
gopkg.in/go-playground/validator.v9 v9.30.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
522+
gopkg.in/go-playground/validator.v9 v9.31.0 h1:bmXmP2RSNtFES+bn4uYuHT7iJFJv7Vj+an+ZQdDaD1M=
513523
gopkg.in/go-playground/validator.v9 v9.31.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
514524
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
515525
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=

tests/pr_test.go

Lines changed: 66 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@ import (
66
"os"
77
"testing"
88

9+
"github.com/IBM/go-sdk-core/core"
910
"github.com/gruntwork-io/terratest/modules/logger"
1011
"github.com/gruntwork-io/terratest/modules/terraform"
1112
"github.com/stretchr/testify/assert"
13+
"github.com/stretchr/testify/require"
14+
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/cloudinfo"
1215
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/common"
16+
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testaddons"
1317
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testhelper"
1418
"github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper/testschematic"
1519
)
@@ -174,11 +178,11 @@ func TestPlanValidation(t *testing.T) {
174178
options.TerraformOptions.NoColor = true
175179
options.TerraformOptions.Logger = logger.Discard
176180
options.TerraformOptions.Vars = map[string]interface{}{
177-
"prefix": options.Prefix,
178-
"existing_secrets_manager_crn": permanentResources["secretsManagerCRN"],
179-
"acme_letsencrypt_private_key": "PRIVATE_KEY_VALUE", // pragma: allowlist secret
180-
"skip_iam_authorization_policy": true,
181-
"provider_visibility": "public",
181+
"prefix": options.Prefix,
182+
"existing_secrets_manager_crn": permanentResources["secretsManagerCRN"],
183+
"acme_letsencrypt_private_key_secrets_manager_secret_crn": permanentResources["acme_letsencrypt_private_key_secret_crn"], // pragma: allowlist secret
184+
"skip_iam_authorization_policy": true,
185+
"provider_visibility": "public",
182186
}
183187

184188
// Init
@@ -190,3 +194,60 @@ func TestPlanValidation(t *testing.T) {
190194
assert.Nil(t, planErr, "Terraform plan should not error")
191195
assert.NotNil(t, planOutput, "Expected Terraform plan output")
192196
}
197+
198+
func TestSecretManagerDefaultConfiguration(t *testing.T) {
199+
t.Parallel()
200+
201+
options := testaddons.TestAddonsOptionsDefault(&testaddons.TestAddonOptions{
202+
Testing: t,
203+
Prefix: "pbsme",
204+
ResourceGroup: resourceGroup,
205+
OverrideInputMappings: core.BoolPtr(true),
206+
QuietMode: false, // Suppress logs except on failure
207+
})
208+
209+
options.AddonConfig = cloudinfo.NewAddonConfigTerraform(
210+
options.Prefix,
211+
"deploy-arch-secrets-manager-public-cert-engine",
212+
"fully-configurable",
213+
map[string]interface{}{
214+
"prefix": options.Prefix,
215+
"acme_letsencrypt_private_key_secrets_manager_secret_crn": permanentResources["acme_letsencrypt_private_key_secret_crn"], // pragma: allowlist secret
216+
"secrets_manager_region": "eu-de",
217+
"secrets_manager_service_plan": "__NULL__",
218+
"skip_iam_authorization_policy": true,
219+
},
220+
)
221+
222+
options.AddonConfig.Dependencies = []cloudinfo.AddonConfig{
223+
{
224+
OfferingName: "deploy-arch-ibm-secrets-manager",
225+
OfferingFlavor: "fully-configurable",
226+
Inputs: map[string]interface{}{
227+
"existing_secrets_manager_crn": permanentResources["secretsManagerCRN"],
228+
"service_plan": "__NULL__", // no plan value needed when using existing SM
229+
"skip_secrets_manager_iam_auth_policy": true, // since using an existing Secrets Manager instance, attempting to re-create auth policy can cause conflicts if the policy already exists
230+
"secret_groups": []string{}, // passing empty array for secret groups as default value is creating general group and it will cause conflicts as we are using an existing SM
231+
},
232+
Enabled: core.BoolPtr(true),
233+
},
234+
// // Disable target / route creation to prevent hitting quota in account
235+
{
236+
OfferingName: "deploy-arch-ibm-cloud-monitoring",
237+
OfferingFlavor: "fully-configurable",
238+
Inputs: map[string]interface{}{
239+
"enable_metrics_routing_to_cloud_monitoring": false,
240+
},
241+
},
242+
{
243+
OfferingName: "deploy-arch-ibm-activity-tracker",
244+
OfferingFlavor: "fully-configurable",
245+
Inputs: map[string]interface{}{
246+
"enable_activity_tracker_event_routing_to_cloud_logs": false,
247+
},
248+
},
249+
}
250+
251+
err := options.RunAddonTest()
252+
require.NoError(t, err)
253+
}

0 commit comments

Comments
 (0)