Merge pull request a8m#1 from achunariov/sdk-v2

AWS SDK v2

README.md

@@ -16,7 +16,7 @@ import (
 	"time"
 
 	"github.com/sirupsen/logrus"
-	"github.com/fhaze/kinesis-producer"
+	"github.com/achunariov/kinesis-producer"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/kinesis"
@@ -72,7 +72,7 @@ package main
 import (
 	"time"
 
-	"github.com/fhaze/kinesis-producer"
+	"github.com/achunariov/kinesis-producer"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/kinesis"
@@ -131,7 +131,7 @@ import (
 	"math/big"
 	"time"
 
-	"github.com/fhaze/kinesis-producer"
+	"github.com/achunariov/kinesis-producer"
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/kinesis"
@@ -223,8 +223,8 @@ customLogger := &CustomLogger{}
 ```go
 import (
 	"github.com/sirupsen/logrus"
-	producer "github.com/fhaze/kinesis-producer"
-	"github.com/fhaze/kinesis-producer/loggers"
+	producer "github.com/achunariov/kinesis-producer"
+	"github.com/achunariov/kinesis-producer/loggers"
 )
 
 log := logrus.New()
@@ -246,12 +246,12 @@ kinesis-producer ships with three logger implementations.
 ### License
 MIT
 
-[godoc-url]: https://godoc.org/github.com/fhaze/kinesis-producer
+[godoc-url]: https://godoc.org/github.com/achunariov/kinesis-producer
 [godoc-img]: https://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square
 [kpl-url]: https://github.com/awslabs/amazon-kinesis-producer
 [de-aggregation]: http://docs.aws.amazon.com/kinesis/latest/dev/kinesis-kpl-consumer-deaggregation.html
 [kpl-aggregation]: http://docs.aws.amazon.com/kinesis/latest/dev/kinesis-producer-adv-aggregation.html
-[aggregation-format-url]: https://github.com/fhaze/kinesis-producer/blob/master/aggregation-format.md
+[aggregation-format-url]: https://github.com/achunariov/kinesis-producer/blob/master/aggregation-format.md
 [license-image]: https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square
 [license-url]: LICENSE
 

aggregator.go

@@ -4,8 +4,8 @@ import (
 	"crypto/md5"
 	"sync"
 
-	k "github.com/aws/aws-sdk-go/service/kinesis"
-	"github.com/fhaze/kinesis-producer/pb"
+	"github.com/achunariov/kinesis-producer/pb"
+	"github.com/aws/aws-sdk-go-v2/service/kinesis/types"
 	"github.com/golang/protobuf/proto"
 )
 
@@ -16,13 +16,13 @@ var (
 // Contains the AWS Kinesis PutRecordsRequestEntry and UserRecords that are aggregated into
 // the request. UserRecords are provided for more control over failure notifications
 type AggregatedRecordRequest struct {
-	Entry       *k.PutRecordsRequestEntry
+	Entry       types.PutRecordsRequestEntry
 	UserRecords []UserRecord
 }
 
 func NewAggregatedRecordRequest(data []byte, partitionKey, explicitHashKey *string, userRecords []UserRecord) *AggregatedRecordRequest {
 	return &AggregatedRecordRequest{
-		Entry: &k.PutRecordsRequestEntry{
+		Entry: types.PutRecordsRequestEntry{
 			Data:            data,
 			PartitionKey:    partitionKey,
 			ExplicitHashKey: explicitHashKey,

aggregator_test.go

@@ -2,11 +2,12 @@ package producer
 
 import (
 	"fmt"
+	"github.com/aws/aws-sdk-go-v2/service/kinesis/types"
 	"strconv"
 	"testing"
 
+	"github.com/achunariov/kinesis-producer/deaggregation"
 	k "github.com/aws/aws-sdk-go/service/kinesis"
-	"github.com/fhaze/kinesis-producer/deaggregation"
 	"github.com/stretchr/testify/require"
 )
 
@@ -119,7 +120,7 @@ func TestAggregation(t *testing.T) {
 	}
 }
 
-func extractRecords(entry *k.PutRecordsRequestEntry) (out []*k.PutRecordsRequestEntry) {
+func extractRecords(entry types.PutRecordsRequestEntry) (out []*k.PutRecordsRequestEntry) {
 	dest, err := deaggregation.Unmarshal(entry.Data)
 	if err != nil {
 		return

config.go

@@ -1,11 +1,13 @@
 package producer
 
 import (
+	"context"
 	"log"
 	"os"
 	"time"
 
-	k "github.com/aws/aws-sdk-go/service/kinesis"
+	k "github.com/aws/aws-sdk-go-v2/service/kinesis"
+	"github.com/aws/aws-sdk-go-v2/service/kinesis/types"
 )
 
 // Constants and default configuration take from:
@@ -24,17 +26,17 @@ const (
 
 // Putter is the interface that wraps the KinesisAPI.PutRecords method.
 type Putter interface {
-	PutRecords(*k.PutRecordsInput) (*k.PutRecordsOutput, error)
+	PutRecords(ctx context.Context, params *k.PutRecordsInput, optFns ...func(*k.Options)) (*k.PutRecordsOutput, error)
 }
 
 // GetShardsFunc is called to populate the shard map on initialization and during refresh
 // shard interval. GetShardsFunc  will be called with the current shard list. During
 // initialization, this will be nil. GetShardsFunc should return a shard list, a bool
 // indicating if the shards should be updated and an error. If false bool or error is
 // returned, shards will not be updated.
-type GetShardsFunc func(old []*k.Shard) ([]*k.Shard, bool, error)
+type GetShardsFunc func(old []types.Shard) ([]types.Shard, bool, error)
 
-func defaultGetShardsFunc(old []*k.Shard) ([]*k.Shard, bool, error) { return nil, false, nil }
+func defaultGetShardsFunc(old []types.Shard) ([]types.Shard, bool, error) { return nil, false, nil }
 
 // Config is the Producer configuration.
 type Config struct {

deaggregation/deaggregation.go

@@ -6,7 +6,7 @@ import (
 	"bytes"
 	"crypto/md5"
 
-	"github.com/fhaze/kinesis-producer/pb"
+	"github.com/achunariov/kinesis-producer/pb"
 	"google.golang.org/protobuf/proto"
 )
 

deaggregation/deaggregation_test.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/fhaze/kinesis-producer/pb"
+	"github.com/achunariov/kinesis-producer/pb"
 	"google.golang.org/protobuf/proto"
 )
 

example_test.go

@@ -7,15 +7,14 @@ import (
 	"os"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/kinesis"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/kinesis"
 	"github.com/google/uuid"
 )
 
 func ExampleSimple() {
 	logger := &StdLogger{log.New(os.Stdout, "", log.LstdFlags)}
-	client := kinesis.New(session.New(aws.NewConfig()))
+	client := kinesis.NewFromConfig(*aws.NewConfig())
 	pr := New(&Config{
 		StreamName:   "test",
 		BacklogCount: 2000,
@@ -49,7 +48,7 @@ func ExampleSimple() {
 
 func ExampleShardMap() {
 	logger := &StdLogger{log.New(os.Stdout, "", log.LstdFlags)}
-	client := kinesis.New(session.New(aws.NewConfig()))
+	client := kinesis.NewFromConfig(*aws.NewConfig())
 	pr := New(&Config{
 		StreamName:           "test",
 		BacklogCount:         2000,
@@ -114,7 +113,7 @@ func newMyExampleUserRecord(key, val string) (*myExampleUserRecord, error) {
 
 func ExampleUserRecord() {
 	logger := &StdLogger{log.New(os.Stdout, "", log.LstdFlags)}
-	client := kinesis.New(session.New(aws.NewConfig()))
+	client := kinesis.NewFromConfig(*aws.NewConfig())
 	pr := New(&Config{
 		StreamName:           "test",
 		BacklogCount:         2000,

go.mod

@@ -1,18 +1,18 @@
-module github.com/fhaze/kinesis-producer
+module github.com/achunariov/kinesis-producer
+
+go 1.17
 
 require (
-	github.com/aws/aws-sdk-go v1.21.10
-	github.com/golang/protobuf v1.5.0 // indirect
+	github.com/aws/aws-sdk-go v1.40.37
+	github.com/aws/aws-sdk-go-v2 v1.9.0
+	github.com/aws/aws-sdk-go-v2/service/kinesis v1.6.0
+	github.com/golang/protobuf v1.5.2
 	github.com/google/uuid v1.1.1
-	github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7
-	github.com/pkg/errors v0.8.1 // indirect
+	github.com/jpillora/backoff v1.0.0
 	github.com/sirupsen/logrus v1.4.2
 	github.com/stretchr/testify v1.2.2
 	go.uber.org/atomic v1.4.0 // indirect
 	go.uber.org/multierr v1.1.0 // indirect
 	go.uber.org/zap v1.10.0
-	golang.org/x/net v0.0.0-20190724013045-ca1201d0de80 // indirect
-	google.golang.org/protobuf v1.26.0
+	google.golang.org/protobuf v1.27.1
 )
-
-go 1.13

go.sum

@@ -1,22 +1,39 @@
-github.com/aws/aws-sdk-go v1.21.10 h1:lTRdgyxraKbnNhx7kWeoW/Uow1TKnSNDpQGTtEXJQgk=
-github.com/aws/aws-sdk-go v1.21.10/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
+github.com/aws/aws-sdk-go v1.40.37 h1:I+Q6cLctkFyMMrKukcDnj+i2kjrQ37LGiOM6xmsxC48=
+github.com/aws/aws-sdk-go v1.40.37/go.mod h1:585smgzpB/KqRA+K3y/NL/oYRqQvpNJYvLm+LY1U59Q=
+github.com/aws/aws-sdk-go-v2 v1.9.0 h1:+S+dSqQCN3MSU5vJRu1HqHrq00cJn6heIMU7X9hcsoo=
+github.com/aws/aws-sdk-go-v2 v1.9.0/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4=
+github.com/aws/aws-sdk-go-v2/service/kinesis v1.6.0 h1:hb+NupVMUzINGUCfDs2+YqMkWKu47dBIQHpulM0XWh4=
+github.com/aws/aws-sdk-go-v2/service/kinesis v1.6.0/go.mod h1:9O7UG2pELnP0hq35+Gd7XDjOLBkg7tmgRQ0y14ZjoJI=
+github.com/aws/smithy-go v1.8.0 h1:AEwwwXQZtUwP5Mz506FeXXrKBe0jA8gVM+1gEcSRooc=
+github.com/aws/smithy-go v1.8.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
+github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
-github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
-github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7 h1:K//n/AqR5HjG3qxbrBCL4vJPW0MVFSs9CPK1OOJdRME=
-github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7/go.mod h1:2iMrUgbbvHEiQClaW2NsSzMyGHqN+rDFqY705q49KG0=
+github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
+github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
+github.com/jpillora/backoff v1.0.0 h1:uvFg412JmmHBHw7iwprIxkPMI+sGQ4kzOWsMeHnm2EA=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
@@ -26,13 +43,25 @@ go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
+golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
+google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

loggers/kplogrus/logrus.go

@@ -1,7 +1,7 @@
 package kplogrus
 
 import (
-	producer "github.com/fhaze/kinesis-producer"
+	producer "github.com/achunariov/kinesis-producer"
 	"github.com/sirupsen/logrus"
 )
 

loggers/kpzap/zap.go

@@ -3,7 +3,7 @@ package kpzap
 import (
 	"go.uber.org/zap"
 
-	producer "github.com/fhaze/kinesis-producer"
+	producer "github.com/achunariov/kinesis-producer"
 )
 
 // Logger implements a zap.Logger logger for kinesis-producer

pb/messages.proto

@@ -1,7 +1,7 @@
 syntax = "proto2";
 package pb;
 
-option go_package = "github.com/fhaze/kinesis-producer/pb";
+option go_package = "github.com/achunariov/kinesis-producer/pb";
 
 message AggregatedRecord {
   repeated string partition_key_table     = 1;