Skip to content

Commit cce3317

Browse files
committedJul 11, 2020
feat(api): add skips/replaces to listbundles api
the resolver needs this information grpc ecosystem changed since the last codegen, so this commit also includes all of the required tooling changes to generate via the latest tools
1 parent ca0a69c commit cce3317

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+8140
-1498
lines changed
 

‎Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,10 @@ vendor:
4444

4545
.PHONY: codegen
4646
codegen:
47-
protoc -I pkg/api/ --go_out=plugins=grpc:pkg/api pkg/api/*.proto
48-
protoc -I pkg/api/grpc_health_v1 --go_out=plugins=grpc:pkg/api/grpc_health_v1 pkg/api/grpc_health_v1/*.proto
47+
protoc -I pkg/api/ --go_out=pkg/api pkg/api/*.proto
48+
protoc -I pkg/api/ --go-grpc_out=pkg/api pkg/api/*.proto
49+
protoc -I pkg/api/grpc_health_v1 --go_out=pkg/api/grpc_health_v1 pkg/api/grpc_health_v1/*.proto
50+
protoc -I pkg/api/grpc_health_v1 --go-grpc_out=pkg/api/grpc_health_v1 pkg/api/grpc_health_v1/*.proto
4951

5052
.PHONY: container-codegen
5153
container-codegen:

‎codegen.Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
FROM golang:1.11-alpine
1+
FROM golang:1.13-alpine
22

33
RUN apk update && \
44
apk add make git protobuf
55

6-
ENV MODULE github.com/golang/protobuf
6+
ENV MODULE google.golang.org
77
ENV SRC ${GOPATH}/src/${MODULE}
88
COPY vendor/${MODULE} ${SRC}
9-
RUN echo $(ls ${SRC})
10-
RUN go install ${SRC}/proto ${SRC}/ptypes ${SRC}/protoc-gen-go
9+
RUN echo $(ls ${SRC})
10+
RUN go install ${SRC}/protobuf/proto ${SRC}/protobuf/cmd/protoc-gen-go ${SRC}/grpc/cmd/protoc-gen-go-grpc
1111

1212

1313
WORKDIR /codegen

0 commit comments

Comments
 (0)
Please sign in to comment.