-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Prior to this change, the plugin always assumed secrets to be of type `Opaque`. This change introduces the secret type for (de)serialization and adds a small interface that is used to keep the core logic mostly unchanged but handle different types of secrets. Only support for helm was added for now but expanding to more types should be straight-forward Fixes #50
- Loading branch information
Showing
6 changed files
with
184 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "compress/gzip" | ||
| "encoding/base64" | ||
| "fmt" | ||
| "io" | ||
| "strings" | ||
| ) | ||
|
|
||
| type SecretDecoder interface { | ||
| Decode(input string) (string, error) | ||
| } | ||
|
|
||
| func (s Secret) Decode(input string) (string, error) { | ||
| switch s.Type { | ||
| // TODO handle all secret types | ||
| case Opaque: | ||
| b64d, err := base64.StdEncoding.DecodeString(input) | ||
| if err != nil { | ||
| return "", nil | ||
| } | ||
| return string(b64d), nil | ||
| case Helm: | ||
| b64dk8s, _ := base64.StdEncoding.DecodeString(input) | ||
| b64dhelm, _ := base64.StdEncoding.DecodeString(string(b64dk8s)) | ||
|
|
||
| gz, err := gzip.NewReader(strings.NewReader(string(b64dhelm))) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
| defer gz.Close() | ||
|
|
||
| s, err := io.ReadAll(gz) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| return string(s), nil | ||
| } | ||
|
|
||
| return "", fmt.Errorf("couldn't decode unknown secret type %q", s.Type) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "compress/gzip" | ||
| "encoding/base64" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestDecode(t *testing.T) { | ||
| tests := map[string]struct { | ||
| data func() Secret | ||
| want string | ||
| }{ | ||
| // base64 encoded | ||
| "opaque": { | ||
| func() Secret { | ||
| return Secret{ | ||
| Data: map[string]string{ | ||
| "key": "dGVzdAo=", | ||
| }, | ||
| Type: Opaque, | ||
| } | ||
| }, | ||
| "test\n", | ||
| }, | ||
| // double base64 encoded + gzip'd | ||
| "helm": { | ||
| func() Secret { | ||
| res := Secret{ | ||
| Type: Helm, | ||
| } | ||
| var buf bytes.Buffer | ||
| gz := gzip.NewWriter(&buf) | ||
| if _, err := gz.Write([]byte("test\n")); err != nil { | ||
| return res | ||
| } | ||
| if err := gz.Close(); err != nil { | ||
| return res | ||
| } | ||
|
|
||
| b64k8s := base64.StdEncoding.EncodeToString(buf.Bytes()) | ||
| b64helm := base64.StdEncoding.EncodeToString([]byte(b64k8s)) | ||
|
|
||
| res.Data = SecretData{ | ||
| "key": b64helm, | ||
| } | ||
|
|
||
| return res | ||
| }, | ||
| "test\n", | ||
| }, | ||
| } | ||
|
|
||
| for name, tt := range tests { | ||
| t.Run(name, func(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| data := tt.data() | ||
| want := tt.want | ||
|
|
||
| got, err := data.Decode(data.Data["key"]) | ||
| if err != nil { | ||
| t.Errorf("got %v, want %v", got, want) | ||
| } | ||
|
|
||
| assert.Equal(t, tt.want, got) | ||
| }) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters