update atlas-app-toolkit dependency to v2 (#21)

Calebjh · web-flow · commit e09cf379409c · 2024-03-19T09:49:19.000-07:00
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.13.0-alpine AS builder
+FROM golang:1.19.0-alpine AS builder
 
 LABEL stage=server-intermediate
 
diff --git a/example/example.pb.atlas.query.validate.go b/example/example.pb.atlas.query.validate.go
@@ -1,7 +1,7 @@
 package example
 
 import (
-	query "github.com/infobloxopen/atlas-app-toolkit/query"
+	query "github.com/infobloxopen/atlas-app-toolkit/v2/query"
 	options "github.com/infobloxopen/protoc-gen-atlas-query-validate/options"
 )
 
diff --git a/example/example.proto b/example/example.proto
@@ -4,7 +4,7 @@ package example;
 
 import "google/protobuf/wrappers.proto";
 import "github.com/infobloxopen/protoc-gen-atlas-query-validate/options/query_validate.proto";
-import "github.com/infobloxopen/atlas-app-toolkit/query/collection_operators.proto";
+import "github.com/infobloxopen/atlas-app-toolkit/v2/query/collection_operators.proto";
 
 option go_package = "github.com/infobloxopen/protoc-gen-atlas-query-validate/example;example";
 
diff --git a/example/example_test.go b/example/example_test.go
@@ -3,7 +3,7 @@ package example
 import (
 	"testing"
 
-	"github.com/infobloxopen/atlas-app-toolkit/query"
+	"github.com/infobloxopen/atlas-app-toolkit/v2/query"
 )
 
 func TestValidateFiltering(t *testing.T) {
diff --git a/go.mod b/go.mod
@@ -3,16 +3,16 @@ module github.com/infobloxopen/protoc-gen-atlas-query-validate
 go 1.19
 
 require (
-	github.com/infobloxopen/atlas-app-toolkit v0.24.1-0.20210416193901-4c7518b07e08
-	google.golang.org/protobuf v1.27.1
+	github.com/infobloxopen/atlas-app-toolkit/v2 v2.2.1
+	google.golang.org/protobuf v1.33.0
 )
 
 require (
-	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0 // indirect
-	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect
-	golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect
-	golang.org/x/text v0.3.5 // indirect
+	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced // indirect
 	google.golang.org/grpc v1.38.0 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/options/query_validate.pb.go b/options/query_validate.pb.go
diff --git a/options/validate.go b/options/validate.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/infobloxopen/atlas-app-toolkit/query"
+	"github.com/infobloxopen/atlas-app-toolkit/v2/query"
 )
 
 type FilteringOptions struct {
diff --git a/plugin/plugin.go b/plugin/plugin.go
@@ -687,7 +687,7 @@ func (p *QueryValidateBuilder) getDenyRules(fieldName string, opts *options.Quer
 }
 
 func (p *QueryValidateBuilder) genValidateFiltering(g *protogen.GeneratedFile) {
-	generateImport("Filtering", "github.com/infobloxopen/atlas-app-toolkit/query", g)
+	generateImport("Filtering", "github.com/infobloxopen/atlas-app-toolkit/v2/query", g)
 	g.P(`func `, p.validateFilteringMethodName, `(methodName string, f *query.Filtering) error {`)
 	g.P(`info, ok := `, p.requiredFilteringValidationVarName, `[methodName]`)
 	g.P(`if !ok {`)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.13.0-alpine AS builder`
	`1`	`+FROM golang:1.19.0-alpine AS builder`
`2`	`2`
`3`	`3`	`LABEL stage=server-intermediate`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package example`
`2`	`2`
`3`	`3`	`import (`
`4`		`- query "github.com/infobloxopen/atlas-app-toolkit/query"`
	`4`	`+ query "github.com/infobloxopen/atlas-app-toolkit/v2/query"`
`5`	`5`	`options "github.com/infobloxopen/protoc-gen-atlas-query-validate/options"`
`6`	`6`	`)`
`7`	`7`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package example`
`3`	`3`	`import (`
`4`	`4`	`"testing"`
`5`	`5`
`6`		`- "github.com/infobloxopen/atlas-app-toolkit/query"`
	`6`	`+ "github.com/infobloxopen/atlas-app-toolkit/v2/query"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`func TestValidateFiltering(t *testing.T) {`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"strconv"`
`6`	`6`	`"strings"`
`7`	`7`
`8`		`- "github.com/infobloxopen/atlas-app-toolkit/query"`
	`8`	`+ "github.com/infobloxopen/atlas-app-toolkit/v2/query"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`type FilteringOptions struct {`
Original file line number	Diff line number	Diff line change
`@@ -687,7 +687,7 @@ func (p QueryValidateBuilder) getDenyRules(fieldName string, opts options.Quer`
`687`	`687`	`}`
`688`	`688`
`689`	`689`	`func (p QueryValidateBuilder) genValidateFiltering(g protogen.GeneratedFile) {`
`690`		`- generateImport("Filtering", "github.com/infobloxopen/atlas-app-toolkit/query", g)`
	`690`	`+ generateImport("Filtering", "github.com/infobloxopen/atlas-app-toolkit/v2/query", g)`
`691`	`691`	g.P(`func `, p.validateFilteringMethodName, `(methodName string, f *query.Filtering) error {`)
`692`	`692`	g.P(`info, ok := `, p.requiredFilteringValidationVarName, `[methodName]`)
`693`	`693`	g.P(`if !ok {`)