upgrade v2 references (#420)

* upgrade references to v2 * . * . * .
infobloxopen · Mar 18, 2024 · 794d2b1 · 794d2b1
1 parent d407d80
commit 794d2b1
Show file tree

Hide file tree

Showing 12 changed files with 181 additions and 159 deletions.
diff --git a/Makefile b/Makefile
@@ -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:

diff --git a/gateway/internal/test.proto b/gateway/internal/test.proto
@@ -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;

diff --git a/query/collection_operators.pb.go b/query/collection_operators.pb.go
diff --git a/query/collection_operators.proto b/query/collection_operators.proto
@@ -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 {

diff --git a/rpc/errdetails/error_details.pb.go b/rpc/errdetails/error_details.pb.go
diff --git a/rpc/errdetails/error_details.proto b/rpc/errdetails/error_details.proto
@@ -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

diff --git a/rpc/errfields/error_fields.pb.go b/rpc/errfields/error_fields.pb.go
diff --git a/rpc/resource/resource.proto b/rpc/resource/resource.proto
@@ -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.