Skip to content

Commit

Permalink
Use Buf remote plugins (#927)
Browse files Browse the repository at this point in the history
  • Loading branch information
hariso authored Mar 15, 2023
1 parent 6b46e8b commit bfea935
Show file tree
Hide file tree
Showing 45 changed files with 218 additions and 160 deletions.
2 changes: 1 addition & 1 deletion cmd/conduit-pipeline-check/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"os/signal"
"time"

apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)
Expand Down
7 changes: 3 additions & 4 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ module github.com/conduitio/conduit
go 1.20

require (
buf.build/gen/go/grpc-ecosystem/grpc-gateway/protocolbuffers/go v1.29.1-20221127060915-a1ecdc58eccd.1
github.com/Masterminds/semver/v3 v3.2.0
github.com/NYTimes/gziphandler v1.1.1
github.com/antchfx/jsonquery v1.3.2
Expand All @@ -12,9 +13,9 @@ require (
github.com/conduitio/conduit-connector-kafka v0.4.1
github.com/conduitio/conduit-connector-log v0.1.2
github.com/conduitio/conduit-connector-postgres v0.3.0
github.com/conduitio/conduit-connector-protocol v0.4.0
github.com/conduitio/conduit-connector-protocol v0.4.1
github.com/conduitio/conduit-connector-s3 v0.3.0
github.com/conduitio/conduit-connector-sdk v0.5.1
github.com/conduitio/conduit-connector-sdk v0.5.2
github.com/conduitio/yaml/v3 v3.2.0
github.com/dgraph-io/badger/v3 v3.2103.5
github.com/dop251/goja v0.0.0-20230304130813-e2f543bf4b4c
Expand All @@ -36,8 +37,6 @@ require (
github.com/prometheus/client_model v0.3.0
github.com/prometheus/common v0.42.0
github.com/rs/zerolog v1.29.0
go.buf.build/grpc/go/conduitio/conduit-connector-protocol v1.4.5
go.buf.build/protocolbuffers/go/grpc-ecosystem/grpc-gateway v1.3.50
go.uber.org/goleak v1.2.1
golang.org/x/exp v0.0.0-20230307190834-24139beb5833
golang.org/x/tools v0.7.0
Expand Down
16 changes: 6 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
buf.build/gen/go/grpc-ecosystem/grpc-gateway/protocolbuffers/go v1.29.1-20221127060915-a1ecdc58eccd.1 h1:DxfvwvlZjMtqxd4fTjQ4lIg0PpPOKZgor1KKxB88Ifg=
buf.build/gen/go/grpc-ecosystem/grpc-gateway/protocolbuffers/go v1.29.1-20221127060915-a1ecdc58eccd.1/go.mod h1:hhON98gyTBA8hmdzw7bPux2Zerm5Sp2hesfc5t6jpoI=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
Expand Down Expand Up @@ -158,12 +160,12 @@ github.com/conduitio/conduit-connector-log v0.1.2 h1:CPlsdgr1Ui6j3fNVYpp/qHVwXKb
github.com/conduitio/conduit-connector-log v0.1.2/go.mod h1:mnox8F5YrwQpuX+Y/WJidgqi6882Id6i8MslW0ic+XA=
github.com/conduitio/conduit-connector-postgres v0.3.0 h1:owlVIXeAWVAuHW0Hzr3+zxrAB9/LXIedINduFQM/HoM=
github.com/conduitio/conduit-connector-postgres v0.3.0/go.mod h1:I8Yz4t90QbGZUObt+0+bWpDwJ2qZ5iv4bbFjRB19xGA=
github.com/conduitio/conduit-connector-protocol v0.4.0 h1:hO6mB4Ft34+PbF1G2pDGHzZmCA/y5jj5wsIrluw4qFY=
github.com/conduitio/conduit-connector-protocol v0.4.0/go.mod h1:xU4dsoPPCiW+1rJFwxkMUjhYs+HMte+XB/aFL6x94iM=
github.com/conduitio/conduit-connector-protocol v0.4.1 h1:QIqvkpfVVSxsBHltMKRpy4l5u1M3psAF0SePxhv+CTU=
github.com/conduitio/conduit-connector-protocol v0.4.1/go.mod h1:UIhHWxq52hvwwbkvQDaRgZRHfbpDDmU7tZaw0mwLdd4=
github.com/conduitio/conduit-connector-s3 v0.3.0 h1:Zy+TYRnZKw09mks4qsXW43qnp0PuO/SsgvYbbuMUhss=
github.com/conduitio/conduit-connector-s3 v0.3.0/go.mod h1:ims2iWZJcOSjEPY1nal/DQrxiqG+xHPYFV5nN1ia/Pk=
github.com/conduitio/conduit-connector-sdk v0.5.1 h1:mWPSjYNy5Eq1+irhxOHKdbPYQkNw010/j58olhjum2c=
github.com/conduitio/conduit-connector-sdk v0.5.1/go.mod h1:fvgavA7aNgysmC4dPaozRnejOSq3lB3LeEgJPiRSe1Y=
github.com/conduitio/conduit-connector-sdk v0.5.2 h1:YOPWaG/+NrAzJNkuFbvN6pPk3SdQDErRtipiSH3XT2c=
github.com/conduitio/conduit-connector-sdk v0.5.2/go.mod h1:Ih8mHJWX2+TvFj429hcrj361vJNULw7FWk4iz1W5l9s=
github.com/conduitio/yaml/v3 v3.2.0 h1:itolFiK0dzUYG6PdlOpmCi1fcMYFoaWdZ1wbNNTEnlI=
github.com/conduitio/yaml/v3 v3.2.0/go.mod h1:JNgFMOX1t8W4YJuRZOh6GggVtSMsgP9XgTw+7dIenpc=
github.com/containerd/stargz-snapshotter/estargz v0.12.1 h1:+7nYmHJb0tEkcRaAW+MHqoKaJYZmkikupxCqVtmPuY0=
Expand Down Expand Up @@ -651,10 +653,6 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
go.buf.build/grpc/go/conduitio/conduit-connector-protocol v1.4.5 h1:oTq+asmk3IBfC28wihi1EjhJA6xTy+W4EJImZSgdOu0=
go.buf.build/grpc/go/conduitio/conduit-connector-protocol v1.4.5/go.mod h1:+TaeSyc6KgrD/1fNhSQNQ6ckvEEbgmerpBqZ2szZMGs=
go.buf.build/protocolbuffers/go/grpc-ecosystem/grpc-gateway v1.3.50 h1:jP9S/C5iEtQhxjvWlbfnSqUYC1T7mQFXsjdx9ko3DfQ=
go.buf.build/protocolbuffers/go/grpc-ecosystem/grpc-gateway v1.3.50/go.mod h1:6MdGHa1QvFJzNaFwRsJO+AZ/sPDxl3xx/jcrDLrKJys=
go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
Expand Down Expand Up @@ -992,7 +990,6 @@ google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
google.golang.org/grpc v1.32.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
Expand All @@ -1012,7 +1009,6 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM=
google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
Expand Down
2 changes: 1 addition & 1 deletion pkg/conduit/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import (
"github.com/conduitio/conduit/pkg/web/api"
"github.com/conduitio/conduit/pkg/web/openapi"
"github.com/conduitio/conduit/pkg/web/ui"
apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
grpcruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
"github.com/piotrkowalczuk/promgrpc/v4"
promclient "github.com/prometheus/client_golang/prometheus"
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/standalone/v1/destination.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import (
"context"
"io"

connectorv1 "github.com/conduitio/conduit-connector-protocol/proto/connector/v1"
"github.com/conduitio/conduit/pkg/foundation/cerrors"
"github.com/conduitio/conduit/pkg/plugin"
"github.com/conduitio/conduit/pkg/plugin/standalone/v1/internal/fromproto"
"github.com/conduitio/conduit/pkg/plugin/standalone/v1/internal/toproto"
"github.com/conduitio/conduit/pkg/record"
goplugin "github.com/hashicorp/go-plugin"
connectorv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/connector/v1"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/standalone/v1/internal/fromproto/destination.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package fromproto

import (
connectorv1 "github.com/conduitio/conduit-connector-protocol/proto/connector/v1"
"github.com/conduitio/conduit/pkg/record"
connectorv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/connector/v1"
)

func DestinationRunResponse(in *connectorv1.Destination_Run_Response) (record.Position, string) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/standalone/v1/internal/fromproto/record.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package fromproto
import (
"fmt"

opencdcv1 "github.com/conduitio/conduit-connector-protocol/proto/opencdc/v1"
"github.com/conduitio/conduit/pkg/foundation/cerrors"
"github.com/conduitio/conduit/pkg/record"
opencdcv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/opencdc/v1"
)

func _() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/standalone/v1/internal/fromproto/source.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package fromproto

import (
connectorv1 "github.com/conduitio/conduit-connector-protocol/proto/connector/v1"
"github.com/conduitio/conduit/pkg/record"
connectorv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/connector/v1"
)

func SourceRunResponse(in *connectorv1.Source_Run_Response) (record.Record, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/standalone/v1/internal/fromproto/specifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ package fromproto
import (
"fmt"

connectorv1 "github.com/conduitio/conduit-connector-protocol/proto/connector/v1"
"github.com/conduitio/conduit/pkg/plugin"
connectorv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/connector/v1"
)

func _() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/standalone/v1/internal/toproto/destination.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package toproto

import (
connectorv1 "github.com/conduitio/conduit-connector-protocol/proto/connector/v1"
"github.com/conduitio/conduit/pkg/record"
connectorv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/connector/v1"
)

func DestinationConfigureRequest(in map[string]string) (*connectorv1.Destination_Configure_Request, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/standalone/v1/internal/toproto/record.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package toproto
import (
"fmt"

opencdcv1 "github.com/conduitio/conduit-connector-protocol/proto/opencdc/v1"
"github.com/conduitio/conduit/pkg/foundation/cerrors"
"github.com/conduitio/conduit/pkg/record"
opencdcv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/opencdc/v1"
"google.golang.org/protobuf/types/known/structpb"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/standalone/v1/internal/toproto/source.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
package toproto

import (
connectorv1 "github.com/conduitio/conduit-connector-protocol/proto/connector/v1"
"github.com/conduitio/conduit/pkg/record"
connectorv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/connector/v1"
)

func SourceConfigureRequest(in map[string]string) (*connectorv1.Source_Configure_Request, error) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/standalone/v1/internal/toproto/specifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

package toproto

import connectorv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/connector/v1"
import connectorv1 "github.com/conduitio/conduit-connector-protocol/proto/connector/v1"

func SpecifierSpecifyRequest() *connectorv1.Specifier_Specify_Request {
return &connectorv1.Specifier_Specify_Request{}
Expand Down
4 changes: 2 additions & 2 deletions pkg/plugin/standalone/v1/metadata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ package standalonev1
import (
"testing"

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"
connectorv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/connector/v1"
opencdcv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/opencdc/v1"
"google.golang.org/protobuf/proto"
"google.golang.org/protobuf/runtime/protoimpl"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/standalone/v1/source.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import (
"context"
"io"

connectorv1 "github.com/conduitio/conduit-connector-protocol/proto/connector/v1"
"github.com/conduitio/conduit/pkg/foundation/cerrors"
"github.com/conduitio/conduit/pkg/plugin"
"github.com/conduitio/conduit/pkg/plugin/standalone/v1/internal/fromproto"
"github.com/conduitio/conduit/pkg/plugin/standalone/v1/internal/toproto"
"github.com/conduitio/conduit/pkg/record"
goplugin "github.com/hashicorp/go-plugin"
connectorv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/connector/v1"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/standalone/v1/specifier.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ package standalonev1
import (
"context"

connectorv1 "github.com/conduitio/conduit-connector-protocol/proto/connector/v1"
"github.com/conduitio/conduit/pkg/foundation/cerrors"
"github.com/conduitio/conduit/pkg/plugin"
"github.com/conduitio/conduit/pkg/plugin/standalone/v1/internal/fromproto"
"github.com/conduitio/conduit/pkg/plugin/standalone/v1/internal/toproto"
goplugin "github.com/hashicorp/go-plugin"
connectorv1 "go.buf.build/grpc/go/conduitio/conduit-connector-protocol/connector/v1"
"google.golang.org/grpc"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/web/api/connector_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

//go:generate mockgen -destination=mock/connector.go -package=mock -mock_names=ConnectorOrchestrator=ConnectorOrchestrator . ConnectorOrchestrator
//go:generate mockgen -destination=mock/connector_service.go -package=mock -mock_names=ConnectorService_InspectConnectorServer=ConnectorService_InspectConnectorServer github.com/conduitio/conduit/proto/gen/api/v1 ConnectorService_InspectConnectorServer
//go:generate mockgen -destination=mock/connector_service.go -package=mock -mock_names=ConnectorService_InspectConnectorServer=ConnectorService_InspectConnectorServer github.com/conduitio/conduit/proto/api/v1 ConnectorService_InspectConnectorServer
package api

import (
Expand All @@ -25,7 +25,7 @@ import (
"github.com/conduitio/conduit/pkg/web/api/fromproto"
"github.com/conduitio/conduit/pkg/web/api/status"
"github.com/conduitio/conduit/pkg/web/api/toproto"
apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/web/api/connector_v1_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/conduitio/conduit/pkg/record"
apimock "github.com/conduitio/conduit/pkg/web/api/mock"
"github.com/conduitio/conduit/pkg/web/api/toproto"
apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
"google.golang.org/protobuf/types/known/timestamppb"
Expand Down
2 changes: 1 addition & 1 deletion pkg/web/api/fromproto/connector.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package fromproto

import (
"github.com/conduitio/conduit/pkg/connector"
apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
)

func _() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/web/api/fromproto/pipeline.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package fromproto

import (
"github.com/conduitio/conduit/pkg/pipeline"
apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
)

func PipelineConfig(in *apiv1.Pipeline_Config) pipeline.Config {
Expand Down
2 changes: 1 addition & 1 deletion pkg/web/api/fromproto/processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ package fromproto

import (
"github.com/conduitio/conduit/pkg/processor"
apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
)

func _() {
Expand Down
2 changes: 1 addition & 1 deletion pkg/web/api/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"runtime"

apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
"google.golang.org/grpc"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/web/api/mock/connector_service.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/web/api/mock/processor_service_in.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/web/api/mock/processor_service_out.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/web/api/pipeline_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/conduitio/conduit/pkg/web/api/fromproto"
"github.com/conduitio/conduit/pkg/web/api/status"
"github.com/conduitio/conduit/pkg/web/api/toproto"
apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/web/api/pipeline_v1_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/conduitio/conduit/pkg/pipeline"
"github.com/conduitio/conduit/pkg/web/api/mock"
apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
"github.com/golang/mock/gomock"
"github.com/google/uuid"
"github.com/matryer/is"
Expand Down
2 changes: 1 addition & 1 deletion pkg/web/api/plugin_v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/conduitio/conduit/pkg/plugin"
"github.com/conduitio/conduit/pkg/web/api/status"
"github.com/conduitio/conduit/pkg/web/api/toproto"
apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/web/api/plugin_v1_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"github.com/conduitio/conduit/pkg/plugin"
"github.com/conduitio/conduit/pkg/web/api/mock"
"github.com/conduitio/conduit/pkg/web/api/toproto"
apiv1 "github.com/conduitio/conduit/proto/gen/api/v1"
apiv1 "github.com/conduitio/conduit/proto/api/v1"
"github.com/golang/mock/gomock"
)

Expand Down
Loading

0 comments on commit bfea935

Please sign in to comment.