Skip to content

Commit 441d0f0

Browse files
committed
chore(container): filterSecretEnvsToPatch is private
1 parent 78d3157 commit 441d0f0

File tree

4 files changed

+33
-26
lines changed

4 files changed

+33
-26
lines changed

internal/services/container/container.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ func ResourceContainerUpdate(ctx context.Context, d *schema.ResourceData, m inte
397397

398398
if d.HasChanges("secret_environment_variables") {
399399
oldEnv, newEnv := d.GetChange("secret_environment_variables")
400-
req.SecretEnvironmentVariables = FilterSecretEnvsToPatch(expandContainerSecrets(oldEnv), expandContainerSecrets(newEnv))
400+
req.SecretEnvironmentVariables = filterSecretEnvsToPatch(expandContainerSecrets(oldEnv), expandContainerSecrets(newEnv))
401401
}
402402

403403
if d.HasChanges("min_scale") {

internal/services/container/container_test.go

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/scaleway/terraform-provider-scaleway/v2/internal/httperrors"
1414
"github.com/scaleway/terraform-provider-scaleway/v2/internal/services/container"
1515
containerchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/container/testfuncs"
16-
"github.com/stretchr/testify/assert"
1716
)
1817

1918
func TestAccContainer_Basic(t *testing.T) {
@@ -629,26 +628,3 @@ func passwordMatchHash(parent string, key string, password string) resource.Test
629628
return nil
630629
}
631630
}
632-
633-
func TestFilterSecretEnvsToPatch(t *testing.T) {
634-
testSecret := "test_secret"
635-
secretToDelete := "secret_to_delete"
636-
updatedSecret := "updated_secret"
637-
newSecret := "new_secret"
638-
639-
oldEnv := []*containerSDK.Secret{
640-
{Key: testSecret, Value: &testSecret},
641-
{Key: secretToDelete, Value: &secretToDelete},
642-
}
643-
newEnv := []*containerSDK.Secret{
644-
{Key: testSecret, Value: &updatedSecret},
645-
{Key: newSecret, Value: &newSecret},
646-
}
647-
648-
toPatch := container.FilterSecretEnvsToPatch(oldEnv, newEnv)
649-
assert.Equal(t, []*containerSDK.Secret{
650-
{Key: testSecret, Value: &updatedSecret},
651-
{Key: newSecret, Value: &newSecret},
652-
{Key: secretToDelete, Value: nil},
653-
}, toPatch)
654-
}

internal/services/container/helpers_container.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ func retryCreateContainerDomain(ctx context.Context, containerAPI *container.API
373373
}
374374
}
375375

376-
func FilterSecretEnvsToPatch(oldEnv []*container.Secret, newEnv []*container.Secret) []*container.Secret {
376+
func filterSecretEnvsToPatch(oldEnv []*container.Secret, newEnv []*container.Secret) []*container.Secret {
377377
toPatch := []*container.Secret{}
378378
// create and update - ignore hashed values
379379
for _, env := range newEnv {
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package container
2+
3+
import (
4+
"testing"
5+
6+
containerSDK "github.com/scaleway/scaleway-sdk-go/api/container/v1beta1"
7+
"github.com/stretchr/testify/assert"
8+
)
9+
10+
func TestFilterSecretEnvsToPatch(t *testing.T) {
11+
testSecret := "test_secret"
12+
secretToDelete := "secret_to_delete"
13+
updatedSecret := "updated_secret"
14+
newSecret := "new_secret"
15+
16+
oldEnv := []*containerSDK.Secret{
17+
{Key: testSecret, Value: &testSecret},
18+
{Key: secretToDelete, Value: &secretToDelete},
19+
}
20+
newEnv := []*containerSDK.Secret{
21+
{Key: testSecret, Value: &updatedSecret},
22+
{Key: newSecret, Value: &newSecret},
23+
}
24+
25+
toPatch := filterSecretEnvsToPatch(oldEnv, newEnv)
26+
assert.Equal(t, []*containerSDK.Secret{
27+
{Key: testSecret, Value: &updatedSecret},
28+
{Key: newSecret, Value: &newSecret},
29+
{Key: secretToDelete, Value: nil},
30+
}, toPatch)
31+
}

0 commit comments

Comments
 (0)