Skip to content

Commit 794d2b1

Browse files
upgrade v2 references (#420)
* upgrade references to v2 * . * . * .
1 parent d407d80 commit 794d2b1

File tree

12 files changed

+181
-159
lines changed

12 files changed

+181
-159
lines changed

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ check-fmt:
2323
test -z `go fmt ./...`
2424

2525
.gen-query:
26-
docker run --rm -v $(PROJECT_ROOT):/go/src/$(REPO) $(GENTOOL_IMAGE) \
26+
docker run --rm -v $(PROJECT_ROOT):/go/src/$(REPO)/v2 $(GENTOOL_IMAGE) \
2727
--go_out=:. $(REPO)/query/collection_operators.proto
2828

2929
.gen-errdetails:
30-
docker run --rm -v $(PROJECT_ROOT):/go/src/$(REPO) $(GENTOOL_IMAGE) \
30+
docker run --rm -v $(PROJECT_ROOT):/go/src/$(REPO)/v2 $(GENTOOL_IMAGE) \
3131
--go_out=:. $(REPO)/rpc/errdetails/error_details.proto
3232

3333
.gen-errfields:
34-
docker run --rm -v $(PROJECT_ROOT):/go/src/$(REPO) $(GENTOOL_IMAGE) \
34+
docker run --rm -v $(PROJECT_ROOT):/go/src/$(REPO)/v2 $(GENTOOL_IMAGE) \
3535
--go_out=:. $(REPO)/rpc/errfields/error_fields.proto
3636

3737
.gen-servertestdata:
38-
docker run --rm -v $(PROJECT_ROOT):/go/src/$(REPO) $(GENTOOL_IMAGE) \
39-
--go_out=plugins=grpc:. --grpc-gateway_out=logtostderr=true:. $(REPO)/server/testdata/test.proto
38+
docker run --rm -v $(PROJECT_ROOT):/go/src/$(REPO)/v2 $(GENTOOL_IMAGE) \
39+
--go_out=. --go-grpc_out=. --grpc-gateway_out=logtostderr=true:. $(REPO)/v2/server/testdata/test.proto
4040

4141
.PHONY: gen
42-
gen: .gen-query .gen-errdetails .gen-errfields
42+
gen: .gen-query .gen-errdetails .gen-errfields .gen-servertestdata
4343

4444
.PHONY: mocks
4545
mocks:

gateway/internal/test.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package infoblox.test;
44

55
import "wrappers.proto";
66

7-
option go_package = "github.com/infobloxopen/atlas-app-toolkit/gateway;gateway_test";
7+
option go_package = "github.com/infobloxopen/atlas-app-toolkit/v2/gateway;gateway_test";
88

99
message User {
1010
string name = 1;

query/collection_operators.pb.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

query/collection_operators.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package infoblox.api;
44

55
import "protoc-gen-openapiv2/options/annotations.proto";
66

7-
option go_package = "github.com/infobloxopen/atlas-app-toolkit/query;query";
7+
option go_package = "github.com/infobloxopen/atlas-app-toolkit/v2/query;query";
88

99
// SortCriteria represents sort criteria
1010
message SortCriteria {

rpc/errdetails/error_details.pb.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rpc/errdetails/error_details.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ syntax = "proto3";
22

33
package atlas.rpc;
44

5-
option go_package = "github.com/infobloxopen/atlas-app-toolkit/rpc/errdetails;errdetails";
5+
option go_package = "github.com/infobloxopen/atlas-app-toolkit/v2/rpc/errdetails;errdetails";
66

77
// TargetInfo is a default representation of error details that conforms
88
// REST API Syntax Specification

rpc/errfields/error_fields.pb.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rpc/resource/resource.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package atlas.rpc;
44

55
import "protoc-gen-openapiv2/options/annotations.proto";
66

7-
option go_package = "github.com/infobloxopen/atlas-app-toolkit/rpc/resource;resource";
7+
option go_package = "github.com/infobloxopen/atlas-app-toolkit/v2/rpc/resource;resource";
88

99
// A number of application services require a mechanism to
1010
// encode the identity of a particular resource across applications.

0 commit comments

Comments
 (0)