Feature/use default aws credentials #951
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,89 @@ | ||
| package kms | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "github.com/aws/aws-sdk-go-v2/aws" | ||
| "github.com/aws/aws-sdk-go-v2/config" | ||
| "github.com/aws/aws-sdk-go-v2/credentials" | ||
| "github.com/aws/aws-sdk-go-v2/service/kms" | ||
| "github.com/aws/aws-sdk-go-v2/service/secretsmanager" | ||
|
|
||
| "github.com/polygonid/sh-id-platform/internal/log" | ||
| ) | ||
|
|
||
| func LoadAWSConfig(ctx context.Context) (aws.Config, error) { | ||
|
Contributor
There was a problem hiding this comment. Code duplication. Can we put the |
||
| // Backward-compatible behaviour for AWS SDK configuration | ||
| // env variables (DEPRECATED) | ||
| // "ISSUER_KMS_AWS_ACCESS_KEY" | ||
| // "ISSUER_KMS_AWS_SECRET_KEY" | ||
| // "ISSUER_KMS_AWS_REGION" | ||
| accessKey := strings.TrimSpace(os.Getenv("ISSUER_KMS_AWS_ACCESS_KEY")) | ||
| secretKey := strings.TrimSpace(os.Getenv("ISSUER_KMS_AWS_SECRET_KEY")) | ||
| region := strings.TrimSpace(os.Getenv("ISSUER_KMS_AWS_REGION")) | ||
|
|
||
| if accessKey != "" && secretKey != "" { | ||
| log.Info(ctx, "Loading AWS config with static credentials") | ||
|
|
||
| options := []func(*config.LoadOptions) error{ | ||
| config.WithCredentialsProvider( | ||
| credentials.NewStaticCredentialsProvider(accessKey, secretKey, ""), | ||
| ), | ||
| } | ||
|
|
||
| if region != "" { | ||
| options = append(options, config.WithRegion(region)) | ||
| } | ||
|
|
||
| return config.LoadDefaultConfig(ctx, options...) | ||
| } | ||
|
|
||
| log.Info(ctx, "Loading AWS config with default credentials") | ||
|
|
||
| return config.LoadDefaultConfig(ctx) | ||
| } | ||
|
|
||
| func AwsSecretsManager(ctx context.Context) (*secretsmanager.Client, error) { | ||
| cfg, err := LoadAWSConfig(ctx) | ||
|
|
||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to load SDK config, %w", err) | ||
| } | ||
|
|
||
| // LocalStack/OpenStack mode | ||
| // https://docs.localstack.cloud/aws/integrations/aws-sdks/go/ | ||
| // Region is provided from AWS_REGION env variable | ||
| url := strings.TrimSpace(os.Getenv("ISSUER_KMS_AWS_URL")) | ||
| var options []func(*secretsmanager.Options) | ||
| if url != "" { | ||
| options = append(options, func(o *secretsmanager.Options) { | ||
| o.BaseEndpoint = aws.String(url) | ||
| }) | ||
| } | ||
| return secretsmanager.NewFromConfig(cfg, options...), nil | ||
|
Contributor
There was a problem hiding this comment. Possible panic if |
||
| } | ||
|
|
||
| func AwsKms(ctx context.Context) (*kms.Client, error) { | ||
| cfg, err := LoadAWSConfig(ctx) | ||
|
|
||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to load SDK config, %w", err) | ||
| } | ||
|
|
||
| var options []func(*kms.Options) | ||
|
|
||
| // LocalStack/OpenStack mode | ||
| // https://docs.localstack.cloud/aws/integrations/aws-sdks/go/ | ||
| // Region is provided from AWS_REGION env variable | ||
| url := strings.TrimSpace(os.Getenv("ISSUER_KMS_AWS_URL")) | ||
| if url != "" { | ||
| options = append(options, func(o *kms.Options) { | ||
| o.BaseEndpoint = aws.String(url) | ||
| }) | ||
| } | ||
|
|
||
| return kms.NewFromConfig(cfg, options...), nil | ||
|
Contributor
There was a problem hiding this comment. Possible panic if |
||
| } | ||
This file contains hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These changes can brake local setups for users who use envs:
ISSUER_KMS_AWS_ACCESS_KEY,ISSUER_KMS_AWS_SECRET_KEY,ISSUER_KMS_AWS_REGIONThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
AWS_ACCESS_KEY_IDand the others are consumed by AWS lib by default 🤔