Skip to content

Commit d89ccb8

Browse files
CodelaxCodelax
committed
feat(container/function): secret env variables customdiff
1 parent 55dffa1 commit d89ccb8

File tree

5 files changed

+98
-0
lines changed

5 files changed

+98
-0
lines changed

‎go.mod‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
module github.com/scaleway/terraform-provider-scaleway/v2
22

33
require (
4+
github.com/alexedwards/argon2id v1.0.0
45
github.com/aws/aws-sdk-go v1.50.9
56
github.com/dnaeon/go-vcr v1.2.0
67
github.com/docker/docker v25.0.2+incompatible

‎go.sum‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 h1:kkhsdkhsCv
88
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0=
99
github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo=
1010
github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
11+
github.com/alexedwards/argon2id v1.0.0 h1:wJzDx66hqWX7siL/SRUmgz3F8YMrd/nfX/xHHcQQP0w=
12+
github.com/alexedwards/argon2id v1.0.0/go.mod h1:tYKkqIjzXvZdzPvADMWOEZ+l6+BD6CtBXMj5fnJppiw=
1113
github.com/apparentlymart/go-textseg/v12 v12.0.0/go.mod h1:S/4uRK2UtaQttw1GenVJEynmyUenKwP++x/+DdGV/Ec=
1214
github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY=
1315
github.com/apparentlymart/go-textseg/v15 v15.0.0/go.mod h1:K8XmNZdhEBkdlyDdvbmmsvpAG721bKi0joRfFdHIWJ4=
@@ -252,6 +254,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
252254
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
253255
golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
254256
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
257+
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
255258
golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
256259
golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
257260
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -271,6 +274,7 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
271274
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
272275
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
273276
golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
277+
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
274278
golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
275279
golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
276280
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -299,13 +303,17 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
299303
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
300304
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
301305
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
306+
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
307+
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
302308
golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
303309
golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
304310
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
305311
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
306312
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
307313
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
308314
golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
315+
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
316+
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
309317
golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
310318
golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
311319
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -316,6 +324,8 @@ golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
316324
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
317325
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
318326
golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
327+
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
328+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
319329
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
320330
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
321331
golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=

‎scaleway/helpers_container.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,3 +219,12 @@ func retryCreateContainerDomain(ctx context.Context, containerAPI *container.API
219219
}
220220
}
221221
}
222+
223+
func flattenContainerSecretEnvironmentVariables(secrets []*container.SecretHashedValue) map[string]any {
224+
m := make(map[string]any, len(secrets))
225+
for _, s := range secrets {
226+
m[s.Key] = s.HashedValue
227+
}
228+
229+
return m
230+
}

‎scaleway/resource_container_namespace.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package scaleway
33
import (
44
"context"
55

6+
"github.com/alexedwards/argon2id"
67
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
78
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
89
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
@@ -61,6 +62,10 @@ func resourceScalewayContainerNamespace() *schema.Resource {
6162
ValidateFunc: validation.StringLenBetween(0, 1000),
6263
},
6364
ValidateDiagFunc: validation.MapKeyLenBetween(0, 100),
65+
DiffSuppressFunc: func(k, oldValue, newValue string, d *schema.ResourceData) bool {
66+
match, _ := argon2id.ComparePasswordAndHash(oldValue, newValue)
67+
return match
68+
},
6469
},
6570
"registry_endpoint": {
6671
Type: schema.TypeString,
@@ -131,6 +136,7 @@ func resourceScalewayContainerNamespaceRead(ctx context.Context, d *schema.Resou
131136

132137
_ = d.Set("description", flattenStringPtr(ns.Description))
133138
_ = d.Set("environment_variables", ns.EnvironmentVariables)
139+
_ = d.Set("secret_environment_variables", flattenContainerSecretEnvironmentVariables(ns.SecretEnvironmentVariables))
134140
_ = d.Set("name", ns.Name)
135141
_ = d.Set("organization_id", ns.OrganizationID)
136142
_ = d.Set("project_id", ns.ProjectID)

‎scaleway/resource_container_namespace_test.go‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,78 @@ func TestAccScalewayContainerNamespace_DestroyRegistry(t *testing.T) {
190190
})
191191
}
192192

193+
func TestAccScalewayContainerNamespace_ImportWithSecrets(t *testing.T) {
194+
tt := NewTestTools(t)
195+
defer tt.Cleanup()
196+
197+
resource.ParallelTest(t, resource.TestCase{
198+
PreCheck: func() { testAccPreCheck(t) },
199+
ProviderFactories: tt.ProviderFactories,
200+
CheckDestroy: resource.ComposeTestCheckFunc(
201+
testAccCheckScalewayContainerNamespaceDestroy(tt),
202+
testAccCheckScalewayContainerRegistryDestroy(tt),
203+
),
204+
Steps: []resource.TestStep{
205+
{
206+
Config: `
207+
resource scaleway_container_namespace main {
208+
name = "test-cr-ns-import-01"
209+
secret_environment_variables = {
210+
foo = "bar"
211+
}
212+
}
213+
`,
214+
Check: resource.ComposeTestCheckFunc(
215+
testAccCheckScalewayContainerNamespaceExists(tt, "scaleway_container_namespace.main"),
216+
testCheckResourceAttrUUID("scaleway_container_namespace.main", "id"),
217+
resource.TestCheckResourceAttr("scaleway_container_namespace.main", "secret_environment_variables.foo", "bar"),
218+
),
219+
},
220+
{
221+
Config: `
222+
resource scaleway_container_namespace main {
223+
name = "test-cr-ns-import-01"
224+
secret_environment_variables = {
225+
foo = "bar"
226+
}
227+
}
228+
229+
resource scaleway_container_namespace import {
230+
name = "test-cr-ns-import-01"
231+
secret_environment_variables = {
232+
foo = "bar"
233+
}
234+
}
235+
`,
236+
ResourceName: "scaleway_container_namespace.import",
237+
ImportState: true,
238+
ImportStatePersist: true,
239+
ImportStateIdFunc: func(state *terraform.State) (string, error) {
240+
return state.RootModule().Resources["scaleway_container_namespace.main"].Primary.ID, nil
241+
},
242+
},
243+
{
244+
Config: `
245+
resource scaleway_container_namespace main {
246+
name = "test-cr-ns-import-01"
247+
secret_environment_variables = {
248+
foo = "bar"
249+
}
250+
}
251+
252+
resource scaleway_container_namespace import {
253+
name = "test-cr-ns-import-01"
254+
secret_environment_variables = {
255+
foo = "bar"
256+
}
257+
}
258+
`,
259+
PlanOnly: true,
260+
},
261+
},
262+
})
263+
}
264+
193265
func testAccCheckScalewayContainerNamespaceExists(tt *TestTools, n string) resource.TestCheckFunc {
194266
return func(state *terraform.State) error {
195267
rs, ok := state.RootModule().Resources[n]

0 commit comments

Comments
 (0)