error fix

scalescape · Nov 3, 2023 · a40b9a9 · a40b9a9
1 parent cfc1a86
commit a40b9a9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/client/client.go b/client/client.go
@@ -15,7 +15,7 @@ type Client struct {
 	prefix  string
 	ctx     context.Context //nolint:containedctx
 	log     zerolog.Logger
-	KeyFile string
+	keyFile string
 }
 
 type EncryptedConfig struct {
@@ -78,6 +78,10 @@ func (c *Client) GetOrgPublicKeys(env string) (OrgPublicKeys, error) {
 	return OrgPublicKeys{Recipients: recps}, nil
 }
 
+func (c *Client) GetKeyFile() string {
+	return c.keyFile
+}
+
 func New(ctx context.Context, cfg config.Client) (*Client, error) {
 	if err := cfg.Valid(); err != nil {
 		return nil, err
@@ -93,7 +97,7 @@ func New(ctx context.Context, cfg config.Client) (*Client, error) {
 		bucket:  cfg.BucketName(),
 		prefix:  cfg.StoragePrefix,
 		log:     log.With().Str("bucket", cfg.BucketName()).Str("prefix", cfg.StoragePrefix).Logger(),
-		KeyFile: cfg.KeyFile(),
+		keyFile: cfg.KeyFile(),
 	}
 	return cli, nil
 }
diff --git a/client/monart.go b/client/monart.go
@@ -109,6 +109,10 @@ func (s MonartClient) call(req *http.Request, dest any) (*http.Response, error)
 	return resp, nil
 }
 
+func (s MonartClient) GetKeyFile() string {
+	return ""
+}
+
 func NewMonart(ctx context.Context, cfg *config.Monart) MonartClient {
 	cred := credentials{APIToken: cfg.APIToken, ID: cfg.ID}
 	return MonartClient{cli: http.DefaultClient, cred: cred, ctx: ctx}

diff --git a/cmd/dolores/config.go b/cmd/dolores/config.go
@@ -36,7 +36,7 @@ func NewConfig(client GetClient) *ConfigCommand {
 func (c *ConfigCommand) editAction(ctx *cli.Context) error {
 	rcli := c.rcli(ctx.Context)
 	env := ctx.String("environment")
-	ctx.Set("key-file", rcli.KeyFile)
+	ctx.Set("key-file", rcli.GetKeyFile())
 	log := c.log.With().Str("cmd", "config.edit").Str("environment", env).Logger()
 	dcfg, err := parseDecryptConfig(ctx)
 	if err != nil {
@@ -68,7 +68,7 @@ func (c *ConfigCommand) encryptAction(ctx *cli.Context) error {
 func (c *ConfigCommand) decryptAction(ctx *cli.Context) error {
 	rcli := c.rcli(ctx.Context)
 
-	ctx.Set("key-file", rcli.KeyFile)
+	ctx.Set("key-file", rcli.GetKeyFile())
 	req, err := parseDecryptConfig(ctx)
 	if err != nil {
 		return err

diff --git a/cmd/dolores/main.go b/cmd/dolores/main.go
@@ -17,6 +17,7 @@ type secretsClient interface {
 	FetchSecrets(req client.FetchSecretRequest) ([]byte, error)
 	GetOrgPublicKeys(env string) (client.OrgPublicKeys, error)
 	Init(ctx context.Context, bucket string, cfg client.Configuration) error
+	GetKeyFile() string
 }
 
 type CtxKey string