Skip to content

Commit

Permalink
chore: replace dependency xormplus => xorm in pipeline and recover xo…
Browse files Browse the repository at this point in the history
…rmplus version in hepa (erda-project#6294)

* replace xormplus as xorm in pipeline

* recover hepa dependency as xormplus

* fix: fix error in replacing xorm dependency

* add unit-test

* fix: use hint index to instead Alias

* fix: cron soft_delete_at is null
  • Loading branch information
Malyue authored Mar 6, 2024
1 parent 5bd7dfa commit 83f1a05
Show file tree
Hide file tree
Showing 22 changed files with 184 additions and 150 deletions.
39 changes: 22 additions & 17 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ require (
github.com/dustin/go-humanize v1.0.1
github.com/elastic/cloud-on-k8s/v2 v2.0.0-20221101080201-221fa719f43b
github.com/elazarl/goproxy v0.0.0-20200421181703-e76ad31c14f6
github.com/erda-project/erda-infra v1.0.10-0.20240222084112-a1855460513d
github.com/erda-project/erda-infra v1.0.10-0.20240304025511-5ad9063e748b
github.com/erda-project/erda-infra/tools v0.0.0-20231213094429-67b1657b3593
github.com/erda-project/erda-oap-thirdparty-protocol v0.0.0-20210907135609-15886a136d5b
github.com/erda-project/erda-proto-go v1.4.0
Expand All @@ -67,7 +67,7 @@ require (
github.com/go-openapi/strfmt v0.19.5
github.com/go-playground/validator v9.31.0+incompatible
github.com/go-redis/redis v6.15.9+incompatible
github.com/go-sql-driver/mysql v1.6.0
github.com/go-sql-driver/mysql v1.7.0
github.com/gobwas/glob v0.2.3
github.com/gocql/gocql v0.0.0-20210707082121-9a3953d1826d
github.com/gofrs/flock v0.8.0
Expand Down Expand Up @@ -144,14 +144,14 @@ require (
github.com/spf13/cast v1.5.0
github.com/spf13/cobra v1.7.0
github.com/spotify/flink-on-k8s-operator v0.4.0
github.com/stretchr/testify v1.8.2
github.com/stretchr/testify v1.8.4
github.com/t-tiger/gorm-bulk-insert v1.3.0
github.com/tealeg/xlsx/v3 v3.3.2
github.com/varstr/uaparser v0.0.0-20170929040706-6aabb7c4e98c
github.com/xeipuuv/gojsonschema v1.2.0
github.com/xormplus/builder v0.0.0-20200331055651-240ff40009be
github.com/xormplus/core v0.0.0-20200308074340-f3bce19d5f31
github.com/xormplus/xorm v0.0.0-20210822100304-4e1d4fcc1e67
github.com/xormplus/builder v0.0.0-20181220055446-b12ceebee76f
github.com/xormplus/core v0.0.0-20181016121923-6bfce2eb8867
github.com/xormplus/xorm v0.0.0-20181212020813-da46657160ff
go.etcd.io/etcd v0.5.0-alpha.5.0.20200910180754-dd1b699fc489
go.opentelemetry.io/otel v1.14.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.3.0
Expand All @@ -161,9 +161,9 @@ require (
go.opentelemetry.io/proto/otlp v0.11.0
go.uber.org/automaxprocs v1.5.1
go.uber.org/ratelimit v0.2.0
golang.org/x/net v0.7.0
golang.org/x/net v0.10.0
golang.org/x/sync v0.1.0
golang.org/x/text v0.7.0
golang.org/x/text v0.12.0
golang.org/x/time v0.0.0-20220609170525-579cf78fd858
google.golang.org/genproto v0.0.0-20220915135415-7fd63a7952de
google.golang.org/grpc v1.48.0
Expand Down Expand Up @@ -197,10 +197,11 @@ require (
k8s.io/kubectl v0.21.0
k8s.io/kubernetes v1.21.0
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
modernc.org/mathutil v1.0.0
modernc.org/mathutil v1.5.0
sigs.k8s.io/controller-runtime v0.13.1
sigs.k8s.io/sig-storage-lib-external-provisioner/v6 v6.3.0
sigs.k8s.io/yaml v1.3.0
xorm.io/xorm v1.3.8
)

require (
Expand Down Expand Up @@ -301,6 +302,8 @@ require (
github.com/go-playground/locales v0.14.0 // indirect
github.com/go-playground/universal-translator v0.18.0 // indirect
github.com/go-playground/validator/v10 v10.4.1 // indirect
github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a // indirect
github.com/goccy/go-json v0.8.1 // indirect
github.com/gogap/stack v0.0.0-20150131034635-fef68dddd4f8 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.0.0 // indirect
Expand All @@ -323,6 +326,7 @@ require (
github.com/igm/sockjs-go v3.0.0+incompatible // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jackc/pgx v3.6.2+incompatible // indirect
github.com/jcchavezs/porto v0.1.0 // indirect
github.com/jcmturner/aescts/v2 v2.0.0 // indirect
github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
Expand All @@ -345,12 +349,12 @@ require (
github.com/leodido/go-urn v1.2.1 // indirect
github.com/lestrrat/go-envload v0.0.0-20180220120943-6ed08b54a570 // indirect
github.com/lestrrat/go-strftime v0.0.0-20180220042222-ba3bf9c1d042 // indirect
github.com/lib/pq v1.10.1 // indirect
github.com/lib/pq v1.10.7 // indirect
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-runewidth v0.0.10 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/miekg/dns v1.1.43 // indirect
Expand Down Expand Up @@ -388,7 +392,7 @@ require (
github.com/rancher/norman v0.0.0-20210423002317-8e6ffc77a819 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/recallsong/unmarshal v1.0.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20190728182440-6a916e37a237 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
github.com/richardlehane/mscfb v1.0.3 // indirect
github.com/richardlehane/msoleps v1.0.1 // indirect
github.com/rivo/uniseg v0.2.0 // indirect
Expand Down Expand Up @@ -442,13 +446,13 @@ require (
go.uber.org/multierr v1.9.0 // indirect
go.uber.org/zap v1.24.0 // indirect
golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/mod v0.8.0 // indirect
golang.org/x/oauth2 v0.1.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/tools v0.2.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/term v0.11.0 // indirect
golang.org/x/tools v0.6.0 // indirect
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/api v0.96.0 // indirect
Expand All @@ -470,6 +474,7 @@ require (
sigs.k8s.io/kustomize/api v0.8.8 // indirect
sigs.k8s.io/kustomize/kyaml v0.10.17 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
xorm.io/builder v0.3.11-0.20220531020008-1bd24a7dc978 // indirect
)

replace (
Expand Down
Loading

0 comments on commit 83f1a05

Please sign in to comment.