Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgrade v2 references #420

Merged
merged 4 commits into from
Mar 18, 2024
Merged

upgrade v2 references #420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3af5c2b
upgrade references to v2
brocwoodworthIBLX Mar 18, 2024
49cb13f
.
brocwoodworthIBLX Mar 18, 2024
bd4b149
.
brocwoodworthIBLX Mar 18, 2024
4b51ecd
.
brocwoodworthIBLX Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ check-fmt:
test -z `go fmt ./...`

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

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

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

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

.PHONY: gen
gen: .gen-query .gen-errdetails .gen-errfields
gen: .gen-query .gen-errdetails .gen-errfields .gen-servertestdata

.PHONY: mocks
mocks:
Expand Down
2 changes: 1 addition & 1 deletion gateway/internal/test.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package infoblox.test;

import "wrappers.proto";

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

message User {
string name = 1;
Expand Down
10 changes: 5 additions & 5 deletions query/collection_operators.pb.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion query/collection_operators.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package infoblox.api;

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

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

// SortCriteria represents sort criteria
message SortCriteria {
Expand Down
4 changes: 2 additions & 2 deletions rpc/errdetails/error_details.pb.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion rpc/errdetails/error_details.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ syntax = "proto3";

package atlas.rpc;

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

// TargetInfo is a default representation of error details that conforms
// REST API Syntax Specification
Expand Down
4 changes: 2 additions & 2 deletions rpc/errfields/error_fields.pb.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion rpc/resource/resource.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package atlas.rpc;

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

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

// A number of application services require a mechanism to
// encode the identity of a particular resource across applications.
Expand Down
Loading
Loading