From fb749aaee2daf247b94ac9e951e621bb3045ed8e Mon Sep 17 00:00:00 2001 From: Leon Mika Date: Wed, 23 Mar 2022 22:16:34 +1100 Subject: [PATCH] sqs-browse: fixed pad printf and fixed test parallel --- .../providers/dynamo/provider_test.go | 16 ++++++++++------ .../services/tables/service_test.go | 5 +++-- .../sqs-browse/services/pollmessage/service.go | 2 +- test/testdynamo/client.go | 12 ++++++------ 4 files changed, 20 insertions(+), 15 deletions(-) diff --git a/internal/dynamo-browse/providers/dynamo/provider_test.go b/internal/dynamo-browse/providers/dynamo/provider_test.go index d607374..819453a 100644 --- a/internal/dynamo-browse/providers/dynamo/provider_test.go +++ b/internal/dynamo-browse/providers/dynamo/provider_test.go @@ -10,9 +10,10 @@ import ( ) func TestProvider_ScanItems(t *testing.T) { - tableName := "test-table" + tableName := "provider-scanimages-test-table" - client := testdynamo.SetupTestTable(t, tableName, testData) + client, cleanupFn := testdynamo.SetupTestTable(t, tableName, testData) + defer cleanupFn() provider := dynamo.NewProvider(client) t.Run("should return scanned items from the table", func(t *testing.T) { @@ -37,10 +38,11 @@ func TestProvider_ScanItems(t *testing.T) { } func TestProvider_DeleteItem(t *testing.T) { - tableName := "test-table" + tableName := "provider-deleteitem-test-table" t.Run("should delete item if exists in table", func(t *testing.T) { - client := testdynamo.SetupTestTable(t, tableName, testData) + client, cleanupFn := testdynamo.SetupTestTable(t, tableName, testData) + defer cleanupFn() provider := dynamo.NewProvider(client) ctx := context.Background() @@ -61,7 +63,8 @@ func TestProvider_DeleteItem(t *testing.T) { }) t.Run("should do nothing if key does not exist", func(t *testing.T) { - client := testdynamo.SetupTestTable(t, tableName, testData) + client, cleanupFn := testdynamo.SetupTestTable(t, tableName, testData) + defer cleanupFn() provider := dynamo.NewProvider(client) ctx := context.Background() @@ -81,7 +84,8 @@ func TestProvider_DeleteItem(t *testing.T) { }) t.Run("should return error if table name does not exist", func(t *testing.T) { - client := testdynamo.SetupTestTable(t, tableName, testData) + client, cleanupFn := testdynamo.SetupTestTable(t, tableName, testData) + defer cleanupFn() provider := dynamo.NewProvider(client) ctx := context.Background() diff --git a/internal/dynamo-browse/services/tables/service_test.go b/internal/dynamo-browse/services/tables/service_test.go index e7c4ab0..c491fbe 100644 --- a/internal/dynamo-browse/services/tables/service_test.go +++ b/internal/dynamo-browse/services/tables/service_test.go @@ -10,9 +10,10 @@ import ( ) func TestService_Scan(t *testing.T) { - tableName := "test-table" + tableName := "service-scan-test-table" - client := testdynamo.SetupTestTable(t, tableName, testData) + client, cleanupFn := testdynamo.SetupTestTable(t, tableName, testData) + defer cleanupFn() provider := dynamo.NewProvider(client) t.Run("return all columns and fields in sorted order", func(t *testing.T) { diff --git a/internal/sqs-browse/services/pollmessage/service.go b/internal/sqs-browse/services/pollmessage/service.go index 79172b5..99a3669 100644 --- a/internal/sqs-browse/services/pollmessage/service.go +++ b/internal/sqs-browse/services/pollmessage/service.go @@ -34,7 +34,7 @@ func (s *Service) Poll(ctx context.Context) error { for _, msg := range newMsgs { if err := s.store.Save(ctx, msg); err != nil { - log.Println("warn: unable to save new message %v", err) + log.Printf("warn: unable to save new message %v", err) continue } } diff --git a/test/testdynamo/client.go b/test/testdynamo/client.go index 970bd3d..11cb7e1 100644 --- a/test/testdynamo/client.go +++ b/test/testdynamo/client.go @@ -14,7 +14,7 @@ import ( type TestData []map[string]interface{} -func SetupTestTable(t *testing.T, tableName string, testData TestData) *dynamodb.Client { +func SetupTestTable(t *testing.T, tableName string, testData TestData) (*dynamodb.Client, func()) { t.Helper() ctx := context.Background() @@ -26,10 +26,6 @@ func SetupTestTable(t *testing.T, tableName string, testData TestData) *dynamodb dynamoClient := dynamodb.NewFromConfig(cfg, dynamodb.WithEndpointResolver(dynamodb.EndpointResolverFromURL("http://localhost:8000"))) - dynamoClient.DeleteTable(ctx, &dynamodb.DeleteTableInput{ - TableName: aws.String(tableName), - }) - _, err = dynamoClient.CreateTable(ctx, &dynamodb.CreateTableInput{ TableName: aws.String(tableName), KeySchema: []types.KeySchemaElement{ @@ -58,5 +54,9 @@ func SetupTestTable(t *testing.T, tableName string, testData TestData) *dynamodb assert.NoError(t, err) } - return dynamoClient + return dynamoClient, func() { + dynamoClient.DeleteTable(ctx, &dynamodb.DeleteTableInput{ + TableName: aws.String(tableName), + }) + } }