Skip to content

Commit 12b96c1

Browse files
Update protoc-gen-atlas-query-validate to v0.5.2
1 parent 184e5a4 commit 12b96c1

58 files changed

Lines changed: 22504 additions & 6 deletions

Some content is hidden

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

Dockerfile

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ RUN sed -e "s/@AATVersion/$AAT_VERSION/" \
4747
-e "s/@PGAVVersion/$PGAV_VERSION/" \
4848
-e "s/@PGPVersion/$PGP_VERSION/" \
4949
glide.yaml.tmpl > glide.yaml
50+
5051
RUN glide up --skip-test
5152
RUN cp -r vendor/* ${GOPATH}/src/
5253

@@ -59,16 +60,29 @@ RUN go install github.com/gogo/protobuf/protoc-gen-gogofaster
5960
RUN go install github.com/gogo/protobuf/protoc-gen-gogoslick
6061
RUN go install github.com/gogo/protobuf/protoc-gen-gogotypes
6162
RUN go install github.com/gogo/protobuf/protoc-gen-gostring
63+
64+
RUN mkdir -p ${GOPATH}/src/github.com/chrusty/ && \
65+
cd ${GOPATH}/src/github.com/chrusty && \
66+
git clone --single-branch -b master https://github.com/chrusty/protoc-gen-jsonschema.git && \
67+
cd protoc-gen-jsonschema && git checkout cd4ff2f197c77b367ad30891c21d4ba94ff17600
6268
RUN go get github.com/chrusty/protoc-gen-jsonschema/cmd/protoc-gen-jsonschema
6369
RUN go install github.com/chrusty/protoc-gen-jsonschema/cmd/protoc-gen-jsonschema
70+
6471
RUN go install github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
6572
RUN go install github.com/envoyproxy/protoc-gen-validate
6673
RUN go install github.com/mwitkow/go-proto-validators/protoc-gen-govalidators
6774
RUN go install github.com/pseudomuto/protoc-gen-doc/cmd/...
6875
RUN go install github.com/infobloxopen/protoc-gen-preprocess
76+
77+
RUN rm -rf github.com/infobloxopen/protoc-gen-gorm/ && mkdir -p github.com/infobloxopen/protoc-gen-gorm/
78+
RUN rm -rf vendor/github.com/infobloxopen/protoc-gen-gorm/ && mkdir -p vendor/github.com/infobloxopen/protoc-gen-gorm/
79+
COPY github.com/infobloxopen/protoc-gen-gorm/ ${GOPATH}/src/github.com/infobloxopen/protoc-gen-gorm/
80+
COPY github.com/infobloxopen/protoc-gen-gorm/ vendor/github.com/infobloxopen/protoc-gen-gorm/
81+
6982
RUN go install \
70-
-ldflags "-X github.com/infobloxopen/protoc-gen-gorm/plugin.ProtocGenGormVersion=$PGG_VERSION -X github.com/infobloxopen/protoc-gen-gorm/plugin.AtlasAppToolkitVersion=$AAT_VERSION" \
83+
-ldflags "-X github.com/infobloxopen/protoc-gen-gorm/plugin.ProtocGenGormVersion=v0.21.0 -X github.com/infobloxopen/protoc-gen-gorm/plugin.AtlasAppToolkitVersion=v0.25.1" \
7184
github.com/infobloxopen/protoc-gen-gorm
85+
7286
# Download all dependencies of protoc-gen-atlas-query-validate
7387
RUN cd ${GOPATH}/src/github.com/infobloxopen/protoc-gen-atlas-query-validate && dep ensure -vendor-only
7488
RUN go install github.com/infobloxopen/protoc-gen-atlas-query-validate

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ versioned:
3131
--build-arg PGAQV_VERSION=$(PGAQVVersion) \
3232
--build-arg PGAV_VERSION=$(PGAVVersion) \
3333
--build-arg PGP_VERSION=$(PGPVersion) \
34-
-t $(IMAGE_NAME):$(IMAGE_VERSION) .
34+
-t $(IMAGE_NAME):v23.1 .
3535

3636
.PHONY: clean
3737
clean:
@@ -43,7 +43,7 @@ test: test-gen test-check test-clean
4343

4444
test-gen:
4545
docker run --rm -v $(SRCROOT_ON_HOST):$(SRCROOT_IN_CONTAINER) \
46-
infoblox/atlas-gentool:latest \
46+
infoblox/atlas-gentool:v23.1 \
4747
--go_out=plugins=grpc:. \
4848
--grpc-gateway_out=logtostderr=true:. \
4949
--validate_out="lang=go:." \
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
vendor
2+
trigger-travis.sh
3+
4+
# Binaries for programs and plugins
5+
*.exe
6+
*.dll
7+
*.so
8+
*.dylib
9+
10+
# Test binary, build with `go test -c`
11+
*.test
12+
13+
# Output of the go coverage tool, specifically when used with LiteIDE
14+
*.out
15+
16+
# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736
17+
.glide/
18+
19+
# IDE-specific settings files
20+
.idea
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
sudo: required
2+
3+
services:
4+
- docker
5+
6+
language: go
7+
8+
go:
9+
- "1.10"
10+
11+
env:
12+
- DEP_VERSION="0.4.1"
13+
14+
install:
15+
# Download and install dep
16+
- curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep
17+
- chmod +x $GOPATH/bin/dep
18+
19+
script:
20+
- make gentool-test
21+
22+
# Trigger build/push of latest gentool
23+
deploy:
24+
provider: script
25+
script: curl -LO --retry 3 https://raw.github.com/mernst/plume-lib/master/bin/trigger-travis.sh && sh trigger-travis.sh infobloxopen atlas-gentool $TRAVIS_ACCESS_TOKEN

0 commit comments

Comments
 (0)