|
6 | 6 | package secretsmanager |
7 | 7 |
|
8 | 8 | import ( |
| 9 | + "context" |
9 | 10 | "encoding/json" |
10 | 11 | "errors" |
11 | 12 | "fmt" |
12 | 13 | "strconv" |
13 | 14 |
|
14 | | - "github.com/aws/aws-sdk-go/aws" |
15 | | - "github.com/aws/aws-sdk-go/aws/session" |
16 | | - "github.com/aws/aws-sdk-go/service/secretsmanager" |
17 | | - "github.com/aws/aws-sdk-go/service/secretsmanager/secretsmanageriface" |
| 15 | + "github.com/aws/aws-sdk-go-v2/aws" |
| 16 | + "github.com/aws/aws-sdk-go-v2/config" |
| 17 | + "github.com/aws/aws-sdk-go-v2/service/secretsmanager" |
18 | 18 | ) |
19 | 19 |
|
| 20 | +// SecretsManagerAPI defines the interface for AWS Secrets Manager operations |
| 21 | +type SecretsManagerAPI interface { |
| 22 | + GetSecretValue(ctx context.Context, params *secretsmanager.GetSecretValueInput, optFns ...func(*secretsmanager.Options)) (*secretsmanager.GetSecretValueOutput, error) |
| 23 | +} |
| 24 | + |
20 | 25 | // Client represents an AWS Secrets Manager client |
21 | 26 | type Client struct { |
22 | 27 | config *AWSConfig |
23 | | - api secretsmanageriface.SecretsManagerAPI |
| 28 | + api SecretsManagerAPI |
24 | 29 | } |
25 | 30 |
|
26 | | -// New creates an AWS Session Manager Client |
| 31 | +// New creates an AWS Secrets Manager Client |
27 | 32 | func New(config *AWSConfig) *Client { |
28 | 33 | c := &Client{ |
29 | 34 | config: config, |
30 | 35 | } |
31 | 36 |
|
32 | | - s := c.newSession(config) |
33 | | - c.api = secretsmanager.New(s) |
| 37 | + cfg := c.loadConfig(config) |
| 38 | + c.api = secretsmanager.NewFromConfig(cfg) |
34 | 39 | return c |
35 | 40 | } |
36 | 41 |
|
37 | | -func (c *Client) newSession(config *AWSConfig) *session.Session { |
38 | | - // Initialize config with error verbosity |
39 | | - sessConfig := aws.NewConfig().WithCredentialsChainVerboseErrors(true) |
| 42 | +func (c *Client) loadConfig(awsConfig *AWSConfig) aws.Config { |
| 43 | + ctx := context.Background() |
| 44 | + |
| 45 | + var opts []func(*config.LoadOptions) error |
40 | 46 |
|
41 | | - if config.Region != "" { |
42 | | - sessConfig = sessConfig.WithRegion(config.Region) |
| 47 | + if awsConfig.Region != "" { |
| 48 | + opts = append(opts, config.WithRegion(awsConfig.Region)) |
43 | 49 | } |
44 | 50 |
|
45 | | - opts := session.Options{ |
46 | | - SharedConfigState: session.SharedConfigEnable, |
47 | | - Config: *sessConfig, |
| 51 | + cfg, err := config.LoadDefaultConfig(ctx, opts...) |
| 52 | + if err != nil { |
| 53 | + // In v1, session.Must would panic on error, maintaining same behavior |
| 54 | + panic(fmt.Sprintf("failed to load AWS config: %v", err)) |
48 | 55 | } |
49 | 56 |
|
50 | | - return session.Must(session.NewSessionWithOptions(opts)) |
| 57 | + return cfg |
51 | 58 | } |
52 | 59 |
|
53 | 60 | // GetSecret return an AWS Secret Manager secret |
54 | 61 | // in plain text from a given secret name |
55 | 62 | func (c *Client) GetSecret(spec *SecretSpec, raw bool) (string, error) { |
| 63 | + ctx := context.Background() |
| 64 | + |
56 | 65 | params := &secretsmanager.GetSecretValueInput{ |
57 | | - SecretId: aws.String(spec.Name), |
| 66 | + SecretId: &spec.Name, |
58 | 67 | VersionStage: aws.String("AWSCURRENT"), |
59 | 68 | } |
60 | 69 |
|
61 | | - resp, err := c.api.GetSecretValue(params) |
| 70 | + resp, err := c.api.GetSecretValue(ctx, params) |
62 | 71 | if err != nil { |
63 | 72 | return "", err |
64 | 73 | } |
65 | 74 |
|
66 | | - if resp.SecretString == nil { |
| 75 | + if resp == nil || resp.SecretString == nil { |
67 | 76 | return "", errors.New("Secret is not string") |
68 | 77 | } |
69 | 78 |
|
|
0 commit comments