From 302180011e5f90fb629d24eb772954685653c8f7 Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Sun, 7 May 2023 15:12:35 +0200 Subject: [PATCH] updated deps; regen ent --- ent/dbpackage.go | 14 ++++- ent/dbpackage/dbpackage.go | 120 +++++++++++++++++++++++++++++++++++++ ent/dbpackage_create.go | 4 +- ent/dbpackage_delete.go | 2 +- ent/dbpackage_query.go | 6 +- ent/dbpackage_update.go | 4 +- ent/ent.go | 56 ++++++++--------- ent/runtime/runtime.go | 4 +- go.mod | 16 ++--- go.sum | 40 ++++++------- 10 files changed, 192 insertions(+), 74 deletions(-) diff --git a/ent/dbpackage.go b/ent/dbpackage.go index c0ca868..56092c9 100644 --- a/ent/dbpackage.go +++ b/ent/dbpackage.go @@ -8,6 +8,7 @@ import ( "strings" "time" + "entgo.io/ent" "entgo.io/ent/dialect/sql" "somegit.dev/ALHP/ALHP.GO/ent/dbpackage" ) @@ -62,7 +63,8 @@ type DbPackage struct { // SrcinfoHash holds the value of the "srcinfo_hash" field. SrcinfoHash string `json:"srcinfo_hash,omitempty"` // Pkgbuild holds the value of the "pkgbuild" field. - Pkgbuild string `json:"pkgbuild,omitempty"` + Pkgbuild string `json:"pkgbuild,omitempty"` + selectValues sql.SelectValues } // scanValues returns the types for scanning values from sql.Rows. @@ -79,7 +81,7 @@ func (*DbPackage) scanValues(columns []string) ([]any, error) { case dbpackage.FieldBuildTimeStart, dbpackage.FieldUpdated, dbpackage.FieldLastVerified: values[i] = new(sql.NullTime) default: - return nil, fmt.Errorf("unexpected column %q for type DbPackage", columns[i]) + values[i] = new(sql.UnknownType) } } return values, nil @@ -245,11 +247,19 @@ func (dp *DbPackage) assignValues(columns []string, values []any) error { } else if value.Valid { dp.Pkgbuild = value.String } + default: + dp.selectValues.Set(columns[i], values[i]) } } return nil } +// Value returns the ent.Value that was dynamically selected and assigned to the DbPackage. +// This includes values selected through modifiers, order, etc. +func (dp *DbPackage) Value(name string) (ent.Value, error) { + return dp.selectValues.Get(name) +} + // Update returns a builder for updating this DbPackage. // Note that you need to call DbPackage.Unwrap() before calling this method if this DbPackage // was returned from a transaction, and the transaction was committed or rolled back. diff --git a/ent/dbpackage/dbpackage.go b/ent/dbpackage/dbpackage.go index 717de70..31da40d 100644 --- a/ent/dbpackage/dbpackage.go +++ b/ent/dbpackage/dbpackage.go @@ -4,6 +4,8 @@ package dbpackage import ( "fmt" + + "entgo.io/ent/dialect/sql" ) const ( @@ -217,3 +219,121 @@ func DebugSymbolsValidator(ds DebugSymbols) error { return fmt.Errorf("dbpackage: invalid enum value for debug_symbols field: %q", ds) } } + +// OrderOption defines the ordering options for the DbPackage queries. +type OrderOption func(*sql.Selector) + +// ByID orders the results by the id field. +func ByID(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldID, opts...).ToFunc() +} + +// ByPkgbase orders the results by the pkgbase field. +func ByPkgbase(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldPkgbase, opts...).ToFunc() +} + +// ByStatus orders the results by the status field. +func ByStatus(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldStatus, opts...).ToFunc() +} + +// BySkipReason orders the results by the skip_reason field. +func BySkipReason(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSkipReason, opts...).ToFunc() +} + +// ByRepository orders the results by the repository field. +func ByRepository(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldRepository, opts...).ToFunc() +} + +// ByMarch orders the results by the march field. +func ByMarch(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldMarch, opts...).ToFunc() +} + +// ByVersion orders the results by the version field. +func ByVersion(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldVersion, opts...).ToFunc() +} + +// ByRepoVersion orders the results by the repo_version field. +func ByRepoVersion(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldRepoVersion, opts...).ToFunc() +} + +// ByBuildTimeStart orders the results by the build_time_start field. +func ByBuildTimeStart(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldBuildTimeStart, opts...).ToFunc() +} + +// ByUpdated orders the results by the updated field. +func ByUpdated(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldUpdated, opts...).ToFunc() +} + +// ByHash orders the results by the hash field. +func ByHash(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldHash, opts...).ToFunc() +} + +// ByLto orders the results by the lto field. +func ByLto(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldLto, opts...).ToFunc() +} + +// ByLastVersionBuild orders the results by the last_version_build field. +func ByLastVersionBuild(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldLastVersionBuild, opts...).ToFunc() +} + +// ByLastVerified orders the results by the last_verified field. +func ByLastVerified(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldLastVerified, opts...).ToFunc() +} + +// ByDebugSymbols orders the results by the debug_symbols field. +func ByDebugSymbols(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldDebugSymbols, opts...).ToFunc() +} + +// ByMaxRss orders the results by the max_rss field. +func ByMaxRss(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldMaxRss, opts...).ToFunc() +} + +// ByUTime orders the results by the u_time field. +func ByUTime(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldUTime, opts...).ToFunc() +} + +// BySTime orders the results by the s_time field. +func BySTime(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSTime, opts...).ToFunc() +} + +// ByIoIn orders the results by the io_in field. +func ByIoIn(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldIoIn, opts...).ToFunc() +} + +// ByIoOut orders the results by the io_out field. +func ByIoOut(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldIoOut, opts...).ToFunc() +} + +// BySrcinfo orders the results by the srcinfo field. +func BySrcinfo(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSrcinfo, opts...).ToFunc() +} + +// BySrcinfoHash orders the results by the srcinfo_hash field. +func BySrcinfoHash(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldSrcinfoHash, opts...).ToFunc() +} + +// ByPkgbuild orders the results by the pkgbuild field. +func ByPkgbuild(opts ...sql.OrderTermOption) OrderOption { + return sql.OrderByField(FieldPkgbuild, opts...).ToFunc() +} diff --git a/ent/dbpackage_create.go b/ent/dbpackage_create.go index b0dde65..f2ce0e0 100644 --- a/ent/dbpackage_create.go +++ b/ent/dbpackage_create.go @@ -318,7 +318,7 @@ func (dpc *DbPackageCreate) Mutation() *DbPackageMutation { // Save creates the DbPackage in the database. func (dpc *DbPackageCreate) Save(ctx context.Context) (*DbPackage, error) { dpc.defaults() - return withHooks[*DbPackage, DbPackageMutation](ctx, dpc.sqlSave, dpc.mutation, dpc.hooks) + return withHooks(ctx, dpc.sqlSave, dpc.mutation, dpc.hooks) } // SaveX calls Save and panics if Save returns an error. @@ -545,8 +545,8 @@ func (dpcb *DbPackageCreateBulk) Save(ctx context.Context) ([]*DbPackage, error) return nil, err } builder.mutation = mutation - nodes[i], specs[i] = builder.createSpec() var err error + nodes[i], specs[i] = builder.createSpec() if i < len(mutators)-1 { _, err = mutators[i+1].Mutate(root, dpcb.builders[i+1].mutation) } else { diff --git a/ent/dbpackage_delete.go b/ent/dbpackage_delete.go index 9c3d6e2..db324fd 100644 --- a/ent/dbpackage_delete.go +++ b/ent/dbpackage_delete.go @@ -27,7 +27,7 @@ func (dpd *DbPackageDelete) Where(ps ...predicate.DbPackage) *DbPackageDelete { // Exec executes the deletion query and returns how many vertices were deleted. func (dpd *DbPackageDelete) Exec(ctx context.Context) (int, error) { - return withHooks[int, DbPackageMutation](ctx, dpd.sqlExec, dpd.mutation, dpd.hooks) + return withHooks(ctx, dpd.sqlExec, dpd.mutation, dpd.hooks) } // ExecX is like Exec, but panics if an error occurs. diff --git a/ent/dbpackage_query.go b/ent/dbpackage_query.go index 4e64aba..038c59d 100644 --- a/ent/dbpackage_query.go +++ b/ent/dbpackage_query.go @@ -18,7 +18,7 @@ import ( type DbPackageQuery struct { config ctx *QueryContext - order []OrderFunc + order []dbpackage.OrderOption inters []Interceptor predicates []predicate.DbPackage modifiers []func(*sql.Selector) @@ -53,7 +53,7 @@ func (dpq *DbPackageQuery) Unique(unique bool) *DbPackageQuery { } // Order specifies how the records should be ordered. -func (dpq *DbPackageQuery) Order(o ...OrderFunc) *DbPackageQuery { +func (dpq *DbPackageQuery) Order(o ...dbpackage.OrderOption) *DbPackageQuery { dpq.order = append(dpq.order, o...) return dpq } @@ -247,7 +247,7 @@ func (dpq *DbPackageQuery) Clone() *DbPackageQuery { return &DbPackageQuery{ config: dpq.config, ctx: dpq.ctx.Clone(), - order: append([]OrderFunc{}, dpq.order...), + order: append([]dbpackage.OrderOption{}, dpq.order...), inters: append([]Interceptor{}, dpq.inters...), predicates: append([]predicate.DbPackage{}, dpq.predicates...), // clone intermediate query. diff --git a/ent/dbpackage_update.go b/ent/dbpackage_update.go index 0587488..3b1aa0f 100644 --- a/ent/dbpackage_update.go +++ b/ent/dbpackage_update.go @@ -476,7 +476,7 @@ func (dpu *DbPackageUpdate) Mutation() *DbPackageMutation { // Save executes the query and returns the number of nodes affected by the update operation. func (dpu *DbPackageUpdate) Save(ctx context.Context) (int, error) { - return withHooks[int, DbPackageMutation](ctx, dpu.sqlSave, dpu.mutation, dpu.hooks) + return withHooks(ctx, dpu.sqlSave, dpu.mutation, dpu.hooks) } // SaveX is like Save, but panics if an error occurs. @@ -1168,7 +1168,7 @@ func (dpuo *DbPackageUpdateOne) Select(field string, fields ...string) *DbPackag // Save executes the query and returns the updated DbPackage entity. func (dpuo *DbPackageUpdateOne) Save(ctx context.Context) (*DbPackage, error) { - return withHooks[*DbPackage, DbPackageMutation](ctx, dpuo.sqlSave, dpuo.mutation, dpuo.hooks) + return withHooks(ctx, dpuo.sqlSave, dpuo.mutation, dpuo.hooks) } // SaveX is like Save, but panics if an error occurs. diff --git a/ent/ent.go b/ent/ent.go index b153630..6853eb9 100644 --- a/ent/ent.go +++ b/ent/ent.go @@ -7,6 +7,7 @@ import ( "errors" "fmt" "reflect" + "sync" "entgo.io/ent" "entgo.io/ent/dialect/sql" @@ -60,33 +61,29 @@ func NewTxContext(parent context.Context, tx *Tx) context.Context { } // OrderFunc applies an ordering on the sql selector. +// Deprecated: Use Asc/Desc functions or the package builders instead. type OrderFunc func(*sql.Selector) -// columnChecker returns a function indicates if the column exists in the given column. -func columnChecker(table string) func(string) error { - checks := map[string]func(string) bool{ - dbpackage.Table: dbpackage.ValidColumn, - } - check, ok := checks[table] - if !ok { - return func(string) error { - return fmt.Errorf("unknown table %q", table) - } - } - return func(column string) error { - if !check(column) { - return fmt.Errorf("unknown column %q for table %q", column, table) - } - return nil - } +var ( + initCheck sync.Once + columnCheck sql.ColumnCheck +) + +// columnChecker checks if the column exists in the given table. +func checkColumn(table, column string) error { + initCheck.Do(func() { + columnCheck = sql.NewColumnCheck(map[string]func(string) bool{ + dbpackage.Table: dbpackage.ValidColumn, + }) + }) + return columnCheck(table, column) } // Asc applies the given fields in ASC order. -func Asc(fields ...string) OrderFunc { +func Asc(fields ...string) func(*sql.Selector) { return func(s *sql.Selector) { - check := columnChecker(s.TableName()) for _, f := range fields { - if err := check(f); err != nil { + if err := checkColumn(s.TableName(), f); err != nil { s.AddError(&ValidationError{Name: f, err: fmt.Errorf("ent: %w", err)}) } s.OrderBy(sql.Asc(s.C(f))) @@ -95,11 +92,10 @@ func Asc(fields ...string) OrderFunc { } // Desc applies the given fields in DESC order. -func Desc(fields ...string) OrderFunc { +func Desc(fields ...string) func(*sql.Selector) { return func(s *sql.Selector) { - check := columnChecker(s.TableName()) for _, f := range fields { - if err := check(f); err != nil { + if err := checkColumn(s.TableName(), f); err != nil { s.AddError(&ValidationError{Name: f, err: fmt.Errorf("ent: %w", err)}) } s.OrderBy(sql.Desc(s.C(f))) @@ -131,8 +127,7 @@ func Count() AggregateFunc { // Max applies the "max" aggregation function on the given field of each group. func Max(field string) AggregateFunc { return func(s *sql.Selector) string { - check := columnChecker(s.TableName()) - if err := check(field); err != nil { + if err := checkColumn(s.TableName(), field); err != nil { s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)}) return "" } @@ -143,8 +138,7 @@ func Max(field string) AggregateFunc { // Mean applies the "mean" aggregation function on the given field of each group. func Mean(field string) AggregateFunc { return func(s *sql.Selector) string { - check := columnChecker(s.TableName()) - if err := check(field); err != nil { + if err := checkColumn(s.TableName(), field); err != nil { s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)}) return "" } @@ -155,8 +149,7 @@ func Mean(field string) AggregateFunc { // Min applies the "min" aggregation function on the given field of each group. func Min(field string) AggregateFunc { return func(s *sql.Selector) string { - check := columnChecker(s.TableName()) - if err := check(field); err != nil { + if err := checkColumn(s.TableName(), field); err != nil { s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)}) return "" } @@ -167,8 +160,7 @@ func Min(field string) AggregateFunc { // Sum applies the "sum" aggregation function on the given field of each group. func Sum(field string) AggregateFunc { return func(s *sql.Selector) string { - check := columnChecker(s.TableName()) - if err := check(field); err != nil { + if err := checkColumn(s.TableName(), field); err != nil { s.AddError(&ValidationError{Name: field, err: fmt.Errorf("ent: %w", err)}) return "" } @@ -505,7 +497,7 @@ func withHooks[V Value, M any, PM interface { return exec(ctx) } var mut Mutator = MutateFunc(func(ctx context.Context, m Mutation) (Value, error) { - mutationT, ok := m.(PM) + mutationT, ok := any(m).(PM) if !ok { return nil, fmt.Errorf("unexpected mutation type %T", m) } diff --git a/ent/runtime/runtime.go b/ent/runtime/runtime.go index 94a2681..4ea738e 100644 --- a/ent/runtime/runtime.go +++ b/ent/runtime/runtime.go @@ -5,6 +5,6 @@ package runtime // The schema-stitching logic is generated in somegit.dev/ALHP/ALHP.GO/ent/runtime.go const ( - Version = "v0.11.9" // Version of ent codegen. - Sum = "h1:dbbCkAiPVTRBIJwoZctiSYjB7zxQIBOzVSU5H9VYIQI=" // Sum of ent codegen. + Version = "v0.12.3" // Version of ent codegen. + Sum = "h1:N5lO2EOrHpCH5HYfiMOCHYbo+oh5M8GjT0/cx5x6xkk=" // Sum of ent codegen. ) diff --git a/go.mod b/go.mod index 5c39520..f36747c 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,14 @@ module somegit.dev/ALHP/ALHP.GO go 1.20 require ( - entgo.io/ent v0.11.9 + entgo.io/ent v0.12.3 github.com/Jguer/go-alpm/v2 v2.2.0 github.com/Morganamilo/go-pacmanconf v0.0.0-20210502114700-cff030e927a5 github.com/Morganamilo/go-srcinfo v1.0.0 github.com/c2h5oh/datasize v0.0.0-20220606134207-859f65c6625b github.com/google/uuid v1.3.0 github.com/jackc/pgx/v4 v4.18.1 - github.com/otiai10/copy v1.9.0 + github.com/otiai10/copy v1.11.0 github.com/sethvargo/go-retry v0.2.4 github.com/sirupsen/logrus v1.9.0 github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3 @@ -19,7 +19,7 @@ require ( ) require ( - ariga.io/atlas v0.9.1 // indirect + ariga.io/atlas v0.10.2-0.20230427182402-87a07dfb83bf // indirect github.com/agext/levenshtein v1.2.3 // indirect github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect @@ -35,9 +35,9 @@ require ( github.com/jackc/pgtype v1.14.0 // indirect github.com/klauspost/cpuid/v2 v2.2.4 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect - github.com/zclconf/go-cty v1.13.0 // indirect - golang.org/x/crypto v0.7.0 // indirect - golang.org/x/mod v0.9.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/text v0.8.0 // indirect + github.com/zclconf/go-cty v1.13.1 // indirect + golang.org/x/crypto v0.8.0 // indirect + golang.org/x/mod v0.10.0 // indirect + golang.org/x/sys v0.8.0 // indirect + golang.org/x/text v0.9.0 // indirect ) diff --git a/go.sum b/go.sum index 2f98017..8c77c4a 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ -ariga.io/atlas v0.9.1 h1:EpoPMnwsQG0vn9c0sYExpwSYtr7bvuSUXzQclU2pMjc= -ariga.io/atlas v0.9.1/go.mod h1:T230JFcENj4ZZzMkZrXFDSkv+2kXkUgpJ5FQQ5hMcKU= -entgo.io/ent v0.11.9 h1:dbbCkAiPVTRBIJwoZctiSYjB7zxQIBOzVSU5H9VYIQI= -entgo.io/ent v0.11.9/go.mod h1:KWHOcDZn1xk3mz3ipWdKrQpMvwqa/9B69TUuAPP9W6g= +ariga.io/atlas v0.10.2-0.20230427182402-87a07dfb83bf h1:Tq2DRB39ZHScIwWACjPKLv5oEErv7zv6PBb5RTz5CKA= +ariga.io/atlas v0.10.2-0.20230427182402-87a07dfb83bf/go.mod h1:+TR129FJZ5Lvzms6dvCeGWh1yR6hMvmXBhug4hrNIGk= +entgo.io/ent v0.12.3 h1:N5lO2EOrHpCH5HYfiMOCHYbo+oh5M8GjT0/cx5x6xkk= +entgo.io/ent v0.12.3/go.mod h1:AigGGx+tbrBBYHAzGOg8ND661E5cxx1Uiu5o/otJ6Yg= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/Jguer/go-alpm/v2 v2.2.0 h1:+sh4UEZwTpcAO+vHdySsnLZSnLZIBun8j85BbPExSlg= @@ -107,8 +107,8 @@ github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348 h1:MtvEpTB6LX3v github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/lib/pq v1.10.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= @@ -117,13 +117,9 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0= github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= -github.com/otiai10/copy v1.9.0 h1:7KFNiCgZ91Ru4qW4CWPf/7jqtxLagGRmIxWldPP9VY4= -github.com/otiai10/copy v1.9.0/go.mod h1:hsfX19wcn0UWIHUQ3/4fHuehhk2UyArQ9dVFAn3FczI= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.4.0 h1:umwcf7gbpEwf7WFzqmWwSv0CzbeMsae2u9ZvpP8j2q4= -github.com/otiai10/mint v1.4.0/go.mod h1:gifjb2MYOoULtKLqUAEILUG/9KONW6f7YsJ6vQLTlFI= +github.com/otiai10/copy v1.11.0 h1:OKBD80J/mLBrwnzXqGtFCzprFSGioo30JcmR4APsNwc= +github.com/otiai10/copy v1.11.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww= +github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -160,8 +156,8 @@ github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3 h1:shC1HB1UogxN5Ech3Yqaaxj1X/P656PPCB4RbojIJqc= github.com/wercker/journalhook v0.0.0-20180428041537-5d0a5ae867b3/go.mod h1:XCsSkdKK4gwBMNrOCZWww0pX6AOt+2gYc5Z6jBRrNVg= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -github.com/zclconf/go-cty v1.13.0 h1:It5dfKTTZHe9aeppbNOda3mN7Ag7sg6QkBNm6TkyFa0= -github.com/zclconf/go-cty v1.13.0/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= +github.com/zclconf/go-cty v1.13.1 h1:0a6bRwuiSHtAmqCqNOE+c2oHgepv0ctoxU4FUe43kwc= +github.com/zclconf/go-cty v1.13.1/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= @@ -185,14 +181,14 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= +golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ= +golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= -golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= +golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -219,8 +215,8 @@ golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= +golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -232,8 +228,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=