Skip to content

Commit

Permalink
feat: aws secrets manager: handle Overwrite secret vault on Set
Browse files Browse the repository at this point in the history
  • Loading branch information
slntopp committed Jul 22, 2024
1 parent f7cd077 commit c15ad5c
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 0 deletions.
25 changes: 25 additions & 0 deletions providers-sdk/v1/vault/awssecretsmanager/secretsmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ package awssecretsmanager

import (
"context"
"errors"

"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
"github.com/aws/aws-sdk-go-v2/service/secretsmanager/types"
"github.com/aws/aws-sdk-go/aws/arn"
"github.com/rs/zerolog/log"
"go.mondoo.com/cnquery/v11/providers-sdk/v1/vault"
Expand Down Expand Up @@ -88,6 +90,29 @@ func (v *Vault) Set(ctx context.Context, cred *vault.Secret) (*vault.SecretID, e
SecretBinary: cred.Data,
KmsKeyId: kmsKeyID,
})
if err != nil {
var aerr *types.ResourceExistsException
if errors.As(err, &aerr) {
return v.updateSecret(ctx, cred)
}

return nil, err
}

return &vault.SecretID{Key: *o.ARN}, err
}

func (v *Vault) updateSecret(ctx context.Context, cred *vault.Secret) (*vault.SecretID, error) {
var kmsKeyID *string
if len(v.kmsKeyID) > 0 {
kmsKeyID = &v.kmsKeyID
}

c := secretsmanager.NewFromConfig(v.cfg)
o, err := c.UpdateSecret(ctx, &secretsmanager.UpdateSecretInput{
SecretBinary: cred.Data,
KmsKeyId: kmsKeyID,
})
if err != nil {
return nil, err
}
Expand Down
24 changes: 24 additions & 0 deletions providers-sdk/v1/vault/awssecretsmanager/secretsmanager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,27 @@ func TestAwsSecretsManager(t *testing.T) {
require.NoError(t, err)
assert.Equal(t, cred.Data, get.Data)
}

func TestAwsSecretsManagerOverwrite(t *testing.T) {
ctx := context.Background()
cfg, err := config.LoadDefaultConfig(ctx)
require.NoError(t, err)
v := New(cfg, WithKmsKey("alias/aws/secretsmanager"))

cred := &vault.Secret{
Data: []byte("my-secret-data"),
Key: "mik-test-secret-2",
}
s, err := v.Set(ctx, cred)
require.NoError(t, err)
get, err := v.Get(ctx, &vault.SecretID{Key: s.Key})
require.NoError(t, err)
assert.Equal(t, cred.Data, get.Data)

cred.Data = []byte("my-even-more-secret-data")
s, err = v.Set(ctx, cred)
require.NoError(t, err)
get, err = v.Get(ctx, &vault.SecretID{Key: s.Key})
require.NoError(t, err)
assert.Equal(t, cred.Data, get.Data)
}

0 comments on commit c15ad5c

Please sign in to comment.