Skip to content

Commit

Permalink
Upgrade ent from v0.11.0 to v0.12.3
Browse files Browse the repository at this point in the history
- Remove ent from bingo version control to avoid version incompatiblity
  between ent and entc
- Add `make/dep_ent.mk` file to update ent before running it
- Generate new ent files
- Disable golangci-list unparam linter to avoid panic due to
  golangci/golangci-lint#3711
  • Loading branch information
djjuhasz committed May 31, 2023
1 parent acda9f8 commit 4e3db4f
Show file tree
Hide file tree
Showing 32 changed files with 1,172 additions and 1,855 deletions.
6 changes: 0 additions & 6 deletions .bingo/Variables.mk

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

5 changes: 0 additions & 5 deletions .bingo/ent.mod

This file was deleted.

83 changes: 0 additions & 83 deletions .bingo/ent.sum

This file was deleted.

2 changes: 0 additions & 2 deletions .bingo/variables.env
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ fi

BINGO="${GOBIN}/bingo-v0.8.0"

ENT="${GOBIN}/ent-v0.11.0"

GO_MOD_UPGRADE="${GOBIN}/go-mod-upgrade-v0.9.1"

GOA="${GOBIN}/goa-v3.11.3"
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ linters:
- gofumpt
- importas
- gci
- unparam
# - unparam // https://github.com/golangci/golangci-lint/issues/3711
- gosec

issues:
Expand Down
7 changes: 5 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ MAKEDIR := hack/make

include hack/make/bootstrap.mk
include hack/make/dep_golangci_lint.mk
include hack/make/dep_ent.mk
include .bingo/Variables.mk

define NEWLINE
Expand Down Expand Up @@ -107,7 +108,9 @@ gen-mock:
$(MOCKGEN) -destination=./internal/watcher/fake/mock_watcher.go -package=fake github.com/artefactual-sdps/enduro/internal/watcher Service
$(MOCKGEN) -destination=./internal/api/auth/fake/mock_ticket_store.go -package=fake github.com/artefactual-sdps/enduro/internal/api/auth TicketStore

gen-ent:
$(ENT) generate ./internal/storage/persistence/ent/schema --feature sql/versioned-migration --target=./internal/storage/persistence/ent/db
gen-ent: $(ENT) ## Generate Ent assets.
ent generate ./internal/storage/persistence/ent/schema \
--feature sql/versioned-migration \
--target=./internal/storage/persistence/ent/db

.PHONY: *
26 changes: 13 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ module github.com/artefactual-sdps/enduro
go 1.20

require (
ariga.io/atlas v0.8.3
ariga.io/atlas v0.11.0
ariga.io/sqlcomment v0.1.0
chainguard.dev/go-oidctest v0.2.0
entgo.io/ent v0.11.4
entgo.io/ent v0.12.3
github.com/alicebob/miniredis/v2 v2.23.1
github.com/aws/aws-sdk-go v1.44.159
github.com/coreos/go-oidc/v3 v3.4.0
Expand Down Expand Up @@ -37,7 +37,7 @@ require (
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.14.0
github.com/stretchr/objx v0.5.0 // indirect
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.8.2
github.com/ulikunitz/xz v0.5.10 // indirect
go.buf.build/grpc/go/artefactual/a3m v1.4.3
go.temporal.io/api v1.13.0
Expand All @@ -47,15 +47,15 @@ require (
goa.design/goa/v3 v3.10.2
goa.design/plugins/v3 v3.10.2
gocloud.dev v0.27.0
golang.org/x/text v0.4.0 // indirect
golang.org/x/text v0.9.0 // indirect
google.golang.org/grpc v1.51.0
google.golang.org/protobuf v1.28.1 // indirect
gopkg.in/square/go-jose.v2 v2.6.0
gotest.tools/v3 v3.4.0
)

require (
github.com/agext/levenshtein v1.2.1 // indirect
github.com/agext/levenshtein v1.2.3 // indirect
github.com/alicebob/gopher-json v0.0.0-20200520072559-a9ecdc9d1d3a // indirect
github.com/andybalholm/brotli v1.0.4 // indirect
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
Expand Down Expand Up @@ -97,15 +97,15 @@ require (
github.com/googleapis/gax-go/v2 v2.6.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/hcl/v2 v2.13.0 // indirect
github.com/hashicorp/hcl/v2 v2.16.2 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/klauspost/compress v1.15.1 // indirect
github.com/klauspost/pgzip v1.2.5 // indirect
github.com/kr/fs v0.1.0 // indirect
github.com/magiconair/properties v1.8.6 // indirect
github.com/manveru/faker v0.0.0-20171103152722-9fbc68a78c4d // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/nwaples/rardecode v1.1.2 // indirect
github.com/pelletier/go-toml v1.9.5 // indirect
Expand All @@ -125,18 +125,18 @@ require (
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
github.com/yuin/gopher-lua v0.0.0-20220504180219-658193537a64 // indirect
github.com/zach-klippenstein/goregen v0.0.0-20160303162051-795b5e3961ea // indirect
github.com/zclconf/go-cty v1.8.0 // indirect
go.opencensus.io v0.23.0 // indirect
github.com/zclconf/go-cty v1.13.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel v1.7.0 // indirect
go.opentelemetry.io/otel/trace v1.7.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/net v0.1.0 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sys v0.1.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
golang.org/x/tools v0.2.0 // indirect
golang.org/x/tools v0.9.1 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/api v0.102.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
Expand Down
Loading

0 comments on commit 4e3db4f

Please sign in to comment.