From 94f0b2ae1ee7af5b9139dffdadd7d73d3e02138b Mon Sep 17 00:00:00 2001 From: Harlow Ward Date: Sat, 29 Dec 2018 10:37:24 -0800 Subject: [PATCH] Fix import cycle error for postgres tests --- Gopkg.lock | 52 +++++++++++++++++++--------- checkpoint/postgres/postgres_test.go | 34 ++++++++---------- examples/consumer/cp-dynamo/main.go | 2 +- 3 files changed, 52 insertions(+), 36 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 76fcb47..eb4e2ce 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,15 +2,18 @@ [[projects]] + digest = "1:5bbabe0c3c7e7f524b4c38193b80bf24624e67c0f3a036c4244c85c9a80579fd" name = "github.com/apex/log" packages = [ ".", - "handlers/text" + "handlers/text", ] + pruneopts = "UT" revision = "0296d6eb16bb28f8a0c55668affcf4876dc269be" version = "v1.0.0" [[projects]] + digest = "1:430a0049ba9e5652a778f1bb2a755b456ef8de588d94093f0b02a63cb885fbca" name = "github.com/aws/aws-sdk-go" packages = [ "aws", @@ -46,55 +49,56 @@ "service/dynamodb/dynamodbiface", "service/kinesis", "service/kinesis/kinesisiface", - "service/sts" + "service/sts", ] + pruneopts = "UT" revision = "8475c414b1bd58b8cc214873a8854e3a621e67d7" version = "v1.15.0" [[projects]] + digest = "1:fe8a03a8222d5b913f256972933d26d24ad7c8286692a42943bc01633cc8fce3" name = "github.com/go-ini/ini" packages = ["."] + pruneopts = "UT" revision = "358ee7663966325963d4e8b2e1fbd570c5195153" version = "v1.38.1" [[projects]] - name = "github.com/harlow/kinesis-consumer" - packages = [ - ".", - "checkpoint/ddb", - "checkpoint/postgres", - "checkpoint/redis" - ] - revision = "049445e259a2ab9146364bf60d6f5f71270a125b" - version = "v0.2.0" - -[[projects]] + digest = "1:e22af8c7518e1eab6f2eab2b7d7558927f816262586cd6ed9f349c97a6c285c4" name = "github.com/jmespath/go-jmespath" packages = ["."] + pruneopts = "UT" revision = "0b12d6b5" [[projects]] branch = "master" + digest = "1:37ce7d7d80531b227023331002c0d42b4b4b291a96798c82a049d03a54ba79e4" name = "github.com/lib/pq" packages = [ ".", - "oid" + "oid", ] + pruneopts = "UT" revision = "90697d60dd844d5ef6ff15135d0203f65d2f53b8" [[projects]] + digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" name = "github.com/pkg/errors" packages = ["."] + pruneopts = "UT" revision = "645ef00459ed84a119197bfb8d8205042c6df63d" version = "v0.8.0" [[projects]] + digest = "1:04aea75705cb453e24bf8c1506a24a5a9036537dbc61ddf71d20900d6c7c3ab9" name = "gopkg.in/DATA-DOG/go-sqlmock.v1" packages = ["."] + pruneopts = "UT" revision = "d76b18b42f285b792bf985118980ce9eacea9d10" version = "v1.3.0" [[projects]] + digest = "1:e5a1379b4f0cad2aabd75580598c3b8e19a027e8eed806e7b76b0ec949df4599" name = "gopkg.in/redis.v5" packages = [ ".", @@ -102,14 +106,30 @@ "internal/consistenthash", "internal/hashtag", "internal/pool", - "internal/proto" + "internal/proto", ] + pruneopts = "UT" revision = "a16aeec10ff407b1e7be6dd35797ccf5426ef0f0" version = "v5.2.9" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "2588ee54549a76e93e2e65a289fccd8b636f85b124c5ccb0ab3d5f3529a3cbaa" + input-imports = [ + "github.com/apex/log", + "github.com/apex/log/handlers/text", + "github.com/aws/aws-sdk-go/aws", + "github.com/aws/aws-sdk-go/aws/awserr", + "github.com/aws/aws-sdk-go/aws/session", + "github.com/aws/aws-sdk-go/service/dynamodb", + "github.com/aws/aws-sdk-go/service/dynamodb/dynamodbattribute", + "github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface", + "github.com/aws/aws-sdk-go/service/kinesis", + "github.com/aws/aws-sdk-go/service/kinesis/kinesisiface", + "github.com/lib/pq", + "github.com/pkg/errors", + "gopkg.in/DATA-DOG/go-sqlmock.v1", + "gopkg.in/redis.v5", + ] solver-name = "gps-cdcl" solver-version = 1 diff --git a/checkpoint/postgres/postgres_test.go b/checkpoint/postgres/postgres_test.go index 135fd0d..c6b3bab 100644 --- a/checkpoint/postgres/postgres_test.go +++ b/checkpoint/postgres/postgres_test.go @@ -1,24 +1,20 @@ -package postgres_test +package postgres import ( + "database/sql" + "fmt" "testing" - "time" - "fmt" - - "database/sql" - - "github.com/harlow/kinesis-consumer/checkpoint/postgres" "github.com/pkg/errors" - "gopkg.in/DATA-DOG/go-sqlmock.v1" + sqlmock "gopkg.in/DATA-DOG/go-sqlmock.v1" ) func TestNew(t *testing.T) { appName := "streamConsumer" tableName := "checkpoint" connString := "UserID=root;Password=myPassword;Host=localhost;Port=5432;Database=myDataBase;" - ck, err := postgres.New(appName, tableName, connString) + ck, err := New(appName, tableName, connString) if ck == nil { t.Errorf("expected checkpointer not equal nil, but got %v", ck) @@ -33,7 +29,7 @@ func TestNew_AppNameEmpty(t *testing.T) { appName := "" tableName := "checkpoint" connString := "" - ck, err := postgres.New(appName, tableName, connString) + ck, err := New(appName, tableName, connString) if ck != nil { t.Errorf("expected checkpointer equal nil, but got %v", ck) @@ -47,7 +43,7 @@ func TestNew_TableNameEmpty(t *testing.T) { appName := "streamConsumer" tableName := "" connString := "" - ck, err := postgres.New(appName, tableName, connString) + ck, err := New(appName, tableName, connString) if ck != nil { t.Errorf("expected checkpointer equal nil, but got %v", ck) @@ -62,7 +58,7 @@ func TestNew_WithMaxIntervalOption(t *testing.T) { tableName := "checkpoint" connString := "UserID=root;Password=myPassword;Host=localhost;Port=5432;Database=myDataBase;" maxInterval := time.Second - ck, err := postgres.New(appName, tableName, connString, postgres.WithMaxInterval(maxInterval)) + ck, err := New(appName, tableName, connString, WithMaxInterval(maxInterval)) if ck == nil { t.Errorf("expected checkpointer not equal nil, but got %v", ck) @@ -88,7 +84,7 @@ func TestCheckpoint_Get(t *testing.T) { if err != nil { t.Fatalf("error occurred during the sqlmock creation. cause: %v", err) } - ck, err := postgres.New(appName, tableName, connString, postgres.WithMaxInterval(maxInterval)) + ck, err := New(appName, tableName, connString, WithMaxInterval(maxInterval)) if err != nil { t.Fatalf("error occurred during the checkpoint creation. cause: %v", err) } @@ -127,7 +123,7 @@ func TestCheckpoint_Get_NoRows(t *testing.T) { if err != nil { t.Fatalf("error occurred during the sqlmock creation. cause: %v", err) } - ck, err := postgres.New(appName, tableName, connString, postgres.WithMaxInterval(maxInterval)) + ck, err := New(appName, tableName, connString, WithMaxInterval(maxInterval)) if err != nil { t.Fatalf("error occurred during the checkpoint creation. cause: %v", err) } @@ -163,7 +159,7 @@ func TestCheckpoint_Get_QueryError(t *testing.T) { if err != nil { t.Fatalf("error occurred during the sqlmock creation. cause: %v", err) } - ck, err := postgres.New(appName, tableName, connString, postgres.WithMaxInterval(maxInterval)) + ck, err := New(appName, tableName, connString, WithMaxInterval(maxInterval)) if err != nil { t.Fatalf("error occurred during the checkpoint creation. cause: %v", err) } @@ -196,7 +192,7 @@ func TestCheckpoint_Set(t *testing.T) { shardID := "shardId-00000000" expectedSequenceNumber := "49578481031144599192696750682534686652010819674221576194" maxInterval := time.Second - ck, err := postgres.New(appName, tableName, connString, postgres.WithMaxInterval(maxInterval)) + ck, err := New(appName, tableName, connString, WithMaxInterval(maxInterval)) if err != nil { t.Fatalf("error occurred during the checkpoint creation. cause: %v", err) } @@ -217,7 +213,7 @@ func TestCheckpoint_Set_SequenceNumberEmpty(t *testing.T) { shardID := "shardId-00000000" expectedSequenceNumber := "" maxInterval := time.Second - ck, err := postgres.New(appName, tableName, connString, postgres.WithMaxInterval(maxInterval)) + ck, err := New(appName, tableName, connString, WithMaxInterval(maxInterval)) if err != nil { t.Fatalf("error occurred during the checkpoint creation. cause: %v", err) } @@ -242,7 +238,7 @@ func TestCheckpoint_Shutdown(t *testing.T) { if err != nil { t.Fatalf("error occurred during the sqlmock creation. cause: %v", err) } - ck, err := postgres.New(appName, tableName, connString, postgres.WithMaxInterval(maxInterval)) + ck, err := New(appName, tableName, connString, WithMaxInterval(maxInterval)) if err != nil { t.Fatalf("error occurred during the checkpoint creation. cause: %v", err) } @@ -281,7 +277,7 @@ func TestCheckpoint_Shutdown_SaveError(t *testing.T) { if err != nil { t.Fatalf("error occurred during the sqlmock creation. cause: %v", err) } - ck, err := postgres.New(appName, tableName, connString, postgres.WithMaxInterval(maxInterval)) + ck, err := New(appName, tableName, connString, WithMaxInterval(maxInterval)) if err != nil { t.Fatalf("error occurred during the checkpoint creation. cause: %v", err) } diff --git a/examples/consumer/cp-dynamo/main.go b/examples/consumer/cp-dynamo/main.go index 23a6959..35028ed 100644 --- a/examples/consumer/cp-dynamo/main.go +++ b/examples/consumer/cp-dynamo/main.go @@ -43,7 +43,7 @@ type myLogger struct { // Log logs the parameters to the stdlib logger. See log.Println. func (l *myLogger) Log(args ...interface{}) { - l.logger.Infof("producer", args...) + l.logger.Infof("producer: %v", args...) } func main() {