From 75d7c40fcb7fa826c358625eef64ea6d43087bed Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Mon, 3 Dec 2018 22:58:39 -0800 Subject: [PATCH] Better DynamoDB configuration --- pkg/storage/dynamo.go | 14 ++------------ pkg/storage/dynamo_test.go | 5 ++++- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/pkg/storage/dynamo.go b/pkg/storage/dynamo.go index 71ae560..ae87387 100644 --- a/pkg/storage/dynamo.go +++ b/pkg/storage/dynamo.go @@ -19,8 +19,6 @@ import ( ) const ( - defaultRegion = "us-east-1" - pingTimeout = 5 * time.Second pledgesPrimaryKey = "PatronID" feedsPrimaryKey = "HashID" @@ -61,16 +59,8 @@ type Dynamo struct { dynamo *dynamodb.DynamoDB } -func NewDynamo(region, endpoint string) (Dynamo, error) { - if region == "" { - region = defaultRegion - } - - sess, err := session.NewSession(&aws.Config{ - Region: aws.String(region), - Endpoint: aws.String(endpoint), - }) - +func NewDynamo(cfg ...*aws.Config) (Dynamo, error) { + sess, err := session.NewSession(cfg...) if err != nil { return Dynamo{}, err } diff --git a/pkg/storage/dynamo_test.go b/pkg/storage/dynamo_test.go index 91d6a1c..f3d20bf 100644 --- a/pkg/storage/dynamo_test.go +++ b/pkg/storage/dynamo_test.go @@ -15,7 +15,10 @@ func TestDynamo(t *testing.T) { // docker run -it --rm -p 8000:8000 amazon/dynamodb-local // noinspection ALL func createDynamo(t *testing.T) storage { - d, err := NewDynamo("", "http://localhost:8000/") + d, err := NewDynamo(&aws.Config{ + Region: aws.String("us-east-1"), + Endpoint: aws.String("http://localhost:8000/"), + }) require.NoError(t, err) d.dynamo.DeleteTable(&dynamodb.DeleteTableInput{TableName: pledgesTableName})