feat: support for local build in arm64/apple silicon (#59)

punit-kulal · web-flow · commit b7d1fcfae0d5 · 2023-07-18T02:50:37.000-05:00
* use version 1.9.2

* bump confluent client version

* comment import

* fix: go.mod and go.sum files

* refactor: remove vendor imports

* bump version to v2 for confluent kafka-go

* bump golang version to 1.20

* bump go.mod to 1.20

* revert to version 1.9.x

* revert to version 1.14

* bump version.txt to v0.2.1
diff --git a/config/publisher.go b/config/publisher.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"strings"
 
+	confluent "github.com/confluentinc/confluent-kafka-go/kafka"
 	"github.com/raystack/raccoon/config/util"
 	"github.com/spf13/viper"
-	confluent "gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"
 )
 
 var PublisherKafka publisherKafka
diff --git a/go.mod b/go.mod
@@ -3,15 +3,13 @@ module github.com/raystack/raccoon
 go 1.14
 
 require (
-	github.com/confluentinc/confluent-kafka-go v1.4.2 // indirect
+	github.com/confluentinc/confluent-kafka-go v1.9.3-RC3
 	github.com/gorilla/mux v1.7.4
 	github.com/gorilla/websocket v1.4.2
 	github.com/sirupsen/logrus v1.6.0
 	github.com/spf13/viper v1.7.0
-	github.com/stretchr/testify v1.7.0
-	golang.org/x/sys v0.0.0-20211109184856-51b60fd695b3 // indirect
-	google.golang.org/grpc v1.41.0
+	github.com/stretchr/testify v1.7.1
+	google.golang.org/grpc v1.46.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/alexcesaro/statsd.v2 v2.0.0
-	gopkg.in/confluentinc/confluent-kafka-go.v1 v1.4.2
 )
diff --git a/go.sum b/go.sum
diff --git a/integration/integration_test.go b/integration/integration_test.go
@@ -13,14 +13,14 @@ import (
 	"testing"
 	"time"
 
+	"github.com/confluentinc/confluent-kafka-go/kafka"
 	"github.com/gorilla/websocket"
 	pb "github.com/raystack/raccoon/proto"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"
-	"gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"
 )
 
 var uuid string
diff --git a/publisher/client.go b/publisher/client.go
@@ -1,7 +1,7 @@
 package publisher
 
 import (
-	"gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"
+	"github.com/confluentinc/confluent-kafka-go/kafka"
 )
 
 type Client interface {
diff --git a/publisher/kafka.go b/publisher/kafka.go
@@ -5,9 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"
-	// Importing librd to make it work on vendor mode
-	_ "gopkg.in/confluentinc/confluent-kafka-go.v1/kafka/librdkafka"
+	"github.com/confluentinc/confluent-kafka-go/kafka"
 
 	"github.com/raystack/raccoon/config"
 	"github.com/raystack/raccoon/logger"
diff --git a/publisher/kafka_test.go b/publisher/kafka_test.go
@@ -5,11 +5,11 @@ import (
 	"os"
 	"testing"
 
+	"github.com/confluentinc/confluent-kafka-go/kafka"
 	"github.com/raystack/raccoon/logger"
 	pb "github.com/raystack/raccoon/proto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
-	"gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"
 )
 
 const (
diff --git a/publisher/mockclient.go b/publisher/mockclient.go
@@ -1,8 +1,8 @@
 package publisher
 
 import (
+	"github.com/confluentinc/confluent-kafka-go/kafka"
 	"github.com/stretchr/testify/mock"
-	"gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"
 )
 
 type mockClient struct {
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v0.1.4
+v0.2.1
diff --git a/worker/mocks.go b/worker/mocks.go
@@ -1,9 +1,9 @@
 package worker
 
 import (
+	kafka "github.com/confluentinc/confluent-kafka-go/kafka"
 	pb "github.com/raystack/raccoon/proto"
 	mock "github.com/stretchr/testify/mock"
-	kafka "gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"
 )
 
 // KafkaProducer is an autogenerated mock type for the KafkaProducer type
diff --git a/worker/worker.go b/worker/worker.go
@@ -5,11 +5,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/confluentinc/confluent-kafka-go/kafka"
 	"github.com/raystack/raccoon/collection"
 	"github.com/raystack/raccoon/logger"
 	"github.com/raystack/raccoon/metrics"
 	"github.com/raystack/raccoon/publisher"
-	"gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"
 )
 
 // Pool spawn goroutine as much as Size that will listen to EventsChannel. On Close, wait for all data in EventsChannel to be processed.

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ import (`
`5`	`5`	`"os"`
`6`	`6`	`"strings"`
`7`	`7`
	`8`	`+ confluent "github.com/confluentinc/confluent-kafka-go/kafka"`
`8`	`9`	`"github.com/raystack/raccoon/config/util"`
`9`	`10`	`"github.com/spf13/viper"`
`10`		`- confluent "gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`var PublisherKafka publisherKafka`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package publisher`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"`
	`4`	`+ "github.com/confluentinc/confluent-kafka-go/kafka"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`type Client interface {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package publisher`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "github.com/confluentinc/confluent-kafka-go/kafka"`
`4`	`5`	`"github.com/stretchr/testify/mock"`
`5`		`- "gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`type mockClient struct {`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`package worker`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ kafka "github.com/confluentinc/confluent-kafka-go/kafka"`
`4`	`5`	`pb "github.com/raystack/raccoon/proto"`
`5`	`6`	`mock "github.com/stretchr/testify/mock"`
`6`		`- kafka "gopkg.in/confluentinc/confluent-kafka-go.v1/kafka"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`// KafkaProducer is an autogenerated mock type for the KafkaProducer type`