Make AWS service creation a little drier

Author: rowanseymour

aws/config.go

@@ -0,0 +1,22 @@
+package aws
+
+import (
+	"context"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/credentials"
+)
+
+// NewConfig creates a new AWS config with the given credentials and region
+func NewConfig(accessKey, secretKey, region string) (aws.Config, error) {
+	opts := []func(*config.LoadOptions) error{config.WithRegion(region)}
+
+	if accessKey != "" && secretKey != "" {
+		opts = append(opts, config.WithCredentialsProvider(credentials.StaticCredentialsProvider{Value: aws.Credentials{
+			AccessKeyID: accessKey, SecretAccessKey: secretKey,
+		}}))
+	}
+
+	return config.LoadDefaultConfig(context.TODO(), opts...)
+}

aws/cwatch/service.go

@@ -7,10 +7,9 @@ import (
 	"time"
 
 	"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/cloudwatch"
 	"github.com/aws/aws-sdk-go-v2/service/cloudwatch/types"
+	awsx "github.com/nyaruka/gocommon/aws"
 	"github.com/nyaruka/gocommon/syncx"
 )
 
@@ -20,16 +19,9 @@ type Service struct {
 	batcher   *syncx.Batcher[types.MetricDatum]
 }
 
+// NewService creates a new Cloudwatch service with the given credentials and configuration
 func NewService(accessKey, secretKey, region, namespace string, wg *sync.WaitGroup) (*Service, error) {
-	opts := []func(*config.LoadOptions) error{config.WithRegion(region)}
-
-	if accessKey != "" && secretKey != "" {
-		opts = append(opts, config.WithCredentialsProvider(credentials.StaticCredentialsProvider{Value: aws.Credentials{
-			AccessKeyID: accessKey, SecretAccessKey: secretKey,
-		}}))
-	}
-
-	cfg, err := config.LoadDefaultConfig(context.TODO(), opts...)
+	cfg, err := awsx.NewConfig(accessKey, secretKey, region)
 	if err != nil {
 		return nil, err
 	}

aws/dynamo/service.go

@@ -5,10 +5,9 @@ import (
 	"fmt"
 
 	"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/dynamodb"
 	"github.com/aws/aws-sdk-go-v2/service/dynamodb/types"
+	awsx "github.com/nyaruka/gocommon/aws"
 )
 
 // Service is simple abstraction layer to work with a DynamoDB-compatible database
@@ -19,15 +18,7 @@ type Service struct {
 
 // NewService creates a new dynamodb service with the given credentials and configuration
 func NewService(accessKey, secretKey, region, endpoint, tablePrefix string) (*Service, error) {
-	opts := []func(*config.LoadOptions) error{config.WithRegion(region)}
-
-	if accessKey != "" && secretKey != "" {
-		opts = append(opts, config.WithCredentialsProvider(credentials.StaticCredentialsProvider{Value: aws.Credentials{
-			AccessKeyID: accessKey, SecretAccessKey: secretKey,
-		}}))
-	}
-
-	cfg, err := config.LoadDefaultConfig(context.TODO(), opts...)
+	cfg, err := awsx.NewConfig(accessKey, secretKey, region)
 	if err != nil {
 		return nil, err
 	}

aws/s3x/service.go

@@ -9,10 +9,9 @@ import (
 	"time"
 
 	"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/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
+	awsx "github.com/nyaruka/gocommon/aws"
 )
 
 // Service is simple abstraction layer to work with a S3-compatible storage service
@@ -23,15 +22,7 @@ type Service struct {
 
 // NewService creates a new S3 service with the given credentials and configuration
 func NewService(accessKey, secretKey, region, endpoint string, minio bool) (*Service, error) {
-	opts := []func(*config.LoadOptions) error{config.WithRegion(region)}
-
-	if accessKey != "" && secretKey != "" {
-		opts = append(opts, config.WithCredentialsProvider(credentials.StaticCredentialsProvider{Value: aws.Credentials{
-			AccessKeyID: accessKey, SecretAccessKey: secretKey,
-		}}))
-	}
-
-	cfg, err := config.LoadDefaultConfig(context.TODO(), opts...)
+	cfg, err := awsx.NewConfig(accessKey, secretKey, region)
 	if err != nil {
 		return nil, err
 	}