Skip to content

Commit

Permalink
upgrade atlas app toolkit to v2 (#264)
Browse files Browse the repository at this point in the history
* upgrade atlas app toolkit to v2

* gorm v2

* go mod tidy / vendor
  • Loading branch information
brocwoodworthIBLX committed Mar 13, 2024
1 parent 4aa3400 commit 3d47392
Show file tree
Hide file tree
Showing 13 changed files with 116 additions and 39 deletions.
2 changes: 1 addition & 1 deletion example/feature_demo/demo_multi_file.pb.gorm.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package example
import (
context "context"
fmt "fmt"
gateway "github.com/infobloxopen/atlas-app-toolkit/gateway"
gateway "github.com/infobloxopen/atlas-app-toolkit/v2/gateway"
errors "github.com/infobloxopen/protoc-gen-gorm/errors"
go_uuid "github.com/satori/go.uuid"
field_mask "google.golang.org/genproto/protobuf/field_mask"
Expand Down
2 changes: 1 addition & 1 deletion example/feature_demo/demo_multi_file_service.pb.go

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

2 changes: 1 addition & 1 deletion example/feature_demo/demo_service.pb.go

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

6 changes: 3 additions & 3 deletions example/feature_demo/demo_service.pb.gorm.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
context "context"
json "encoding/json"
fmt "fmt"
gateway "github.com/infobloxopen/atlas-app-toolkit/gateway"
gorm1 "github.com/infobloxopen/atlas-app-toolkit/gorm"
query "github.com/infobloxopen/atlas-app-toolkit/query"
gateway "github.com/infobloxopen/atlas-app-toolkit/v2/gateway"
gorm1 "github.com/infobloxopen/atlas-app-toolkit/v2/gorm"
query "github.com/infobloxopen/atlas-app-toolkit/v2/query"
errors "github.com/infobloxopen/protoc-gen-gorm/errors"
trace "go.opencensus.io/trace"
field_mask "google.golang.org/genproto/protobuf/field_mask"
Expand Down
4 changes: 2 additions & 2 deletions example/feature_demo/demo_types.pb.gorm.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package example
import (
context "context"
fmt "fmt"
gateway "github.com/infobloxopen/atlas-app-toolkit/gateway"
gorm1 "github.com/infobloxopen/atlas-app-toolkit/gorm"
gateway "github.com/infobloxopen/atlas-app-toolkit/v2/gateway"
gorm1 "github.com/infobloxopen/atlas-app-toolkit/v2/gorm"
auth "github.com/infobloxopen/protoc-gen-gorm/auth"
errors "github.com/infobloxopen/protoc-gen-gorm/errors"
user "github.com/infobloxopen/protoc-gen-gorm/example/user"
Expand Down
2 changes: 1 addition & 1 deletion example/postgres_arrays/postgres_arrays.pb.gorm.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package postgres_arrays
import (
context "context"
fmt "fmt"
gateway "github.com/infobloxopen/atlas-app-toolkit/gateway"
gateway "github.com/infobloxopen/atlas-app-toolkit/v2/gateway"
errors "github.com/infobloxopen/protoc-gen-gorm/errors"
pq "github.com/lib/pq"
field_mask "google.golang.org/genproto/protobuf/field_mask"
Expand Down
2 changes: 1 addition & 1 deletion example/user/user.pb.go

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

6 changes: 3 additions & 3 deletions example/user/user.pb.gorm.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package user
import (
context "context"
fmt "fmt"
gateway "github.com/infobloxopen/atlas-app-toolkit/gateway"
gorm1 "github.com/infobloxopen/atlas-app-toolkit/gorm"
resource "github.com/infobloxopen/atlas-app-toolkit/gorm/resource"
gateway "github.com/infobloxopen/atlas-app-toolkit/v2/gateway"
gorm1 "github.com/infobloxopen/atlas-app-toolkit/v2/gorm"
resource "github.com/infobloxopen/atlas-app-toolkit/v2/gorm/resource"
auth "github.com/infobloxopen/protoc-gen-gorm/auth"
errors "github.com/infobloxopen/protoc-gen-gorm/errors"
field_mask "google.golang.org/genproto/protobuf/field_mask"
Expand Down
27 changes: 20 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,21 +1,34 @@
module github.com/infobloxopen/protoc-gen-gorm

require (
github.com/golang-jwt/jwt/v4 v4.4.1
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/golang/protobuf v1.5.2
github.com/google/go-cmp v0.5.8
github.com/grpc-ecosystem/go-grpc-middleware v1.2.2
github.com/infobloxopen/atlas-app-toolkit v1.2.2-0.20220721202134-28480c4993fc
github.com/jackc/pgtype v1.11.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/infobloxopen/atlas-app-toolkit/v2 v2.2.1-0.20240313220428-5449c0c2a27f
github.com/jinzhu/inflection v1.0.0
github.com/jinzhu/now v1.1.5 // indirect
github.com/lib/pq v1.10.2
github.com/satori/go.uuid v1.2.0
go.opencensus.io v0.23.0
google.golang.org/genproto v0.0.0-20220722212130-b98a9ff5e252
google.golang.org/grpc v1.48.0
google.golang.org/protobuf v1.28.0
google.golang.org/protobuf v1.32.0
gorm.io/gorm v1.23.2
)

go 1.16
require (
github.com/go-sql-driver/mysql v1.6.0 // indirect
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.5.0 // indirect
github.com/jackc/pgtype v1.11.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/stretchr/testify v1.8.4 // 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
gorm.io/datatypes v1.0.6 // indirect
gorm.io/driver/mysql v1.3.2 // indirect
)

go 1.17
Loading

0 comments on commit 3d47392

Please sign in to comment.