From 39b7ebc40da35f4c63390d3454afc656e790f339 Mon Sep 17 00:00:00 2001 From: Foad Nosrati Habibi Date: Wed, 24 Aug 2022 13:37:20 +1000 Subject: [PATCH] Change module address to fork --- aggregate/aggregator.go | 3 ++- aggregate/aggregator_test.go | 3 ++- fluent-bit-kinesis.go | 3 ++- go.mod | 2 +- kinesis/kinesis.go | 8 +++++--- kinesis/kinesis_test.go | 9 ++++++--- kinesis/mock_kinesis/mock_kinesis.go | 2 +- 7 files changed, 19 insertions(+), 11 deletions(-) diff --git a/aggregate/aggregator.go b/aggregate/aggregator.go index 9eff236..28fc3ec 100644 --- a/aggregate/aggregator.go +++ b/aggregate/aggregator.go @@ -4,12 +4,13 @@ import ( "crypto/md5" "fmt" - "github.com/aws/amazon-kinesis-streams-for-fluent-bit/util" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/kinesis" "github.com/sirupsen/logrus" "google.golang.org/protobuf/encoding/protowire" "google.golang.org/protobuf/proto" + + "github.com/canva/amazon-kinesis-streams-for-fluent-bit/util" ) var ( diff --git a/aggregate/aggregator_test.go b/aggregate/aggregator_test.go index 708c19d..baaec2c 100644 --- a/aggregate/aggregator_test.go +++ b/aggregate/aggregator_test.go @@ -3,8 +3,9 @@ package aggregate import ( "testing" - "github.com/aws/amazon-kinesis-streams-for-fluent-bit/util" "github.com/stretchr/testify/assert" + + "github.com/canva/amazon-kinesis-streams-for-fluent-bit/util" ) const concurrencyRetryLimit = 4 diff --git a/fluent-bit-kinesis.go b/fluent-bit-kinesis.go index f21aaf8..888dab4 100644 --- a/fluent-bit-kinesis.go +++ b/fluent-bit-kinesis.go @@ -22,10 +22,11 @@ import ( "unsafe" "github.com/aws/amazon-kinesis-firehose-for-fluent-bit/plugins" - "github.com/aws/amazon-kinesis-streams-for-fluent-bit/kinesis" kinesisAPI "github.com/aws/aws-sdk-go/service/kinesis" "github.com/fluent/fluent-bit-go/output" "github.com/sirupsen/logrus" + + "github.com/canva/amazon-kinesis-streams-for-fluent-bit/kinesis" ) const ( diff --git a/go.mod b/go.mod index a6573eb..dd45dca 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/aws/amazon-kinesis-streams-for-fluent-bit +module github.com/canva/amazon-kinesis-streams-for-fluent-bit go 1.17 diff --git a/kinesis/kinesis.go b/kinesis/kinesis.go index ee752ce..f958d9b 100644 --- a/kinesis/kinesis.go +++ b/kinesis/kinesis.go @@ -11,7 +11,7 @@ // express or implied. See the License for the specific language governing // permissions and limitations under the License. -//go:generate mockgen -destination mock_kinesis/mock_kinesis.go -copyright_file=../COPYRIGHT github.com/aws/amazon-kinesis-streams-for-fluent-bit/kinesis PutRecordsClient +//go:generate mockgen -destination mock_kinesis/mock_kinesis.go -copyright_file=../COPYRIGHT github.com/canva/amazon-kinesis-streams-for-fluent-bit/kinesis PutRecordsClient // Package kinesis contains the OutputPlugin which sends log records to Kinesis Stream package kinesis @@ -30,8 +30,6 @@ import ( "time" "github.com/aws/amazon-kinesis-firehose-for-fluent-bit/plugins" - "github.com/aws/amazon-kinesis-streams-for-fluent-bit/aggregate" - "github.com/aws/amazon-kinesis-streams-for-fluent-bit/util" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/credentials/stscreds" @@ -43,6 +41,10 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/lestrrat-go/strftime" "github.com/sirupsen/logrus" + + "github.com/canva/amazon-kinesis-streams-for-fluent-bit/util" + + "github.com/canva/amazon-kinesis-streams-for-fluent-bit/aggregate" ) const ( diff --git a/kinesis/kinesis_test.go b/kinesis/kinesis_test.go index bf21d9b..9500c8e 100644 --- a/kinesis/kinesis_test.go +++ b/kinesis/kinesis_test.go @@ -9,15 +9,18 @@ import ( "time" "github.com/aws/amazon-kinesis-firehose-for-fluent-bit/plugins" - "github.com/aws/amazon-kinesis-streams-for-fluent-bit/aggregate" - "github.com/aws/amazon-kinesis-streams-for-fluent-bit/kinesis/mock_kinesis" - "github.com/aws/amazon-kinesis-streams-for-fluent-bit/util" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/service/kinesis" fluentbit "github.com/fluent/fluent-bit-go/output" "github.com/golang/mock/gomock" "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" + + "github.com/canva/amazon-kinesis-streams-for-fluent-bit/util" + + "github.com/canva/amazon-kinesis-streams-for-fluent-bit/kinesis/mock_kinesis" + + "github.com/canva/amazon-kinesis-streams-for-fluent-bit/aggregate" ) const concurrencyRetryLimit = 4 diff --git a/kinesis/mock_kinesis/mock_kinesis.go b/kinesis/mock_kinesis/mock_kinesis.go index bd05ca1..9585bce 100644 --- a/kinesis/mock_kinesis/mock_kinesis.go +++ b/kinesis/mock_kinesis/mock_kinesis.go @@ -12,7 +12,7 @@ // permissions and limitations under the License. // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/aws/amazon-kinesis-streams-for-fluent-bit/kinesis (interfaces: PutRecordsClient) +// Source: github.com/canva/amazon-kinesis-streams-for-fluent-bit/kinesis (interfaces: PutRecordsClient) // Package mock_kinesis is a generated GoMock package. package mock_kinesis