From 844782baa6d9d50fb66d791c3f0da1e683f19163 Mon Sep 17 00:00:00 2001 From: Robin Tang Date: Fri, 1 Nov 2024 13:13:18 -0700 Subject: [PATCH] Upgrade Deps + Fix Tests (#530) --- go.mod | 2 +- go.sum | 4 ++-- lib/debezium/converters/time_test.go | 19 ++++--------------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/go.mod b/go.mod index aad0088d..f34f9c23 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/DataDog/datadog-go/v5 v5.5.0 - github.com/artie-labs/transfer v1.27.24 + github.com/artie-labs/transfer v1.27.25 github.com/aws/aws-sdk-go-v2 v1.30.3 github.com/aws/aws-sdk-go-v2/config v1.27.27 github.com/aws/aws-sdk-go-v2/credentials v1.17.27 diff --git a/go.sum b/go.sum index 6bdf9669..5af6445b 100644 --- a/go.sum +++ b/go.sum @@ -98,8 +98,8 @@ github.com/apache/thrift v0.0.0-20181112125854-24918abba929/go.mod h1:cp2SuWMxlE github.com/apache/thrift v0.14.2/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.17.0 h1:cMd2aj52n+8VoAtvSvLn4kDC3aZ6IAkBuqWQ2IDu7wo= github.com/apache/thrift v0.17.0/go.mod h1:OLxhMRJxomX+1I/KUw03qoV3mMz16BwaKI+d4fPBx7Q= -github.com/artie-labs/transfer v1.27.24 h1:GjWnm3P1FZ8WImCyrQKx0GRGBI0tBdce0p/eoodluLM= -github.com/artie-labs/transfer v1.27.24/go.mod h1:Lbrj8nz/cCq5BycDR++l3K+kc2GUbEnGRyrVDyA8MfM= +github.com/artie-labs/transfer v1.27.25 h1:uH57j9jYjitCDDl32htowucb30umW38cfhUvha1mDg8= +github.com/artie-labs/transfer v1.27.25/go.mod h1:Lbrj8nz/cCq5BycDR++l3K+kc2GUbEnGRyrVDyA8MfM= github.com/aws/aws-sdk-go v1.30.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go-v2 v1.16.12/go.mod h1:C+Ym0ag2LIghJbXhfXZ0YEEp49rBWowxKzJLUoob0ts= github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY= diff --git a/lib/debezium/converters/time_test.go b/lib/debezium/converters/time_test.go index 9cd12438..f50d8f80 100644 --- a/lib/debezium/converters/time_test.go +++ b/lib/debezium/converters/time_test.go @@ -7,20 +7,10 @@ import ( "github.com/artie-labs/transfer/lib/debezium/converters" "github.com/artie-labs/transfer/lib/typing" - "github.com/artie-labs/transfer/lib/typing/ext" "github.com/stretchr/testify/assert" ) -func parseUsingTransfer(converter ValueConverter, value int64) (*ext.ExtendedTime, error) { - parsedValue, err := converter.ToField("foo").ParseValue(value) - if err != nil { - return nil, err - } - - return typing.AssertType[*ext.ExtendedTime](parsedValue) -} - -func parseUsingTransferNew(converter ValueConverter, value int64) (time.Time, error) { +func parseUsingTransfer(converter ValueConverter, value int64) (time.Time, error) { parsedValue, err := converter.ToField("foo").ParseValue(value) if err != nil { return time.Time{}, err @@ -92,8 +82,7 @@ func TestMicroTimeConverter_Convert(t *testing.T) { assert.NoError(t, err) transferValue, err := parseUsingTransfer(converter, value.(int64)) assert.NoError(t, err) - assert.Equal(t, time.Date(1970, time.January, 1, 1, 2, 3, 0, time.UTC), transferValue.GetTime()) - assert.Equal(t, ext.TimeKindType, transferValue.GetNestedKind().Type) + assert.Equal(t, time.Date(1970, time.January, 1, 1, 2, 3, 0, time.UTC), transferValue) } } @@ -200,7 +189,7 @@ func TestDateConverter_Convert(t *testing.T) { // Transfer parsing value, err := converter.Convert("2023-05-03") assert.NoError(t, err) - transferValue, err := parseUsingTransferNew(converter, int64(value.(int32))) + transferValue, err := parseUsingTransfer(converter, int64(value.(int32))) assert.NoError(t, err) assert.Equal(t, time.Date(2023, time.May, 3, 0, 0, 0, 0, time.UTC), transferValue) } @@ -251,7 +240,7 @@ func TestMicroTimestampConverter_Convert(t *testing.T) { timeValue := time.Date(2001, 2, 3, 4, 5, 0, 0, time.UTC) value, err := converter.Convert(timeValue) assert.NoError(t, err) - transferValue, err := parseUsingTransferNew(converter, value.(int64)) + transferValue, err := parseUsingTransfer(converter, value.(int64)) assert.NoError(t, err) assert.Equal(t, timeValue, transferValue) }