feat(secretserver): use official secretserver library #930
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,126 +2,85 @@ package secretserver | |
|
|
||
| import ( | ||
| "crypto/tls" | ||
| "fmt" | ||
| "os" | ||
| "strconv" | ||
| "strings" | ||
|
|
||
| tssSdk "github.com/DelineaXPM/tss-sdk-go/v3/server" | ||
|
|
||
| "github.com/helmfile/vals/pkg/api" | ||
|
|
||
| ) | ||
|
|
||
| type provider struct { | ||
| tss tssSdk.Server | ||
| } | ||
|
|
||
| func New(cfg api.StaticConfig) (*provider, error) { | ||
| tss, err := tssSdk.New(tssSdk.Configuration{ | ||
| Credentials: tssSdk.UserCredential{ | ||
| Domain: os.Getenv("TSS_DOMAIN"), | ||
| Username: os.Getenv("TSS_USERNAME"), | ||
| Password: os.Getenv("TSS_PASSWORD"), | ||
| Token: os.Getenv("TSS_TOKEN"), | ||
| }, | ||
| ServerURL: os.Getenv("TSS_SERVER_URL"), | ||
| TLD: os.Getenv("TSS_TLD"), | ||
| Tenant: os.Getenv("TSS_TENANT"), | ||
| TLSClientConfig: &tls.Config{InsecureSkipVerify: cfg.String("ssl_verify") == "false"}, | ||
| }) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &provider{tss: *tss}, nil | ||
| } | ||
|
|
||
| func (p *provider) GetString(key string) (string, error) { | ||
| splits := strings.Split(key, "/") | ||
| if len(splits) != 2 { | ||
| return "", fmt.Errorf("malformed key '%s'", key) | ||
| } | ||
| secretID := splits[0] | ||
| fieldName := splits[1] | ||
|
|
||
| secret, err := p.getSecret(secretID) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| if field, ok := secret.Field(fieldName); ok { | ||
| return field, nil | ||
| } else { | ||
| return "", fmt.Errorf("cannot find field %s in secret %s", fieldName, secretID) | ||
| } | ||
|
Comment on lines
+51
to
55
There was a problem hiding this comment. The else branch is unnecessary after a return statement. The code can be simplified by removing the else and unindenting the error return, which improves readability and follows Go best practices.
Member
There was a problem hiding this comment. @copilot open a new pull request to apply changes based on this feedback |
||
| } | ||
|
|
||
| func (p *provider) GetStringMap(key string) (map[string]interface{}, error) { | ||
| secret, err := p.getSecret(key) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| secretMap := map[string]interface{}{} | ||
| for _, item := range secret.Fields { | ||
| secretMap[item.FieldName] = item.ItemValue | ||
| secretMap[item.Slug] = item.ItemValue | ||
| } | ||
|
|
||
| return secretMap, nil | ||
| } | ||
|
|
||
| func (p *provider) getSecret(key string) (*tssSdk.Secret, error) { | ||
| if i, err := strconv.Atoi(key); err == nil { | ||
| return p.tss.Secret(i) | ||
| } else { | ||
| secrets, err := p.tss.Secrets(key, "Name") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if len(secrets) != 1 { | ||
| return nil, fmt.Errorf("expected exactly one secret with name '%s' but got %d", key, len(secrets)) | ||
| } | ||
| return &secrets[0], nil | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,8 +87,8 @@ func New(l *log.Logger, provider api.StaticConfig, awsLogLevel string) (api.Lazy | |
| return httpjson.New(l, provider), nil | ||
| case "scaleway": | ||
| return scaleway.New(l, provider), nil | ||
|
Member
There was a problem hiding this comment. @pd-gov why change secretserver to tss? this is a beaking change?
Contributor
Author
There was a problem hiding this comment. I tried to align the naming scheme with that used by the vendor. I though this was Okay, since the Provider was introduced just a few days ago.
Contributor
Author
There was a problem hiding this comment. @yxxhero I can change it back if you prefere
Member
There was a problem hiding this comment. @pd-gov maybe we can add alias. like : case "tss" "secretserver"
Contributor
Author
There was a problem hiding this comment. @yxxhero What do you mean by adding notes? In the readme? My assumption was, that no one was actually using the
Member
There was a problem hiding this comment. @pd-gov you are right. so we can use new name. I will add the changes in the release notes.
Contributor
Author
There was a problem hiding this comment. @yxxhero The current version contains your proposed aliases. Should I keep that in for backwards compatibility?
Contributor
Author
There was a problem hiding this comment. @yxxhero Okay, I removed the alias again. |
||
| case "tss": | ||
| return secretserver.New(provider) | ||
| case "infisical": | ||
| return infisical.New(l, provider), nil | ||
| } | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.