Skip to content

Commit 03051c6

Browse files
jcasseejcassee
committed
Fixes for sops 3.6.1
Sops 3.6.1 fixes a backward incompatibility with 3.5.
1 parent fc76775 commit 03051c6

File tree

5 files changed

+68
-26
lines changed

5 files changed

+68
-26
lines changed

‎SopsSecretGenerator_test.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func Test_generateSecret(t *testing.T) {
144144
"kustomize.config.k8s.io/behavior": "merge",
145145
},
146146
},
147-
Data: kvMap{"VAR_ENV": b64("'val_env'"), "file.txt": b64("secret\n")},
147+
Data: kvMap{"VAR_ENV": b64("val_env"), "file.txt": b64("secret\n")},
148148
Type: "Oblique",
149149
},
150150
false,
@@ -225,7 +225,7 @@ func Test_parseInput(t *testing.T) {
225225
want kvMap
226226
wantErr bool
227227
}{
228-
{"Input", args{ssg([]string{"testdata/vars.env"}, []string{"testdata/file.txt"})}, kvMap{"VAR_ENV": b64("'val_env'"), "file.txt": b64("secret\n")}, false},
228+
{"Input", args{ssg([]string{"testdata/vars.env"}, []string{"testdata/file.txt"})}, kvMap{"VAR_ENV": b64("val_env"), "file.txt": b64("secret\n")}, false},
229229
{"EnvsError", args{ssg([]string{"testdata/file.txt"}, []string{"testdata/file.txt"})}, nil, true},
230230
{"FilesError", args{ssg([]string{"testdata/vars.env"}, []string{"testdata/missing.txt"})}, nil, true},
231231
}
@@ -253,7 +253,7 @@ func Test_parseEnvSources(t *testing.T) {
253253
want kvMap
254254
wantErr bool
255255
}{
256-
{"Envs", args{[]string{"testdata/vars.env", "testdata/vars.yaml"}}, kvMap{"VAR_ENV": b64("'val_env'"), "VAR_YAML": b64("val_yaml")}, false},
256+
{"Envs", args{[]string{"testdata/vars.env", "testdata/vars.yaml"}}, kvMap{"VAR_ENV": b64("val_env"), "VAR_YAML": b64("val_yaml")}, false},
257257
{"NoEnvs", args{[]string{}}, kvMap{}, false},
258258
{"Error", args{[]string{"testdata/missing.env"}}, kvMap{}, true},
259259
}
@@ -282,7 +282,7 @@ func Test_parseEnvSource(t *testing.T) {
282282
want kvMap
283283
wantErr bool
284284
}{
285-
{"DotEnv", args{"testdata/vars.env"}, kvMap{"VAR_ENV": b64("'val_env'")}, false},
285+
{"DotEnv", args{"testdata/vars.env"}, kvMap{"VAR_ENV": b64("val_env")}, false},
286286
{"YAML", args{"testdata/vars.yaml"}, kvMap{"VAR_YAML": b64("val_yaml")}, false},
287287
{"JSON", args{"testdata/vars.json"}, kvMap{"VAR_JSON": b64("val_json")}, false},
288288
{"Binary", args{"testdata/file.txt"}, kvMap{}, true},
@@ -467,8 +467,7 @@ func Test_parseFileSource(t *testing.T) {
467467
}{
468468
{"Yaml", args{"testdata/file.yaml"}, kvMap{"file.yaml": b64("var: secret\n")}, false},
469469
{"Json", args{"testdata/file.json"}, kvMap{"file.json": b64("{\n\t\"var\": \"secret\"\n}")}, false},
470-
{"Env-3.5", args{"testdata/file-3.5.env"}, kvMap{"file-3.5.env": b64("VAR='secret'\n")}, false},
471-
{"Env-3.6", args{"testdata/file-3.6.env"}, kvMap{"file-3.6.env": b64("VAR='secret'\n")}, false},
470+
{"Env", args{"testdata/file.env"}, kvMap{"file.env": b64("VAR=secret\n")}, false},
472471
{"Ini", args{"testdata/file.ini"}, kvMap{"file.ini": b64("[section]\nvar = secret\n\n")}, false},
473472
{"Binary", args{"testdata/file.txt"}, kvMap{"file.txt": b64("secret\n")}, false},
474473
{"BinaryRenamed", args{"renamed.txt=testdata/file.txt"}, kvMap{"renamed.txt": b64("secret\n")}, false},

‎go.mod

+13-12
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@ module github.com/goabout/kustomize-sopssecretgenerator
33
go 1.13
44

55
require (
6-
cloud.google.com/go v0.62.0 // indirect
7-
github.com/Azure/azure-sdk-for-go v45.0.0+incompatible // indirect
8-
github.com/Azure/go-autorest/autorest v0.11.2 // indirect
9-
github.com/Azure/go-autorest/autorest/azure/auth v0.5.0 // indirect
6+
github.com/Azure/azure-sdk-for-go v46.1.0+incompatible // indirect
7+
github.com/Azure/go-autorest/autorest/azure/auth v0.5.2 // indirect
108
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
119
github.com/Azure/go-autorest/autorest/validation v0.3.0 // indirect
12-
github.com/aws/aws-sdk-go v1.33.18 // indirect
10+
github.com/aws/aws-sdk-go v1.34.23 // indirect
1311
github.com/fatih/color v1.9.0 // indirect
1412
github.com/frankban/quicktest v1.10.0 // indirect
1513
github.com/hashicorp/go-multierror v1.1.0 // indirect
16-
github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
14+
github.com/hashicorp/go-retryablehttp v0.6.7 // indirect
1715
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
1816
github.com/howeyc/gopass v0.0.0-20190910152052-7cb4b85ec19c // indirect
1917
github.com/lib/pq v1.8.0 // indirect
@@ -24,13 +22,16 @@ require (
2422
github.com/pierrec/lz4 v2.5.2+incompatible // indirect
2523
github.com/pkg/errors v0.9.1
2624
github.com/sirupsen/logrus v1.6.0 // indirect
27-
go.mozilla.org/sops/v3 v3.6.0
28-
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de // indirect
29-
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642 // indirect
25+
go.mozilla.org/sops/v3 v3.6.1
26+
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a // indirect
27+
golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
28+
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43 // indirect
29+
golang.org/x/sys v0.0.0-20200915050820-6d893a6b696e // indirect
3030
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect
31-
google.golang.org/genproto v0.0.0-20200731012542-8145dea6a485 // indirect
32-
google.golang.org/grpc v1.31.0 // indirect
33-
gopkg.in/ini.v1 v1.57.0 // indirect
31+
google.golang.org/api v0.31.0 // indirect
32+
google.golang.org/genproto v0.0.0-20200914193844-75d14daec038 // indirect
33+
google.golang.org/grpc v1.32.0 // indirect
34+
gopkg.in/ini.v1 v1.61.0 // indirect
3435
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
3536
gopkg.in/yaml.v2 v2.3.0
3637
)

0 commit comments

Comments
 (0)