Skip to content

Commit

Permalink
Downgrade protoc-gen-go
Browse files Browse the repository at this point in the history
  • Loading branch information
croomes committed Feb 6, 2020
1 parent 4a1f81f commit f4d8269
Show file tree
Hide file tree
Showing 30 changed files with 173 additions and 300 deletions.
10 changes: 5 additions & 5 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ RUN curl -fsSL "$DEP_DOWNLOAD_URL" -o /go/bin/dep \

# soegarots/dataplane-build:latest contains the dataplane C++ versions of protobuf and grpc.

# Install go pieces we need.
RUN for pkg in \
github.com/golang/protobuf/protoc-gen-go \
github.com/golang/mock/mockgen \
; do echo "++ $pkg"; go get -u $pkg; done
ENV PROTOC_TAG="v1.3.2"
RUN go get -u github.com/golang/mock/mockgen
RUN go get -d -u github.com/golang/protobuf/protoc-gen-go \
&& git -C "$GOPATH/src/github.com/golang/protobuf" checkout $PROTOC_TAG \
&& go install github.com/golang/protobuf/protoc-gen-go

WORKDIR /go/src/code.storageos.net/storageos/service
ENV DAPPER_SOURCE /go/src/code.storageos.net/storageos/service
Expand Down
6 changes: 3 additions & 3 deletions Gopkg.lock

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

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

[[constraint]]
name = "google.golang.org/grpc"
version = "1.26.0"
version = "=1.26.0"

[prune]
go-tests = true
Expand Down
14 changes: 13 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ go-mocks:
# having the files in the GOPATH doesn't work at all.
# When building, ensure source files are in:
# $(GOPATH)/src/code.storageos.net/storageos/service/
for dir in dbplugin/v1/mock_rdbplugin filesystem/v1/mock_filesystem \
director/v1/mock_director directfs/v1/mock_directfs stats/v1/mock_stats; \
do \
mkdir -p $$dir; \
done

mockgen code.storageos.net/storageos/service/rdbplugin/v1 RdbPluginClient > rdbplugin/v1/mock_rdbplugin/rdbplugin_mock.go
mockgen code.storageos.net/storageos/service/filesystem/v1 FsClient > filesystem/v1/mock_filesystem/filesystem_mock.go
Expand All @@ -63,7 +68,7 @@ go-mocks:

cxx: ${GRPC_CPP_OBJ} ${PBUF_CPP_OBJ}

clean: grpc_clean vis_clean
clean: grpc_clean vis_clean mock_clean

distclean: clean

Expand All @@ -74,6 +79,13 @@ grpc: $(GRPC_OBJ)
grpc_clean:
rm -f $(GRPC_ALLOBJ)

mock_clean:
for dir in dbplugin/v1/mock_rdbplugin filesystem/v1/mock_filesystem \
director/v1/mock_director directfs/v1/mock_directfs stats/v1/mock_stats; \
do \
rm -f $$dir/*.go; \
done

vis:
cd visualiser && $(MAKE)

Expand Down
12 changes: 6 additions & 6 deletions directfs/v1/directfs.pb.go

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

8 changes: 4 additions & 4 deletions director/v1/director.pb.go

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

8 changes: 4 additions & 4 deletions filesystem/v1/filesystem.pb.go

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

8 changes: 4 additions & 4 deletions rdbplugin/v1/rdbplugin.pb.go

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

8 changes: 4 additions & 4 deletions stats/v1/stats.pb.go

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

8 changes: 4 additions & 4 deletions supervisor/v1/supervisor.pb.go

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

2 changes: 1 addition & 1 deletion vendor/google.golang.org/grpc/.travis.yml

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

3 changes: 0 additions & 3 deletions vendor/google.golang.org/grpc/Makefile

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

5 changes: 5 additions & 0 deletions vendor/google.golang.org/grpc/balancer/balancer.go

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

Loading

0 comments on commit f4d8269

Please sign in to comment.