Merge pull request #219 from batchcorp/blinktag/aws_creds

Support profiles for AWS credentials

backends/awskinesis/awskinesis.go

@@ -40,10 +40,22 @@ func New(connOpts *opts.ConnectionOptions) (*Kinesis, error) {
 
 	connArgs := connOpts.GetAwsKinesis()
 
-	sess, err := session.NewSession(&aws.Config{
-		Region:      aws.String(connArgs.AwsRegion),
-		Credentials: credentials.NewStaticCredentials(connArgs.AwsAccessKeyId, connArgs.AwsSecretAccessKey, ""),
-	})
+	var sess *session.Session
+	var err error
+
+	if connArgs.AwsSecretAccessKey != "" {
+		sess, err = session.NewSession(&aws.Config{
+			Region:      aws.String(connArgs.AwsRegion),
+			Credentials: credentials.NewStaticCredentials(connArgs.AwsAccessKeyId, connArgs.AwsSecretAccessKey, ""),
+		})
+	} else {
+		// Use creds stored in ~/.aws/credentials
+		// https://github.com/batchcorp/plumber/issues/218
+		sess = session.Must(session.NewSessionWithOptions(session.Options{
+			SharedConfigState: session.SharedConfigEnable,
+		}))
+	}
+
 	if err != nil {
 		return nil, errors.Wrap(err, "unable to initialize aws session")
 	}
@@ -82,6 +94,12 @@ func validateBaseConnOpts(connOpts *opts.ConnectionOptions) error {
 		return validate.ErrMissingConnArgs
 	}
 
+	// No need to go further, if profile is set, assume we don't need other args
+	// AWS SDK will pick up the profile creds from ~/.aws/credentials
+	if args.AwsProfile != "" {
+		return nil
+	}
+
 	if args.AwsSecretAccessKey == "" {
 		return validate.ErrMissingAWSSecretAccessKey
 	}

backends/awssns/awssns.go

@@ -42,10 +42,22 @@ func New(connOpts *opts.ConnectionOptions) (*AWSSNS, error) {
 
 	connArgs := connOpts.GetAwsSns()
 
-	sess, err := session.NewSession(&aws.Config{
-		Region:      aws.String(connArgs.AwsRegion),
-		Credentials: credentials.NewStaticCredentials(connArgs.AwsAccessKeyId, connArgs.AwsSecretAccessKey, ""),
-	})
+	var sess *session.Session
+	var err error
+
+	if connArgs.AwsSecretAccessKey != "" {
+		sess, err = session.NewSession(&aws.Config{
+			Region:      aws.String(connArgs.AwsRegion),
+			Credentials: credentials.NewStaticCredentials(connArgs.AwsAccessKeyId, connArgs.AwsSecretAccessKey, ""),
+		})
+	} else {
+		// Use creds stored in ~/.aws/credentials
+		// https://github.com/batchcorp/plumber/issues/218
+		sess = session.Must(session.NewSessionWithOptions(session.Options{
+			SharedConfigState: session.SharedConfigEnable,
+		}))
+	}
+
 	if err != nil {
 		return nil, errors.Wrap(err, "unable to initialize aws session")
 	}
@@ -85,6 +97,12 @@ func validateBaseConnOpts(connOpts *opts.ConnectionOptions) error {
 		return validate.ErrMissingConnArgs
 	}
 
+	// No need to go further, if profile is set, assume we don't need other args
+	// AWS SDK will pick up the profile creds from ~/.aws/credentials
+	if args.AwsProfile != "" {
+		return nil
+	}
+
 	if args.AwsSecretAccessKey == "" {
 		return validate.ErrMissingAWSSecretAccessKey
 	}

backends/awssqs/awssqs.go

@@ -5,6 +5,7 @@ import (
 
 	"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/aws/aws-sdk-go/service/sqs/sqsiface"
@@ -44,10 +45,22 @@ func New(connOpts *opts.ConnectionOptions) (*AWSSQS, error) {
 
 	connArgs := connOpts.GetAwsSqs()
 
-	sess, err := session.NewSession(&aws.Config{
-		Region:      aws.String(connArgs.AwsRegion),
-		Credentials: credentials.NewStaticCredentials(connArgs.AwsAccessKeyId, connArgs.AwsSecretAccessKey, ""),
-	})
+	var sess *session.Session
+	var err error
+
+	if connArgs.AwsSecretAccessKey != "" {
+		sess, err = session.NewSession(&aws.Config{
+			Region:      aws.String(connArgs.AwsRegion),
+			Credentials: credentials.NewStaticCredentials(connArgs.AwsAccessKeyId, connArgs.AwsSecretAccessKey, ""),
+		})
+	} else {
+		// Use creds stored in ~/.aws/credentials
+		// https://github.com/batchcorp/plumber/issues/218
+		sess = session.Must(session.NewSessionWithOptions(session.Options{
+			SharedConfigState: session.SharedConfigEnable,
+		}))
+	}
+
 	if err != nil {
 		return nil, errors.Wrap(err, "unable to initialize aws session")
 	}
@@ -90,6 +103,12 @@ func validateBaseConnOpts(connOpts *opts.ConnectionOptions) error {
 		return validate.ErrMissingConnArgs
 	}
 
+	// No need to go further, if profile is set, assume we don't need other args
+	// AWS SDK will pick up the profile creds from ~/.aws/credentials
+	if args.AwsProfile != "" {
+		return nil
+	}
+
 	if args.AwsSecretAccessKey == "" {
 		return validate.ErrMissingAWSSecretAccessKey
 	}

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/batchcorp/collector-schemas v0.0.5
 	github.com/batchcorp/kong v0.2.17-batch-fix
 	github.com/batchcorp/pgoutput v0.3.2
-	github.com/batchcorp/plumber-schemas v0.0.122
+	github.com/batchcorp/plumber-schemas v0.0.123
 	github.com/batchcorp/rabbit v0.1.17
 	github.com/eclipse/paho.mqtt.golang v1.2.0
 	github.com/fatih/color v1.12.0 // indirect

go.sum

@@ -222,6 +222,8 @@ github.com/batchcorp/plumber-schemas v0.0.121 h1:nxdlIk18BPrloSpcu6NXibPw+zb3VHa
 github.com/batchcorp/plumber-schemas v0.0.121/go.mod h1:YULMKnfZ8X7tglTfUzKXhWc1Bfq6dy5ysIQbvsbCOkY=
 github.com/batchcorp/plumber-schemas v0.0.122 h1:oC8QJtie6b7SAegBWt1xDllCj87gNXoJ0a8rC3tJyWI=
 github.com/batchcorp/plumber-schemas v0.0.122/go.mod h1:YULMKnfZ8X7tglTfUzKXhWc1Bfq6dy5ysIQbvsbCOkY=
+github.com/batchcorp/plumber-schemas v0.0.123 h1:5/cq83sHWPZeO2QBlSSmWSmIe6RE6nDwV8E3Obu8RrY=
+github.com/batchcorp/plumber-schemas v0.0.123/go.mod h1:YULMKnfZ8X7tglTfUzKXhWc1Bfq6dy5ysIQbvsbCOkY=
 github.com/batchcorp/rabbit v0.1.9 h1:BzQStzeo0WuvC7+PKYaEBYtn9qqramlaZCN1CxmNM6U=
 github.com/batchcorp/rabbit v0.1.9/go.mod h1:LaAQ6FCNkir0/SbJ9jX3JNNP1ULAU2M3QZN/IwFRwXw=
 github.com/batchcorp/rabbit v0.1.16 h1:TqyToURClYCPNiBzMOF0Cj87X1i9vLLZn0nG8PzawcE=