Skip to content

Commit

Permalink
support static creds
Browse files Browse the repository at this point in the history
  • Loading branch information
dwallach1 committed Oct 5, 2022
1 parent 84c9a64 commit 7f42d3e
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 5 deletions.
13 changes: 8 additions & 5 deletions sqs/sqs.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"os"

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/sqs"
"github.com/serendipity-xyz/common/types"
Expand All @@ -26,14 +27,16 @@ type ClientParams struct {
}

func NewClient(params *ClientParams) (*Client, error) {
if e := os.Getenv("AWS_ACCESS_KEY_ID"); e == "" {
return nil, errors.New("no access key set on env.. set AWS_ACCESS_KEY_ID environment variable")
if e := os.Getenv("AWS_ACCESS_KEY_ID"); e == "" && params.AccessKey == "" {
return nil, errors.New("no access key.. set AWS_ACCESS_KEY_ID environment variable")
}
if e := os.Getenv("AWS_SECRET_ACCESS_KEY"); e == "" {
return nil, errors.New("no access key set on env.. set AWS_SECRET_ACCESS_KEY environment variable")
if e := os.Getenv("AWS_SECRET_ACCESS_KEY"); e == "" && params.AccessSecret == "" {
return nil, errors.New("no access key.. set AWS_SECRET_ACCESS_KEY environment variable")
}
creds := credentials.NewStaticCredentials(params.AccessKey, params.AccessSecret, "")
sess := session.Must(session.NewSession(&aws.Config{
Region: aws.String(params.Region),
Credentials: creds,
Region: aws.String(params.Region),
}))
sqsClient := sqs.New(sess)
result, err := sqsClient.GetQueueUrl(&sqs.GetQueueUrlInput{
Expand Down
18 changes: 18 additions & 0 deletions sqs/sqs_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package sqs_test

import (
"testing"

"github.com/serendipity-xyz/common/sqs"
"github.com/stretchr/testify/require"
)

func TestInit(t *testing.T) {
_, err := sqs.NewClient(&sqs.ClientParams{
Region: "us-east-1",
AccessKey: "",
AccessSecret: "aaa",
QueueName: "test",
})
require.NotNil(t, err, "there should be an err if no access key")
}

0 comments on commit 7f42d3e

Please sign in to comment.