Use OpenCDC proto from conduit-commons (#1330)

* use opencdc proto from conduit-commons * remove unused dependency * use go.uber.org/mock * make generate
ConduitIO · Jan 4, 2024 · 6a3fe41 · 6a3fe41
1 parent 6fae97c
commit 6a3fe41
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 42 deletions.
diff --git a/go.mod b/go.mod
@@ -1,21 +1,20 @@
 module github.com/conduitio/conduit
 
-go 1.21
-
-toolchain go1.21.1
+go 1.21.1
 
 require (
 	buf.build/gen/go/grpc-ecosystem/grpc-gateway/protocolbuffers/go v1.32.0-20231027202514-3f42134f4c56.1
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/NYTimes/gziphandler v1.1.1
 	github.com/antchfx/jsonquery v1.3.3
 	github.com/bufbuild/buf v1.28.1
+	github.com/conduitio/conduit-commons v0.0.0-20240103200651-5a5746611a8e
 	github.com/conduitio/conduit-connector-file v0.6.0
 	github.com/conduitio/conduit-connector-generator v0.5.0
 	github.com/conduitio/conduit-connector-kafka v0.7.0
 	github.com/conduitio/conduit-connector-log v0.3.0
 	github.com/conduitio/conduit-connector-postgres v0.5.0
-	github.com/conduitio/conduit-connector-protocol v0.5.0
+	github.com/conduitio/conduit-connector-protocol v0.5.1-0.20240104160905-e9e61586fb8d
 	github.com/conduitio/conduit-connector-s3 v0.5.1
 	github.com/conduitio/conduit-connector-sdk v0.8.0
 	github.com/conduitio/yaml/v3 v3.3.0
@@ -24,7 +23,6 @@ require (
 	github.com/dop251/goja_nodejs v0.0.0-20230602164024-804a84515562
 	github.com/gammazero/deque v0.2.1
 	github.com/goccy/go-json v0.10.2
-	github.com/golang/mock v1.6.0
 	github.com/golangci/golangci-lint v1.55.2
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.5.0

diff --git a/go.sum b/go.sum
@@ -1083,6 +1083,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/colinmarc/hdfs/v2 v2.1.1/go.mod h1:M3x+k8UKKmxtFu++uAZ0OtDU8jR3jnaZIAc6yK4Ue0c=
+github.com/conduitio/conduit-commons v0.0.0-20240103200651-5a5746611a8e h1:v0bwYB9rByFyg0CId+mJrw5qxPUsVWpgcP/QHVP7fyg=
+github.com/conduitio/conduit-commons v0.0.0-20240103200651-5a5746611a8e/go.mod h1:lnHoVI2Vqhwjfacvr6J3A7UpkZrOtay6TJwaMhL47fc=
 github.com/conduitio/conduit-connector-file v0.6.0 h1:8tsGeGhKvFwYQZztOOL5/tmOhVShsfo9lQ3b/0fX8kQ=
 github.com/conduitio/conduit-connector-file v0.6.0/go.mod h1:ju7PiB4kTJgqng4KVXDt/Gvw/53kFwSzi5Ez9EDXxNI=
 github.com/conduitio/conduit-connector-generator v0.5.0 h1:zpXHif89DCJ13nftKLv31uI2AJGicpY5H1V7SwldRNo=
@@ -1093,8 +1095,8 @@ github.com/conduitio/conduit-connector-log v0.3.0 h1:J9CD/y86D/3i/C1MI0lrTiFnLww
 github.com/conduitio/conduit-connector-log v0.3.0/go.mod h1:R0gHB21mw/9BXYAKfx9IKQLEsPuB05zJPJXB6JFxYGs=
 github.com/conduitio/conduit-connector-postgres v0.5.0 h1:G8NDnad0W+3Hqfmlsj5MKE/39J4NRsJa1d8wqPUQa88=
 github.com/conduitio/conduit-connector-postgres v0.5.0/go.mod h1:Z2f/zit6CeMHKs+lJipt3DLvaCT9q9TD0/4fOzHNGA0=
-github.com/conduitio/conduit-connector-protocol v0.5.0 h1:Rr2SsDAvWDryQArvonwPoXBELQA2wRXr49xBLrAtBaM=
-github.com/conduitio/conduit-connector-protocol v0.5.0/go.mod h1:UIhHWxq52hvwwbkvQDaRgZRHfbpDDmU7tZaw0mwLdd4=
+github.com/conduitio/conduit-connector-protocol v0.5.1-0.20240104160905-e9e61586fb8d h1:XkJkS63Qkf2vuIYZnWeQMOKsMxBCvqlhX+T+aDqh0kc=
+github.com/conduitio/conduit-connector-protocol v0.5.1-0.20240104160905-e9e61586fb8d/go.mod h1:zW3my/7U6dBCBwXZt4EdtmLHBUhhX/42fXMu/+4eRHU=
 github.com/conduitio/conduit-connector-s3 v0.5.1 h1:yRo8004ryCIZc/S3iWQ1rN6pm6bjySlXFCGZOl1rE1E=
 github.com/conduitio/conduit-connector-s3 v0.5.1/go.mod h1:nbxzsyS95gbFJ28Job9vFFB+byRFINSv70/13Yi4mKQ=
 github.com/conduitio/conduit-connector-sdk v0.8.0 h1:gvchqoj5d3AQsBoIosx4i32L8Ex9+5BuAyHi/IM9VD4=

diff --git a/pkg/plugin/builtin/v1/dispenser_test.go b/pkg/plugin/builtin/v1/dispenser_test.go
@@ -21,8 +21,8 @@ import (
 	"github.com/conduitio/conduit-connector-protocol/cpluginv1/mock"
 	"github.com/conduitio/conduit/pkg/foundation/log"
 	"github.com/conduitio/conduit/pkg/plugin"
-	"github.com/golang/mock/gomock" //nolint:depguard // the protocol is using the old mock package, this will be changed when we update conduit-connector-protocol
 	"github.com/rs/zerolog"
+	"go.uber.org/mock/gomock"
 )
 
 func newTestDispenser(t *testing.T) (plugin.Dispenser, *mock.SpecifierPlugin, *mock.SourcePlugin, *mock.DestinationPlugin) {

diff --git a/pkg/plugin/standalone/v1/dispenser_test.go b/pkg/plugin/standalone/v1/dispenser_test.go
@@ -23,9 +23,9 @@ import (
 	"github.com/conduitio/conduit-connector-protocol/cpluginv1/mock"
 	"github.com/conduitio/conduit-connector-protocol/cpluginv1/server"
 	"github.com/conduitio/conduit/pkg/plugin"
-	"github.com/golang/mock/gomock" //nolint:depguard // the protocol is using the old mock package, this will be changed when we update conduit-connector-protocol
 	goplugin "github.com/hashicorp/go-plugin"
 	"github.com/rs/zerolog"
+	"go.uber.org/mock/gomock"
 )
 
 func newTestDispenser(t *testing.T, logger zerolog.Logger) (

diff --git a/pkg/plugin/standalone/v1/internal/fromproto/record.go b/pkg/plugin/standalone/v1/internal/fromproto/record.go
@@ -17,7 +17,7 @@ package fromproto
 import (
 	"fmt"
 
-	opencdcv1 "github.com/conduitio/conduit-connector-protocol/proto/opencdc/v1"
+	opencdcv1 "github.com/conduitio/conduit-commons/proto/opencdc/v1"
 	"github.com/conduitio/conduit/pkg/foundation/cerrors"
 	"github.com/conduitio/conduit/pkg/record"
 )

diff --git a/pkg/plugin/standalone/v1/internal/toproto/record.go b/pkg/plugin/standalone/v1/internal/toproto/record.go
@@ -17,7 +17,7 @@ package toproto
 import (
 	"fmt"
 
-	opencdcv1 "github.com/conduitio/conduit-connector-protocol/proto/opencdc/v1"
+	opencdcv1 "github.com/conduitio/conduit-commons/proto/opencdc/v1"
 	"github.com/conduitio/conduit/pkg/foundation/cerrors"
 	"github.com/conduitio/conduit/pkg/record"
 	"google.golang.org/protobuf/types/known/structpb"

diff --git a/pkg/plugin/standalone/v1/metadata_test.go b/pkg/plugin/standalone/v1/metadata_test.go
@@ -17,8 +17,8 @@ package standalonev1
 import (
 	"testing"
 
+	opencdcv1 "github.com/conduitio/conduit-commons/proto/opencdc/v1"
 	connectorv1 "github.com/conduitio/conduit-connector-protocol/proto/connector/v1"
-	opencdcv1 "github.com/conduitio/conduit-connector-protocol/proto/opencdc/v1"
 	"github.com/conduitio/conduit/pkg/record"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/runtime/protoimpl"

diff --git a/pkg/web/api/toproto/record.go b/pkg/web/api/toproto/record.go
@@ -17,7 +17,7 @@ package toproto
 import (
 	"fmt"
 
-	opencdcv1 "github.com/conduitio/conduit-connector-protocol/proto/opencdc/v1"
+	opencdcv1 "github.com/conduitio/conduit-commons/proto/opencdc/v1"
 	"github.com/conduitio/conduit/pkg/foundation/cerrors"
 	"github.com/conduitio/conduit/pkg/record"
 	"google.golang.org/protobuf/types/known/structpb"

diff --git a/pkg/web/openapi/swagger-ui/api/v1/api.swagger.json b/pkg/web/openapi/swagger-ui/api/v1/api.swagger.json
@@ -404,9 +404,6 @@
               "properties": {
                 "result": {
                   "$ref": "#/definitions/v1Record"
-                },
-                "error": {
-                  "$ref": "#/definitions/googlerpcStatus"
                 }
               },
               "title": "Stream result of v1InspectConnectorResponse"
@@ -1371,9 +1368,6 @@
               "properties": {
                 "result": {
                   "$ref": "#/definitions/v1Record"
-                },
-                "error": {
-                  "$ref": "#/definitions/googlerpcStatus"
                 }
               },
               "title": "Stream result of v1InspectProcessorInResponse"
@@ -1418,9 +1412,6 @@
               "properties": {
                 "result": {
                   "$ref": "#/definitions/v1Record"
-                },
-                "error": {
-                  "$ref": "#/definitions/googlerpcStatus"
                 }
               },
               "title": "Stream result of v1InspectProcessorOutResponse"

diff --git a/proto/api/v1/api.pb.go b/proto/api/v1/api.pb.go
diff --git a/proto/api/v1/api.swagger.json b/proto/api/v1/api.swagger.json
@@ -404,9 +404,6 @@
               "properties": {
                 "result": {
                   "$ref": "#/definitions/v1Record"
-                },
-                "error": {
-                  "$ref": "#/definitions/googlerpcStatus"
                 }
               },
               "title": "Stream result of v1InspectConnectorResponse"
@@ -1371,9 +1368,6 @@
               "properties": {
                 "result": {
                   "$ref": "#/definitions/v1Record"
-                },
-                "error": {
-                  "$ref": "#/definitions/googlerpcStatus"
                 }
               },
               "title": "Stream result of v1InspectProcessorInResponse"
@@ -1418,9 +1412,6 @@
               "properties": {
                 "result": {
                   "$ref": "#/definitions/v1Record"
-                },
-                "error": {
-                  "$ref": "#/definitions/googlerpcStatus"
                 }
               },
               "title": "Stream result of v1InspectProcessorOutResponse"

diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml
@@ -5,24 +5,24 @@ managed:
     default: "github.com/conduitio/conduit/proto"
     except:
       - buf.build/googleapis/googleapis
+      - buf.build/conduitio/conduit-commons
     override:
       buf.build/grpc-ecosystem/grpc-gateway: buf.build/gen/go/grpc-ecosystem/grpc-gateway/protocolbuffers/go
-      buf.build/conduitio/conduit-connector-protocol: github.com/conduitio/conduit-connector-protocol/proto
 plugins:
-  - plugin: buf.build/protocolbuffers/go:v1.29.1
+  - plugin: buf.build/protocolbuffers/go:v1.32.0
     out: .
     opt:
       - paths=source_relative
   - plugin: buf.build/grpc/go:v1.3.0
     out: .
     opt:
       - paths=source_relative
-  - plugin: buf.build/grpc-ecosystem/gateway:v2.15.2
+  - plugin: buf.build/grpc-ecosystem/gateway:v2.18.1
     out: .
     opt:
       - paths=source_relative
       - logtostderr=true
-  - plugin: buf.build/grpc-ecosystem/openapiv2:v2.15.2
+  - plugin: buf.build/grpc-ecosystem/openapiv2:v2.18.1
     out: .
     opt:
       - logtostderr=true

diff --git a/proto/buf.lock b/proto/buf.lock
@@ -3,13 +3,16 @@ version: v1
 deps:
   - remote: buf.build
     owner: conduitio
-    repository: conduit-connector-protocol
-    commit: 68f3642f66c04db8ba18360a6b7b3c15
+    repository: conduit-commons
+    commit: de2e1a18c9e042119dedd69b852efc21
+    digest: shake256:1275ac9a7d437cc6b48bd6ff2e9edc59f0450a8f9ab6050f49fb9949e231b7f4d91debfd42b09fc29d9e4aed1b9904266a46a46f7a5676218b53aafb7efe211d
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: c0ec788bbbb747fca594a1e2347edd4e
+    commit: a86849a25cc04f4dbe9b15ddddfbc488
+    digest: shake256:e19143328f8cbfe13fc226aeee5e63773ca494693a72740a7560664270039a380d94a1344234b88c7691311460df9a9b1c2982190d0a2612eae80368718e1943
   - remote: buf.build
     owner: grpc-ecosystem
     repository: grpc-gateway
-    commit: a1ecdc58eccd49aa8bea2a7a9022dc27
+    commit: 3f42134f4c564983838425bc43c7a65f
+    digest: shake256:3d11d4c0fe5e05fda0131afefbce233940e27f0c31c5d4e385686aea58ccd30f72053f61af432fa83f1fc11cda57f5f18ca3da26a29064f73c5a0d076bba8d92
diff --git a/proto/buf.yaml b/proto/buf.yaml
@@ -9,4 +9,4 @@ breaking:
 deps:
   - buf.build/googleapis/googleapis
   - buf.build/grpc-ecosystem/grpc-gateway
-  - buf.build/conduitio/conduit-connector-protocol
+  - buf.build/conduitio/conduit-commons