diff --git a/go.mod b/go.mod index 80ac3da51ce..b4c4d71e36e 100644 --- a/go.mod +++ b/go.mod @@ -61,7 +61,7 @@ require ( github.com/tealeg/xlsx/v3 v3.2.4 github.com/tiaguinho/gosoap v1.4.4 github.com/trussworks/otelhttp v0.0.0-20220428162739-458ecc428855 - github.com/vektra/mockery/v2 v2.12.2 + github.com/vektra/mockery/v2 v2.13.1 go.mozilla.org/pkcs7 v0.0.0-20181213175627-3cffc6fbfe83 go.opentelemetry.io/contrib/detectors/aws/ecs v1.7.0 go.opentelemetry.io/contrib/instrumentation/github.com/gorilla/mux/otelmux v0.32.0 @@ -79,7 +79,7 @@ require ( go.opentelemetry.io/otel/sdk/metric v0.30.0 go.opentelemetry.io/otel/trace v1.7.0 go.uber.org/zap v1.21.0 - golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 + golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 golang.org/x/text v0.3.7 @@ -169,13 +169,13 @@ require ( github.com/oklog/ulid v1.3.1 // indirect github.com/opentracing/opentracing-go v1.2.0 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.1 // indirect + github.com/pelletier/go-toml/v2 v2.0.2 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rivo/uniseg v0.2.0 // indirect github.com/rogpeppe/fastuuid v1.2.0 // indirect github.com/rogpeppe/go-internal v1.8.1 // indirect - github.com/rs/zerolog v1.26.1 // indirect + github.com/rs/zerolog v1.27.0 // indirect github.com/sergi/go-diff v1.2.0 // indirect github.com/shabbyrobe/xmlwriter v0.0.0-20200208144257-9fca06d00ffa // indirect github.com/sirupsen/logrus v1.8.1 // indirect @@ -183,7 +183,7 @@ require ( github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/stretchr/objx v0.4.0 // indirect - github.com/subosito/gotenv v1.3.0 // indirect + github.com/subosito/gotenv v1.4.0 // indirect github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect go.mongodb.org/mongo-driver v1.8.3 // indirect go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.7.0 // indirect @@ -193,15 +193,15 @@ require ( golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect - golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect - golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect + golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d // indirect + golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect google.golang.org/grpc v1.46.2 // indirect google.golang.org/protobuf v1.28.0 // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect - gopkg.in/ini.v1 v1.66.4 // indirect + gopkg.in/ini.v1 v1.66.6 // indirect gopkg.in/urfave/cli.v1 v1.20.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index d2b50989bf0..4a162a96abe 100644 --- a/go.sum +++ b/go.sum @@ -25,15 +25,6 @@ cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPT cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -43,7 +34,6 @@ cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM7 cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -61,7 +51,6 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/DATA-DOG/go-txdb v0.1.5 h1:kKzz+LYk9qw1+fMyo8/9yDQiNXrJ2HbfX/TY61HkkB4= github.com/DATA-DOG/go-txdb v0.1.5/go.mod h1:DhAhxMXZpUJVGnT+p9IbzJoRKvlArO2pkHjnGX7o0n0= -github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/MarvinJWendt/testza v0.1.0/go.mod h1:7AxNvlfeHP7Z/hDQ5JtE3OKYT3XFUeLCDE2DQninSqs= github.com/MarvinJWendt/testza v0.2.1/go.mod h1:God7bhG8n6uQxwdScay+gjm9/LnO4D3kkcZX4hv9Rp8= github.com/MarvinJWendt/testza v0.2.8/go.mod h1:nwIcjmr0Zz+Rcwfh3/4UhBp7ePKVhuBExvZqnKYWlII= @@ -78,10 +67,6 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/XSAM/otelsql v0.14.1 h1:cH1Dty9sssecQyeU84D/Jm6PxKRU86zOhVk+Q/Ret08= github.com/XSAM/otelsql v0.14.1/go.mod h1:lwZDThLF8arnnTF4u+g2MwydA2S2kZN4xRqYLJCM+fE= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alexedwards/scs/redisstore v0.0.0-20220216073957-c252878bcf5a h1:cG9ww9FPt0rE2K20mccDsbTWUryq9ucJR2yo6iww3iw= github.com/alexedwards/scs/redisstore v0.0.0-20220216073957-c252878bcf5a/go.mod h1:ceKFatoD+hfHWWeHOAYue1J+XgOJjE7dw8l3JtIRTGY= github.com/alexedwards/scs/v2 v2.5.0 h1:zgxOfNFmiJyXG7UPIuw1g2b9LWBeRLh3PjfB9BDmfL4= @@ -89,9 +74,7 @@ github.com/alexedwards/scs/v2 v2.5.0/go.mod h1:ToaROZxyKukJKT/xLcVQAChi5k6+Pn1Gv github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ= github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= @@ -103,24 +86,17 @@ github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd3 github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A= github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= -github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -131,7 +107,6 @@ github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/codegangsta/envy v0.0.0-20141216192214-4b78388c8ce4 h1:ihrIKrLQzm6Q6NJHBMemvaIGTFxgxQUEkn2AjN0Aulw= @@ -144,6 +119,7 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -169,12 +145,9 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= @@ -187,7 +160,6 @@ github.com/frankban/quicktest v1.11.2/go.mod h1:K+q6oSqb0W0Ininfk863uOk1lMy69l/P github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/getlantern/deepcopy v0.0.0-20160317154340-7f45deb8130a h1:yU/FENpkHYISWsQrbr3pcZOBj0EuRjPzNc1+dTCLu44= @@ -198,11 +170,7 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df h1:Bao6dhmbTA1KFVxmJ6nBoMuOJit2yjEgLJpIMYpop0E= github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df/go.mod h1:GJr+FCSXshIwgHBtLglIg9M2l2kQSi6QjVAngtzI08Y= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= @@ -325,7 +293,6 @@ github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx github.com/gofrs/uuid v4.1.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gofrs/uuid v4.2.0+incompatible h1:yyYWMnhkhrKwwr8gAOcOCYxOOscHgDS9yZgBrnJfGa0= github.com/gofrs/uuid v4.2.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang-jwt/jwt/v4 v4.2.0/go.mod h1:/xlHOz8bRuivTWchD4jCa+NbatV+wEUSzwAxVc6locg= github.com/golang-jwt/jwt/v4 v4.4.2 h1:rcc4lwaZgFMCZ5jxF9ABolDcIHdBytAFgqFPbSJQAYs= @@ -336,7 +303,6 @@ github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0L github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= @@ -345,7 +311,6 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -365,7 +330,6 @@ github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomodule/redigo v1.8.0/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/gomodule/redigo v1.8.9 h1:Sl3u+2BI/kk+VEatbj0scLdrFhjPmbxOc1myhDP41ws= github.com/gomodule/redigo v1.8.9/go.mod h1:7ArFNvsTjH8GMMzB4uy1snslv2BwmginuMs06a1uzZE= @@ -395,7 +359,6 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -409,9 +372,6 @@ github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= @@ -420,8 +380,6 @@ github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gookit/color v1.4.2/go.mod h1:fqRyamkC1W8uxl+lxCQxOT09l/vYfZ+QeiX3rKQHCoQ= github.com/gookit/color v1.5.0 h1:1Opow3+BWDwqor78DcJkJCIwnkviFi+rrOANki9BUFw= @@ -443,24 +401,13 @@ github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFb github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 h1:BZHcxBETFHIdVyhyEfOvn/RdU/QGdLI4y34qQGjGWO0= github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M= -github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= -github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= @@ -468,24 +415,16 @@ github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk= -github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hhrutter/lzw v0.0.0-20190827003112-58b82c5a41cc h1:crd+cScoxEqSOqClzjkNMNQNdMCF3SGXhPdDWBQfNZE= github.com/hhrutter/lzw v0.0.0-20190827003112-58b82c5a41cc/go.mod h1:yJBvOcu1wLQ9q9XZmfiPfur+3dQJuIhYQsMGLYcItZk= github.com/hhrutter/tiff v0.0.0-20190827003322-d08e2ad45835 h1:8XqemC6WorzU92LW/+cMr8e+oCpRUobYuieBCpb7bLw= github.com/hhrutter/tiff v0.0.0-20190827003322-d08e2ad45835/go.mod h1:WkUxfS2JUu3qPo6tRld7ISb8HiC0gVSU91kooBMDVok= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk= @@ -562,16 +501,12 @@ github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9q github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jstemmer/go-junit-report v1.0.0 h1:8X1gzZpR+nVQLAht+L/foqOeX2l9DTZoaIPbEQHxsds= github.com/jstemmer/go-junit-report v1.0.0/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5PtRc= github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0= @@ -590,7 +525,6 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= @@ -620,7 +554,6 @@ github.com/lithammer/fuzzysearch v1.1.5 h1:Ag7aKU08wp0R9QCfF4GoGST9HbmAIeLP7xwMr github.com/lithammer/fuzzysearch v1.1.5/go.mod h1:1R1LRNk7yKid1BaQkmuLQaHruxcC4HmAH30Dh61Ih1Q= github.com/luna-duclos/instrumentedsql v1.1.3 h1:t7mvC0z1jUt5A0UQ6I/0H31ryymuQRnJcWCiqV3lSAA= github.com/luna-duclos/instrumentedsql v1.1.3/go.mod h1:9J1njvFds+zN7y85EDhN9XNQLANWwZt2ULeIC8yMNYs= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= @@ -639,7 +572,6 @@ github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -648,9 +580,6 @@ github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= @@ -662,18 +591,14 @@ github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/microcosm-cc/bluemonday v1.0.16/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM= github.com/microcosm-cc/bluemonday v1.0.18 h1:6HcxvXDAi3ARt3slx6nTesbvorIc3QeTzBNRvWktHBo= github.com/microcosm-cc/bluemonday v1.0.18/go.mod h1:Z0r70sCuXHig8YpBzCc5eGHAap2K7e/u082ZUpDRRqM= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miekg/pkcs11 v1.0.3 h1:iMwmD7I5225wv84WxIG/bmxz9AXjWvTWIbM/TYHvWtw= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -688,13 +613,10 @@ github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/mrjones/oauth v0.0.0-20180629183705-f4e24b6d100c/go.mod h1:skjdDftzkFALcuGzYSklqYd8gvat6F1gZJ4YPVbkZpM= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/namsral/flag v1.7.4-pre h1:b2ScHhoCUkbsq0d2C15Mv+VU8bl8hAXV8arnWiOHNZs= github.com/namsral/flag v1.7.4-pre/go.mod h1:OXldTctbM6SWH1K899kPZcf65KxJiD7MsceFUpB5yDo= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= @@ -703,16 +625,14 @@ github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pdfcpu/pdfcpu v0.2.5 h1:7jBh0EOQgxxpe35XjTtEzjHJzVMHO3ZwUn8EYNEA6Ng= github.com/pdfcpu/pdfcpu v0.2.5/go.mod h1:VLoFmLCCnUkneQe2uTjK1ZgPveTUZKGgIb2OP20+W5c= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= -github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= +github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= +github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= @@ -730,19 +650,7 @@ github.com/pkg/sftp v1.13.5/go.mod h1:wHDZ0IZX6JcBYRK1TH9bcVq8G7TLpVHYIGJRFnmPfx github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/pterm/pterm v0.12.27/go.mod h1:PhQ89w4i95rhgE+xedAoqous6K9X+r6aSOI2eFF7DZI= github.com/pterm/pterm v0.12.29/go.mod h1:WI3qxgvoQFFGKGjGnJR849gU0TsEOvKn5Q8LlY1U7lg= github.com/pterm/pterm v0.12.30/go.mod h1:MOqLIyMOgmTDz9yorcYbcw+HsgoZo3BQfg2wtl3HEFE= @@ -769,14 +677,12 @@ github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= -github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc= -github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc= +github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs= +github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= @@ -788,7 +694,6 @@ github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9Nz github.com/shopspring/decimal v1.2.0 h1:abSATXmQEYyShuxI4/vyW3tV1MrKAJzCZ/0zLUXYbsQ= github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= @@ -801,18 +706,14 @@ github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:Udh github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e h1:qpG93cPwA5f7s/ZPBJnGOYQNK/vKsaDaseuKT5Asee8= github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= @@ -821,8 +722,6 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -837,11 +736,12 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/subosito/gotenv v1.3.0 h1:mjC+YW8QpAdXibNi+vNWgzmgBH4+5l5dCXv8cNysBLI= -github.com/subosito/gotenv v1.3.0/go.mod h1:YzJjq/33h7nrwdY+iHMhEOEEbW0ovIz0tB6t6PwAXzs= +github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs= +github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8 h1:RB0v+/pc8oMzPsN97aZYEwNuJ6ouRJ2uhjxemJ9zvrY= github.com/tcnksm/go-input v0.0.0-20180404061846-548a7d7a8ee8/go.mod h1:IlWNj9v/13q7xFbaK4mbyzMNwrZLaWSHx/aibKIZuIg= github.com/tealeg/xlsx/v3 v3.2.4 h1:QPuk5v1xEivxoEUFmqszqINF52ppWCMejEd11ju3180= @@ -852,11 +752,10 @@ github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/trussworks/otelhttp v0.0.0-20220428162739-458ecc428855 h1:dbUo2VcgREHiLUutnBfndescUFCcw+ypse19gyxFN2U= github.com/trussworks/otelhttp v0.0.0-20220428162739-458ecc428855/go.mod h1:AsarKiyc7xljMlvKTviuG4IFBln3DFAFRm2KsRRzFp0= -github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/urfave/cli v1.21.0 h1:wYSSj06510qPIzGSua9ZqsncMmWE3Zr55KBERygyrxE= github.com/urfave/cli v1.21.0/go.mod h1:lxDj6qX9Q6lWQxIrbrT0nwecwUtRnhVZAJjJZrVUZZQ= -github.com/vektra/mockery/v2 v2.12.2 h1:JbRx9F+XcCJiDTyCm3V5lXYwl56m5ZouV6I9eZa1Dj0= -github.com/vektra/mockery/v2 v2.12.2/go.mod h1:8vf4KDDUptfkyypzdHLuE7OE2xA7Gdt60WgIS8PgD+U= +github.com/vektra/mockery/v2 v2.13.1 h1:Lqs7aZiC7TwZO76fJ/4Zsb3NaO4F7cuuz0mZLYeNwtQ= +github.com/vektra/mockery/v2 v2.13.1/go.mod h1:bnD1T8tExSgPD1ripLkDbr60JA9VtQeu12P3wgLZd7M= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= github.com/xdg-go/scram v1.0.2/go.mod h1:1WAq6h33pAW+iRreB34OORO2Nf7qel3VV3fjBj+hCSs= github.com/xdg-go/stringprep v1.0.2/go.mod h1:8F9zXuvzgwmyT5DUm4GUfZGDdT3W+LCvS6+da4O5kxM= @@ -869,14 +768,10 @@ github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.mongodb.org/mongo-driver v1.7.3/go.mod h1:NqaYOwnXWr5Pm7AOpO5QFxKJ503nbMse/R79oO62zWg= go.mongodb.org/mongo-driver v1.7.5/go.mod h1:VXEWRZ6URJIkUq2SCAyapmhH0ZLRBP+FT4xhp5Zvxng= go.mongodb.org/mongo-driver v1.8.3 h1:TDKlTkGDKm9kkJVUOAXDK5/fkqKHJVwYQSpoRfB43R4= @@ -960,7 +855,6 @@ golang.org/x/crypto v0.0.0-20190422162423-af44ce270edf/go.mod h1:WFFai1msRO1wXaE golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -969,15 +863,11 @@ golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/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.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88 h1:Tgea0cVUD0ivh5ADBX4WwuI12DUd2to3nCYe2eayMIw= -golang.org/x/crypto v0.0.0-20220511200225-c6db032c6c88/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= +golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1017,14 +907,11 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1039,7 +926,6 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1064,12 +950,9 @@ golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= @@ -1087,11 +970,6 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 h1:OSnWWcOd/CtWQC2cYSBgbTSJv3ciqd8r54ySIW2y3RE= golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= @@ -1112,7 +990,6 @@ golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1127,18 +1004,14 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1159,7 +1032,6 @@ golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1169,36 +1041,24 @@ golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d h1:Zu/JngovGLVi6t2J3nmAf3AoTDwuzw85YZ3b9o4yU7s= +golang.org/x/sys v0.0.0-20220610221304-9f5ed59c137d/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-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 h1:EH1Deb8WZJ0xc0WK//leUHXcX9aLE5SymusoTmMZye8= -golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM= +golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1233,7 +1093,6 @@ golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190823170909-c4a336ef6a2f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1275,13 +1134,9 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= -golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY= golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1313,18 +1168,6 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw= -google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1376,29 +1219,8 @@ google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd h1:e0TwkXOdbnH/1x5rc5MZ/VYyiZ4v+RdVfrGMqEwT68I= google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -1421,19 +1243,12 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5 google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.43.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.46.2 h1:u+MLGgVf7vRdjEYZ8wDFhAVNmhkbJ5hmrA1LMWK1CAQ= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1449,7 +1264,6 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1464,15 +1278,11 @@ gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AW gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.3/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.4 h1:SsAcf+mM7mRZo2nJNGt8mZCjG8ZRaNGMURJw7BsIST4= -gopkg.in/ini.v1 v1.66.4/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI= +gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= diff --git a/pkg/handlers/mocks/HandlerConfig.go b/pkg/handlers/mocks/HandlerConfig.go index 219ec29c0fa..bb06c1c9433 100644 --- a/pkg/handlers/mocks/HandlerConfig.go +++ b/pkg/handlers/mocks/HandlerConfig.go @@ -28,8 +28,6 @@ import ( storage "github.com/transcom/mymove/pkg/storage" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -370,8 +368,13 @@ func (_m *HandlerConfig) UseSecureCookie() bool { return r0 } -// NewHandlerConfig creates a new instance of HandlerConfig. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewHandlerConfig(t testing.TB) *HandlerConfig { +type mockConstructorTestingTNewHandlerConfig interface { + mock.TestingT + Cleanup(func()) +} + +// NewHandlerConfig creates a new instance of HandlerConfig. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewHandlerConfig(t mockConstructorTestingTNewHandlerConfig) *HandlerConfig { mock := &HandlerConfig{} mock.Mock.Test(t) diff --git a/pkg/notifications/mocks/NotificationSender.go b/pkg/notifications/mocks/NotificationSender.go index 9d4778d2de8..1ac9956ea46 100644 --- a/pkg/notifications/mocks/NotificationSender.go +++ b/pkg/notifications/mocks/NotificationSender.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" notifications "github.com/transcom/mymove/pkg/notifications" - - testing "testing" ) // NotificationSender is an autogenerated mock type for the NotificationSender type @@ -30,8 +28,13 @@ func (_m *NotificationSender) SendNotification(appCtx appcontext.AppContext, not return r0 } -// NewNotificationSender creates a new instance of NotificationSender. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewNotificationSender(t testing.TB) *NotificationSender { +type mockConstructorTestingTNewNotificationSender interface { + mock.TestingT + Cleanup(func()) +} + +// NewNotificationSender creates a new instance of NotificationSender. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewNotificationSender(t mockConstructorTestingTNewNotificationSender) *NotificationSender { mock := &NotificationSender{} mock.Mock.Test(t) diff --git a/pkg/paperwork/paperwork_test.go b/pkg/paperwork/paperwork_test.go index 17e4ba21b5c..cb147d7585b 100644 --- a/pkg/paperwork/paperwork_test.go +++ b/pkg/paperwork/paperwork_test.go @@ -64,13 +64,12 @@ func (suite *PaperworkSuite) openLocalFile(path string, fs *afero.Afero) (afero. func TestPaperworkSuite(t *testing.T) { storer := storageTest.NewFakeS3Storage(true) - popSuite := testingsuite.NewPopTestSuite(testingsuite.CurrentPackage(), testingsuite.WithPerTestTransaction()) newUploader, err := uploader.NewUserUploader(storer, uploader.MaxCustomerUserUploadFileSizeLimit) if err != nil { log.Panic(err) } hs := &PaperworkSuite{ - PopTestSuite: popSuite, + PopTestSuite: testingsuite.NewPopTestSuite(testingsuite.CurrentPackage(), testingsuite.WithPerTestTransaction()), userUploader: newUploader, } diff --git a/pkg/payment_request/mocks/Helper.go b/pkg/payment_request/mocks/Helper.go index 0187bd758be..2701cadff7c 100644 --- a/pkg/payment_request/mocks/Helper.go +++ b/pkg/payment_request/mocks/Helper.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // Helper is an autogenerated mock type for the Helper type @@ -62,8 +60,13 @@ func (_m *Helper) FetchServiceParamsForServiceItems(appCtx appcontext.AppContext return r0, r1 } -// NewHelper creates a new instance of Helper. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewHelper(t testing.TB) *Helper { +type mockConstructorTestingTNewHelper interface { + mock.TestingT + Cleanup(func()) +} + +// NewHelper creates a new instance of Helper. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewHelper(t mockConstructorTestingTNewHelper) *Helper { mock := &Helper{} mock.Mock.Test(t) diff --git a/pkg/route/dtod_planner_test.go b/pkg/route/dtod_planner_test.go index 7129892d00f..2cb1bae2060 100644 --- a/pkg/route/dtod_planner_test.go +++ b/pkg/route/dtod_planner_test.go @@ -32,9 +32,8 @@ type GHCTestSuite struct { } func TestGHCTestSuite(t *testing.T) { - popTs := testingsuite.NewPopTestSuite(testingsuite.CurrentPackage(), testingsuite.WithPerTestTransaction()) ts := &GHCTestSuite{ - PopTestSuite: popTs, + PopTestSuite: testingsuite.NewPopTestSuite(testingsuite.CurrentPackage(), testingsuite.WithPerTestTransaction()), } suite.Run(t, ts) diff --git a/pkg/route/ghcmocks/SoapCaller.go b/pkg/route/ghcmocks/SoapCaller.go index 5e28ae10fe4..b79044ce5c4 100644 --- a/pkg/route/ghcmocks/SoapCaller.go +++ b/pkg/route/ghcmocks/SoapCaller.go @@ -5,8 +5,6 @@ package ghcmocks import ( mock "github.com/stretchr/testify/mock" gosoap "github.com/tiaguinho/gosoap" - - testing "testing" ) // SoapCaller is an autogenerated mock type for the SoapCaller type @@ -37,8 +35,13 @@ func (_m *SoapCaller) Call(m string, p gosoap.SoapParams) (*gosoap.Response, err return r0, r1 } -// NewSoapCaller creates a new instance of SoapCaller. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewSoapCaller(t testing.TB) *SoapCaller { +type mockConstructorTestingTNewSoapCaller interface { + mock.TestingT + Cleanup(func()) +} + +// NewSoapCaller creates a new instance of SoapCaller. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSoapCaller(t mockConstructorTestingTNewSoapCaller) *SoapCaller { mock := &SoapCaller{} mock.Mock.Test(t) diff --git a/pkg/route/mocks/Planner.go b/pkg/route/mocks/Planner.go index 08d30850903..aaa8e872209 100644 --- a/pkg/route/mocks/Planner.go +++ b/pkg/route/mocks/Planner.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" route "github.com/transcom/mymove/pkg/route" - - testing "testing" ) // Planner is an autogenerated mock type for the Planner type @@ -144,8 +142,13 @@ func (_m *Planner) ZipTransitDistance(appCtx appcontext.AppContext, source strin return r0, r1 } -// NewPlanner creates a new instance of Planner. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPlanner(t testing.TB) *Planner { +type mockConstructorTestingTNewPlanner interface { + mock.TestingT + Cleanup(func()) +} + +// NewPlanner creates a new instance of Planner. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPlanner(t mockConstructorTestingTNewPlanner) *Planner { mock := &Planner{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/AdminUserCreator.go b/pkg/services/mocks/AdminUserCreator.go index 8c740a24bbd..cdae9b815c5 100644 --- a/pkg/services/mocks/AdminUserCreator.go +++ b/pkg/services/mocks/AdminUserCreator.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - validate "github.com/gobuffalo/validate/v3" ) @@ -52,8 +50,13 @@ func (_m *AdminUserCreator) CreateAdminUser(appCtx appcontext.AppContext, user * return r0, r1, r2 } -// NewAdminUserCreator creates a new instance of AdminUserCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewAdminUserCreator(t testing.TB) *AdminUserCreator { +type mockConstructorTestingTNewAdminUserCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewAdminUserCreator creates a new instance of AdminUserCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewAdminUserCreator(t mockConstructorTestingTNewAdminUserCreator) *AdminUserCreator { mock := &AdminUserCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/AdminUserFetcher.go b/pkg/services/mocks/AdminUserFetcher.go index ad1c33e699f..e117435ca85 100644 --- a/pkg/services/mocks/AdminUserFetcher.go +++ b/pkg/services/mocks/AdminUserFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // AdminUserFetcher is an autogenerated mock type for the AdminUserFetcher type @@ -39,8 +37,13 @@ func (_m *AdminUserFetcher) FetchAdminUser(appCtx appcontext.AppContext, filters return r0, r1 } -// NewAdminUserFetcher creates a new instance of AdminUserFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewAdminUserFetcher(t testing.TB) *AdminUserFetcher { +type mockConstructorTestingTNewAdminUserFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewAdminUserFetcher creates a new instance of AdminUserFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewAdminUserFetcher(t mockConstructorTestingTNewAdminUserFetcher) *AdminUserFetcher { mock := &AdminUserFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/AdminUserListFetcher.go b/pkg/services/mocks/AdminUserListFetcher.go index 7ac0d4d6839..8e0f348c0c8 100644 --- a/pkg/services/mocks/AdminUserListFetcher.go +++ b/pkg/services/mocks/AdminUserListFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // AdminUserListFetcher is an autogenerated mock type for the AdminUserListFetcher type @@ -62,8 +60,13 @@ func (_m *AdminUserListFetcher) FetchAdminUserList(appCtx appcontext.AppContext, return r0, r1 } -// NewAdminUserListFetcher creates a new instance of AdminUserListFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewAdminUserListFetcher(t testing.TB) *AdminUserListFetcher { +type mockConstructorTestingTNewAdminUserListFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewAdminUserListFetcher creates a new instance of AdminUserListFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewAdminUserListFetcher(t mockConstructorTestingTNewAdminUserListFetcher) *AdminUserListFetcher { mock := &AdminUserListFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/AdminUserUpdater.go b/pkg/services/mocks/AdminUserUpdater.go index d6a83ee2e50..696d7a2fc12 100644 --- a/pkg/services/mocks/AdminUserUpdater.go +++ b/pkg/services/mocks/AdminUserUpdater.go @@ -10,8 +10,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" validate "github.com/gobuffalo/validate/v3" @@ -54,8 +52,13 @@ func (_m *AdminUserUpdater) UpdateAdminUser(appCtx appcontext.AppContext, id uui return r0, r1, r2 } -// NewAdminUserUpdater creates a new instance of AdminUserUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewAdminUserUpdater(t testing.TB) *AdminUserUpdater { +type mockConstructorTestingTNewAdminUserUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewAdminUserUpdater creates a new instance of AdminUserUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewAdminUserUpdater(t mockConstructorTestingTNewAdminUserUpdater) *AdminUserUpdater { mock := &AdminUserUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/CounselingServicesPricer.go b/pkg/services/mocks/CounselingServicesPricer.go index 5f303b7f3f7..f6caa1819d1 100644 --- a/pkg/services/mocks/CounselingServicesPricer.go +++ b/pkg/services/mocks/CounselingServicesPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *CounselingServicesPricer) PriceUsingParams(appCtx appcontext.AppContex return r0, r1, r2 } -// NewCounselingServicesPricer creates a new instance of CounselingServicesPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewCounselingServicesPricer(t testing.TB) *CounselingServicesPricer { +type mockConstructorTestingTNewCounselingServicesPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewCounselingServicesPricer creates a new instance of CounselingServicesPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewCounselingServicesPricer(t mockConstructorTestingTNewCounselingServicesPricer) *CounselingServicesPricer { mock := &CounselingServicesPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/CustomerFetcher.go b/pkg/services/mocks/CustomerFetcher.go index 0b0989857e4..b46023bbb59 100644 --- a/pkg/services/mocks/CustomerFetcher.go +++ b/pkg/services/mocks/CustomerFetcher.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *CustomerFetcher) FetchCustomer(appCtx appcontext.AppContext, customerI return r0, r1 } -// NewCustomerFetcher creates a new instance of CustomerFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewCustomerFetcher(t testing.TB) *CustomerFetcher { +type mockConstructorTestingTNewCustomerFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewCustomerFetcher creates a new instance of CustomerFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewCustomerFetcher(t mockConstructorTestingTNewCustomerFetcher) *CustomerFetcher { mock := &CustomerFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/CustomerSupportRemarkDeleter.go b/pkg/services/mocks/CustomerSupportRemarkDeleter.go index c7a7b20b21a..c4a92722466 100644 --- a/pkg/services/mocks/CustomerSupportRemarkDeleter.go +++ b/pkg/services/mocks/CustomerSupportRemarkDeleter.go @@ -6,8 +6,6 @@ import ( mock "github.com/stretchr/testify/mock" appcontext "github.com/transcom/mymove/pkg/appcontext" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -30,8 +28,13 @@ func (_m *CustomerSupportRemarkDeleter) DeleteCustomerSupportRemark(appCtx appco return r0 } -// NewCustomerSupportRemarkDeleter creates a new instance of CustomerSupportRemarkDeleter. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewCustomerSupportRemarkDeleter(t testing.TB) *CustomerSupportRemarkDeleter { +type mockConstructorTestingTNewCustomerSupportRemarkDeleter interface { + mock.TestingT + Cleanup(func()) +} + +// NewCustomerSupportRemarkDeleter creates a new instance of CustomerSupportRemarkDeleter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewCustomerSupportRemarkDeleter(t mockConstructorTestingTNewCustomerSupportRemarkDeleter) *CustomerSupportRemarkDeleter { mock := &CustomerSupportRemarkDeleter{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/CustomerSupportRemarkUpdater.go b/pkg/services/mocks/CustomerSupportRemarkUpdater.go index 9e9a443e137..d883b0ee51d 100644 --- a/pkg/services/mocks/CustomerSupportRemarkUpdater.go +++ b/pkg/services/mocks/CustomerSupportRemarkUpdater.go @@ -8,8 +8,6 @@ import ( customer_support_remarks "github.com/transcom/mymove/pkg/gen/ghcapi/ghcoperations/customer_support_remarks" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // CustomerSupportRemarkUpdater is an autogenerated mock type for the CustomerSupportRemarkUpdater type @@ -40,8 +38,13 @@ func (_m *CustomerSupportRemarkUpdater) UpdateCustomerSupportRemark(appCtx appco return r0, r1 } -// NewCustomerSupportRemarkUpdater creates a new instance of CustomerSupportRemarkUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewCustomerSupportRemarkUpdater(t testing.TB) *CustomerSupportRemarkUpdater { +type mockConstructorTestingTNewCustomerSupportRemarkUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewCustomerSupportRemarkUpdater creates a new instance of CustomerSupportRemarkUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewCustomerSupportRemarkUpdater(t mockConstructorTestingTNewCustomerSupportRemarkUpdater) *CustomerSupportRemarkUpdater { mock := &CustomerSupportRemarkUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/CustomerSupportRemarksCreator.go b/pkg/services/mocks/CustomerSupportRemarksCreator.go index 07cb24901cb..e754eb96283 100644 --- a/pkg/services/mocks/CustomerSupportRemarksCreator.go +++ b/pkg/services/mocks/CustomerSupportRemarksCreator.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // CustomerSupportRemarksCreator is an autogenerated mock type for the CustomerSupportRemarksCreator type @@ -39,8 +37,13 @@ func (_m *CustomerSupportRemarksCreator) CreateCustomerSupportRemark(appCtx appc return r0, r1 } -// NewCustomerSupportRemarksCreator creates a new instance of CustomerSupportRemarksCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewCustomerSupportRemarksCreator(t testing.TB) *CustomerSupportRemarksCreator { +type mockConstructorTestingTNewCustomerSupportRemarksCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewCustomerSupportRemarksCreator creates a new instance of CustomerSupportRemarksCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewCustomerSupportRemarksCreator(t mockConstructorTestingTNewCustomerSupportRemarksCreator) *CustomerSupportRemarksCreator { mock := &CustomerSupportRemarksCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/CustomerSupportRemarksFetcher.go b/pkg/services/mocks/CustomerSupportRemarksFetcher.go index 65290c59eaa..cdad42633fd 100644 --- a/pkg/services/mocks/CustomerSupportRemarksFetcher.go +++ b/pkg/services/mocks/CustomerSupportRemarksFetcher.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // CustomerSupportRemarksFetcher is an autogenerated mock type for the CustomerSupportRemarksFetcher type @@ -39,8 +37,13 @@ func (_m *CustomerSupportRemarksFetcher) ListCustomerSupportRemarks(appCtx appco return r0, r1 } -// NewCustomerSupportRemarksFetcher creates a new instance of CustomerSupportRemarksFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewCustomerSupportRemarksFetcher(t testing.TB) *CustomerSupportRemarksFetcher { +type mockConstructorTestingTNewCustomerSupportRemarksFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewCustomerSupportRemarksFetcher creates a new instance of CustomerSupportRemarksFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewCustomerSupportRemarksFetcher(t mockConstructorTestingTNewCustomerSupportRemarksFetcher) *CustomerSupportRemarksFetcher { mock := &CustomerSupportRemarksFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/CustomerUpdater.go b/pkg/services/mocks/CustomerUpdater.go index ddb981df157..0a6f97f3bca 100644 --- a/pkg/services/mocks/CustomerUpdater.go +++ b/pkg/services/mocks/CustomerUpdater.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // CustomerUpdater is an autogenerated mock type for the CustomerUpdater type @@ -39,8 +37,13 @@ func (_m *CustomerUpdater) UpdateCustomer(appCtx appcontext.AppContext, eTag str return r0, r1 } -// NewCustomerUpdater creates a new instance of CustomerUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewCustomerUpdater(t testing.TB) *CustomerUpdater { +type mockConstructorTestingTNewCustomerUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewCustomerUpdater creates a new instance of CustomerUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewCustomerUpdater(t mockConstructorTestingTNewCustomerUpdater) *CustomerUpdater { mock := &CustomerUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticCratingPricer.go b/pkg/services/mocks/DomesticCratingPricer.go index 5d87971a12f..427c3b1c6d9 100644 --- a/pkg/services/mocks/DomesticCratingPricer.go +++ b/pkg/services/mocks/DomesticCratingPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticCratingPricer) PriceUsingParams(appCtx appcontext.AppContext, return r0, r1, r2 } -// NewDomesticCratingPricer creates a new instance of DomesticCratingPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticCratingPricer(t testing.TB) *DomesticCratingPricer { +type mockConstructorTestingTNewDomesticCratingPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticCratingPricer creates a new instance of DomesticCratingPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticCratingPricer(t mockConstructorTestingTNewDomesticCratingPricer) *DomesticCratingPricer { mock := &DomesticCratingPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticDestinationAdditionalDaysSITPricer.go b/pkg/services/mocks/DomesticDestinationAdditionalDaysSITPricer.go index f76e9b1e047..8a22f0b8159 100644 --- a/pkg/services/mocks/DomesticDestinationAdditionalDaysSITPricer.go +++ b/pkg/services/mocks/DomesticDestinationAdditionalDaysSITPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticDestinationAdditionalDaysSITPricer) PriceUsingParams(appCtx ap return r0, r1, r2 } -// NewDomesticDestinationAdditionalDaysSITPricer creates a new instance of DomesticDestinationAdditionalDaysSITPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticDestinationAdditionalDaysSITPricer(t testing.TB) *DomesticDestinationAdditionalDaysSITPricer { +type mockConstructorTestingTNewDomesticDestinationAdditionalDaysSITPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticDestinationAdditionalDaysSITPricer creates a new instance of DomesticDestinationAdditionalDaysSITPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticDestinationAdditionalDaysSITPricer(t mockConstructorTestingTNewDomesticDestinationAdditionalDaysSITPricer) *DomesticDestinationAdditionalDaysSITPricer { mock := &DomesticDestinationAdditionalDaysSITPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticDestinationFirstDaySITPricer.go b/pkg/services/mocks/DomesticDestinationFirstDaySITPricer.go index 171730fd730..57f0456dfbd 100644 --- a/pkg/services/mocks/DomesticDestinationFirstDaySITPricer.go +++ b/pkg/services/mocks/DomesticDestinationFirstDaySITPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticDestinationFirstDaySITPricer) PriceUsingParams(appCtx appconte return r0, r1, r2 } -// NewDomesticDestinationFirstDaySITPricer creates a new instance of DomesticDestinationFirstDaySITPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticDestinationFirstDaySITPricer(t testing.TB) *DomesticDestinationFirstDaySITPricer { +type mockConstructorTestingTNewDomesticDestinationFirstDaySITPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticDestinationFirstDaySITPricer creates a new instance of DomesticDestinationFirstDaySITPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticDestinationFirstDaySITPricer(t mockConstructorTestingTNewDomesticDestinationFirstDaySITPricer) *DomesticDestinationFirstDaySITPricer { mock := &DomesticDestinationFirstDaySITPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticDestinationPricer.go b/pkg/services/mocks/DomesticDestinationPricer.go index 01c3a3949dd..b806ff34d57 100644 --- a/pkg/services/mocks/DomesticDestinationPricer.go +++ b/pkg/services/mocks/DomesticDestinationPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticDestinationPricer) PriceUsingParams(appCtx appcontext.AppConte return r0, r1, r2 } -// NewDomesticDestinationPricer creates a new instance of DomesticDestinationPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticDestinationPricer(t testing.TB) *DomesticDestinationPricer { +type mockConstructorTestingTNewDomesticDestinationPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticDestinationPricer creates a new instance of DomesticDestinationPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticDestinationPricer(t mockConstructorTestingTNewDomesticDestinationPricer) *DomesticDestinationPricer { mock := &DomesticDestinationPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticDestinationSITDeliveryPricer.go b/pkg/services/mocks/DomesticDestinationSITDeliveryPricer.go index 9949313ced0..80c76714fbf 100644 --- a/pkg/services/mocks/DomesticDestinationSITDeliveryPricer.go +++ b/pkg/services/mocks/DomesticDestinationSITDeliveryPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticDestinationSITDeliveryPricer) PriceUsingParams(appCtx appconte return r0, r1, r2 } -// NewDomesticDestinationSITDeliveryPricer creates a new instance of DomesticDestinationSITDeliveryPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticDestinationSITDeliveryPricer(t testing.TB) *DomesticDestinationSITDeliveryPricer { +type mockConstructorTestingTNewDomesticDestinationSITDeliveryPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticDestinationSITDeliveryPricer creates a new instance of DomesticDestinationSITDeliveryPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticDestinationSITDeliveryPricer(t mockConstructorTestingTNewDomesticDestinationSITDeliveryPricer) *DomesticDestinationSITDeliveryPricer { mock := &DomesticDestinationSITDeliveryPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticDestinationShuttlingPricer.go b/pkg/services/mocks/DomesticDestinationShuttlingPricer.go index fd27e2bed3c..c59fcafaac1 100644 --- a/pkg/services/mocks/DomesticDestinationShuttlingPricer.go +++ b/pkg/services/mocks/DomesticDestinationShuttlingPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticDestinationShuttlingPricer) PriceUsingParams(appCtx appcontext return r0, r1, r2 } -// NewDomesticDestinationShuttlingPricer creates a new instance of DomesticDestinationShuttlingPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticDestinationShuttlingPricer(t testing.TB) *DomesticDestinationShuttlingPricer { +type mockConstructorTestingTNewDomesticDestinationShuttlingPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticDestinationShuttlingPricer creates a new instance of DomesticDestinationShuttlingPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticDestinationShuttlingPricer(t mockConstructorTestingTNewDomesticDestinationShuttlingPricer) *DomesticDestinationShuttlingPricer { mock := &DomesticDestinationShuttlingPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticLinehaulPricer.go b/pkg/services/mocks/DomesticLinehaulPricer.go index 6a47b6e4596..14772893494 100644 --- a/pkg/services/mocks/DomesticLinehaulPricer.go +++ b/pkg/services/mocks/DomesticLinehaulPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticLinehaulPricer) PriceUsingParams(appCtx appcontext.AppContext, return r0, r1, r2 } -// NewDomesticLinehaulPricer creates a new instance of DomesticLinehaulPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticLinehaulPricer(t testing.TB) *DomesticLinehaulPricer { +type mockConstructorTestingTNewDomesticLinehaulPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticLinehaulPricer creates a new instance of DomesticLinehaulPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticLinehaulPricer(t mockConstructorTestingTNewDomesticLinehaulPricer) *DomesticLinehaulPricer { mock := &DomesticLinehaulPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticNTSPackPricer.go b/pkg/services/mocks/DomesticNTSPackPricer.go index fd282fa4365..aa3eb1758e4 100644 --- a/pkg/services/mocks/DomesticNTSPackPricer.go +++ b/pkg/services/mocks/DomesticNTSPackPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticNTSPackPricer) PriceUsingParams(appCtx appcontext.AppContext, return r0, r1, r2 } -// NewDomesticNTSPackPricer creates a new instance of DomesticNTSPackPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticNTSPackPricer(t testing.TB) *DomesticNTSPackPricer { +type mockConstructorTestingTNewDomesticNTSPackPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticNTSPackPricer creates a new instance of DomesticNTSPackPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticNTSPackPricer(t mockConstructorTestingTNewDomesticNTSPackPricer) *DomesticNTSPackPricer { mock := &DomesticNTSPackPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticOriginAdditionalDaysSITPricer.go b/pkg/services/mocks/DomesticOriginAdditionalDaysSITPricer.go index d28692eeb8b..bcb1c730b79 100644 --- a/pkg/services/mocks/DomesticOriginAdditionalDaysSITPricer.go +++ b/pkg/services/mocks/DomesticOriginAdditionalDaysSITPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticOriginAdditionalDaysSITPricer) PriceUsingParams(appCtx appcont return r0, r1, r2 } -// NewDomesticOriginAdditionalDaysSITPricer creates a new instance of DomesticOriginAdditionalDaysSITPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticOriginAdditionalDaysSITPricer(t testing.TB) *DomesticOriginAdditionalDaysSITPricer { +type mockConstructorTestingTNewDomesticOriginAdditionalDaysSITPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticOriginAdditionalDaysSITPricer creates a new instance of DomesticOriginAdditionalDaysSITPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticOriginAdditionalDaysSITPricer(t mockConstructorTestingTNewDomesticOriginAdditionalDaysSITPricer) *DomesticOriginAdditionalDaysSITPricer { mock := &DomesticOriginAdditionalDaysSITPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticOriginFirstDaySITPricer.go b/pkg/services/mocks/DomesticOriginFirstDaySITPricer.go index ae7dd5d27bf..ec3a469522f 100644 --- a/pkg/services/mocks/DomesticOriginFirstDaySITPricer.go +++ b/pkg/services/mocks/DomesticOriginFirstDaySITPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticOriginFirstDaySITPricer) PriceUsingParams(appCtx appcontext.Ap return r0, r1, r2 } -// NewDomesticOriginFirstDaySITPricer creates a new instance of DomesticOriginFirstDaySITPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticOriginFirstDaySITPricer(t testing.TB) *DomesticOriginFirstDaySITPricer { +type mockConstructorTestingTNewDomesticOriginFirstDaySITPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticOriginFirstDaySITPricer creates a new instance of DomesticOriginFirstDaySITPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticOriginFirstDaySITPricer(t mockConstructorTestingTNewDomesticOriginFirstDaySITPricer) *DomesticOriginFirstDaySITPricer { mock := &DomesticOriginFirstDaySITPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticOriginPricer.go b/pkg/services/mocks/DomesticOriginPricer.go index be52bc81e85..9c9468bd626 100644 --- a/pkg/services/mocks/DomesticOriginPricer.go +++ b/pkg/services/mocks/DomesticOriginPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticOriginPricer) PriceUsingParams(appCtx appcontext.AppContext, p return r0, r1, r2 } -// NewDomesticOriginPricer creates a new instance of DomesticOriginPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticOriginPricer(t testing.TB) *DomesticOriginPricer { +type mockConstructorTestingTNewDomesticOriginPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticOriginPricer creates a new instance of DomesticOriginPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticOriginPricer(t mockConstructorTestingTNewDomesticOriginPricer) *DomesticOriginPricer { mock := &DomesticOriginPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticOriginSITPickupPricer.go b/pkg/services/mocks/DomesticOriginSITPickupPricer.go index f56f7802a73..7d183965a27 100644 --- a/pkg/services/mocks/DomesticOriginSITPickupPricer.go +++ b/pkg/services/mocks/DomesticOriginSITPickupPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticOriginSITPickupPricer) PriceUsingParams(appCtx appcontext.AppC return r0, r1, r2 } -// NewDomesticOriginSITPickupPricer creates a new instance of DomesticOriginSITPickupPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticOriginSITPickupPricer(t testing.TB) *DomesticOriginSITPickupPricer { +type mockConstructorTestingTNewDomesticOriginSITPickupPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticOriginSITPickupPricer creates a new instance of DomesticOriginSITPickupPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticOriginSITPickupPricer(t mockConstructorTestingTNewDomesticOriginSITPickupPricer) *DomesticOriginSITPickupPricer { mock := &DomesticOriginSITPickupPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticOriginShuttlingPricer.go b/pkg/services/mocks/DomesticOriginShuttlingPricer.go index 2c636838b03..fe46ef3ab37 100644 --- a/pkg/services/mocks/DomesticOriginShuttlingPricer.go +++ b/pkg/services/mocks/DomesticOriginShuttlingPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticOriginShuttlingPricer) PriceUsingParams(appCtx appcontext.AppC return r0, r1, r2 } -// NewDomesticOriginShuttlingPricer creates a new instance of DomesticOriginShuttlingPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticOriginShuttlingPricer(t testing.TB) *DomesticOriginShuttlingPricer { +type mockConstructorTestingTNewDomesticOriginShuttlingPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticOriginShuttlingPricer creates a new instance of DomesticOriginShuttlingPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticOriginShuttlingPricer(t mockConstructorTestingTNewDomesticOriginShuttlingPricer) *DomesticOriginShuttlingPricer { mock := &DomesticOriginShuttlingPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticPackPricer.go b/pkg/services/mocks/DomesticPackPricer.go index 21de6a6166f..22d7dbca09c 100644 --- a/pkg/services/mocks/DomesticPackPricer.go +++ b/pkg/services/mocks/DomesticPackPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticPackPricer) PriceUsingParams(appCtx appcontext.AppContext, par return r0, r1, r2 } -// NewDomesticPackPricer creates a new instance of DomesticPackPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticPackPricer(t testing.TB) *DomesticPackPricer { +type mockConstructorTestingTNewDomesticPackPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticPackPricer creates a new instance of DomesticPackPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticPackPricer(t mockConstructorTestingTNewDomesticPackPricer) *DomesticPackPricer { mock := &DomesticPackPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticShorthaulPricer.go b/pkg/services/mocks/DomesticShorthaulPricer.go index 82c932418eb..d86069757af 100644 --- a/pkg/services/mocks/DomesticShorthaulPricer.go +++ b/pkg/services/mocks/DomesticShorthaulPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticShorthaulPricer) PriceUsingParams(appCtx appcontext.AppContext return r0, r1, r2 } -// NewDomesticShorthaulPricer creates a new instance of DomesticShorthaulPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticShorthaulPricer(t testing.TB) *DomesticShorthaulPricer { +type mockConstructorTestingTNewDomesticShorthaulPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticShorthaulPricer creates a new instance of DomesticShorthaulPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticShorthaulPricer(t mockConstructorTestingTNewDomesticShorthaulPricer) *DomesticShorthaulPricer { mock := &DomesticShorthaulPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticUncratingPricer.go b/pkg/services/mocks/DomesticUncratingPricer.go index c5b5d9a2a86..7d66a9407fe 100644 --- a/pkg/services/mocks/DomesticUncratingPricer.go +++ b/pkg/services/mocks/DomesticUncratingPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticUncratingPricer) PriceUsingParams(appCtx appcontext.AppContext return r0, r1, r2 } -// NewDomesticUncratingPricer creates a new instance of DomesticUncratingPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticUncratingPricer(t testing.TB) *DomesticUncratingPricer { +type mockConstructorTestingTNewDomesticUncratingPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticUncratingPricer creates a new instance of DomesticUncratingPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticUncratingPricer(t mockConstructorTestingTNewDomesticUncratingPricer) *DomesticUncratingPricer { mock := &DomesticUncratingPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/DomesticUnpackPricer.go b/pkg/services/mocks/DomesticUnpackPricer.go index e86239aad6c..4b6ca37f05f 100644 --- a/pkg/services/mocks/DomesticUnpackPricer.go +++ b/pkg/services/mocks/DomesticUnpackPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *DomesticUnpackPricer) PriceUsingParams(appCtx appcontext.AppContext, p return r0, r1, r2 } -// NewDomesticUnpackPricer creates a new instance of DomesticUnpackPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewDomesticUnpackPricer(t testing.TB) *DomesticUnpackPricer { +type mockConstructorTestingTNewDomesticUnpackPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewDomesticUnpackPricer creates a new instance of DomesticUnpackPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewDomesticUnpackPricer(t mockConstructorTestingTNewDomesticUnpackPricer) *DomesticUnpackPricer { mock := &DomesticUnpackPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ElectronicOrderCategoryCountFetcher.go b/pkg/services/mocks/ElectronicOrderCategoryCountFetcher.go index 46e9f1c7f4a..4c783bf2f73 100644 --- a/pkg/services/mocks/ElectronicOrderCategoryCountFetcher.go +++ b/pkg/services/mocks/ElectronicOrderCategoryCountFetcher.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // ElectronicOrderCategoryCountFetcher is an autogenerated mock type for the ElectronicOrderCategoryCountFetcher type @@ -39,8 +37,13 @@ func (_m *ElectronicOrderCategoryCountFetcher) FetchElectronicOrderCategoricalCo return r0, r1 } -// NewElectronicOrderCategoryCountFetcher creates a new instance of ElectronicOrderCategoryCountFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewElectronicOrderCategoryCountFetcher(t testing.TB) *ElectronicOrderCategoryCountFetcher { +type mockConstructorTestingTNewElectronicOrderCategoryCountFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewElectronicOrderCategoryCountFetcher creates a new instance of ElectronicOrderCategoryCountFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewElectronicOrderCategoryCountFetcher(t mockConstructorTestingTNewElectronicOrderCategoryCountFetcher) *ElectronicOrderCategoryCountFetcher { mock := &ElectronicOrderCategoryCountFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ElectronicOrderListFetcher.go b/pkg/services/mocks/ElectronicOrderListFetcher.go index c49d3eb5941..4751066f92d 100644 --- a/pkg/services/mocks/ElectronicOrderListFetcher.go +++ b/pkg/services/mocks/ElectronicOrderListFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // ElectronicOrderListFetcher is an autogenerated mock type for the ElectronicOrderListFetcher type @@ -62,8 +60,13 @@ func (_m *ElectronicOrderListFetcher) FetchElectronicOrderList(appCtx appcontext return r0, r1 } -// NewElectronicOrderListFetcher creates a new instance of ElectronicOrderListFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewElectronicOrderListFetcher(t testing.TB) *ElectronicOrderListFetcher { +type mockConstructorTestingTNewElectronicOrderListFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewElectronicOrderListFetcher creates a new instance of ElectronicOrderListFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewElectronicOrderListFetcher(t mockConstructorTestingTNewElectronicOrderListFetcher) *ElectronicOrderListFetcher { mock := &ElectronicOrderListFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ExcessWeightRiskManager.go b/pkg/services/mocks/ExcessWeightRiskManager.go index c74c7b2e4fd..9623ecfdb69 100644 --- a/pkg/services/mocks/ExcessWeightRiskManager.go +++ b/pkg/services/mocks/ExcessWeightRiskManager.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -105,8 +103,13 @@ func (_m *ExcessWeightRiskManager) UpdateMaxBillableWeightAsTIO(appCtx appcontex return r0, r1, r2 } -// NewExcessWeightRiskManager creates a new instance of ExcessWeightRiskManager. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewExcessWeightRiskManager(t testing.TB) *ExcessWeightRiskManager { +type mockConstructorTestingTNewExcessWeightRiskManager interface { + mock.TestingT + Cleanup(func()) +} + +// NewExcessWeightRiskManager creates a new instance of ExcessWeightRiskManager. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewExcessWeightRiskManager(t mockConstructorTestingTNewExcessWeightRiskManager) *ExcessWeightRiskManager { mock := &ExcessWeightRiskManager{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/Fetcher.go b/pkg/services/mocks/Fetcher.go index f655a86c1c3..1f42cc54d0f 100644 --- a/pkg/services/mocks/Fetcher.go +++ b/pkg/services/mocks/Fetcher.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // Fetcher is an autogenerated mock type for the Fetcher type @@ -30,8 +28,13 @@ func (_m *Fetcher) FetchRecord(appCtx appcontext.AppContext, model interface{}, return r0 } -// NewFetcher creates a new instance of Fetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewFetcher(t testing.TB) *Fetcher { +type mockConstructorTestingTNewFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewFetcher creates a new instance of Fetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewFetcher(t mockConstructorTestingTNewFetcher) *Fetcher { mock := &Fetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/FuelSurchargePricer.go b/pkg/services/mocks/FuelSurchargePricer.go index 34a8122bca5..586138c4a66 100644 --- a/pkg/services/mocks/FuelSurchargePricer.go +++ b/pkg/services/mocks/FuelSurchargePricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *FuelSurchargePricer) PriceUsingParams(appCtx appcontext.AppContext, pa return r0, r1, r2 } -// NewFuelSurchargePricer creates a new instance of FuelSurchargePricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewFuelSurchargePricer(t testing.TB) *FuelSurchargePricer { +type mockConstructorTestingTNewFuelSurchargePricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewFuelSurchargePricer creates a new instance of FuelSurchargePricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewFuelSurchargePricer(t mockConstructorTestingTNewFuelSurchargePricer) *FuelSurchargePricer { mock := &FuelSurchargePricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/GHCPaymentRequestInvoiceGenerator.go b/pkg/services/mocks/GHCPaymentRequestInvoiceGenerator.go index d8bc4507d49..c1600e4daf9 100644 --- a/pkg/services/mocks/GHCPaymentRequestInvoiceGenerator.go +++ b/pkg/services/mocks/GHCPaymentRequestInvoiceGenerator.go @@ -9,8 +9,6 @@ import ( mock "github.com/stretchr/testify/mock" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // GHCPaymentRequestInvoiceGenerator is an autogenerated mock type for the GHCPaymentRequestInvoiceGenerator type @@ -39,8 +37,13 @@ func (_m *GHCPaymentRequestInvoiceGenerator) Generate(appCtx appcontext.AppConte return r0, r1 } -// NewGHCPaymentRequestInvoiceGenerator creates a new instance of GHCPaymentRequestInvoiceGenerator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewGHCPaymentRequestInvoiceGenerator(t testing.TB) *GHCPaymentRequestInvoiceGenerator { +type mockConstructorTestingTNewGHCPaymentRequestInvoiceGenerator interface { + mock.TestingT + Cleanup(func()) +} + +// NewGHCPaymentRequestInvoiceGenerator creates a new instance of GHCPaymentRequestInvoiceGenerator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewGHCPaymentRequestInvoiceGenerator(t mockConstructorTestingTNewGHCPaymentRequestInvoiceGenerator) *GHCPaymentRequestInvoiceGenerator { mock := &GHCPaymentRequestInvoiceGenerator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/GexSender.go b/pkg/services/mocks/GexSender.go index 385984f18f3..9495628170c 100644 --- a/pkg/services/mocks/GexSender.go +++ b/pkg/services/mocks/GexSender.go @@ -7,8 +7,6 @@ import ( mock "github.com/stretchr/testify/mock" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // GexSender is an autogenerated mock type for the GexSender type @@ -39,8 +37,13 @@ func (_m *GexSender) SendToGex(channel services.GEXChannel, edi string, filename return r0, r1 } -// NewGexSender creates a new instance of GexSender. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewGexSender(t testing.TB) *GexSender { +type mockConstructorTestingTNewGexSender interface { + mock.TestingT + Cleanup(func()) +} + +// NewGexSender creates a new instance of GexSender. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewGexSender(t mockConstructorTestingTNewGexSender) *GexSender { mock := &GexSender{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ListFetcher.go b/pkg/services/mocks/ListFetcher.go index 023e73ef31c..38ad76d72f7 100644 --- a/pkg/services/mocks/ListFetcher.go +++ b/pkg/services/mocks/ListFetcher.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // ListFetcher is an autogenerated mock type for the ListFetcher type @@ -51,8 +49,13 @@ func (_m *ListFetcher) FetchRecordList(appCtx appcontext.AppContext, model inter return r0 } -// NewListFetcher creates a new instance of ListFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewListFetcher(t testing.TB) *ListFetcher { +type mockConstructorTestingTNewListFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewListFetcher creates a new instance of ListFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewListFetcher(t mockConstructorTestingTNewListFetcher) *ListFetcher { mock := &ListFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MTOAgentCreator.go b/pkg/services/mocks/MTOAgentCreator.go index 592c811112d..60d586ab9d1 100644 --- a/pkg/services/mocks/MTOAgentCreator.go +++ b/pkg/services/mocks/MTOAgentCreator.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // MTOAgentCreator is an autogenerated mock type for the MTOAgentCreator type @@ -39,8 +37,13 @@ func (_m *MTOAgentCreator) CreateMTOAgentPrime(appCtx appcontext.AppContext, mto return r0, r1 } -// NewMTOAgentCreator creates a new instance of MTOAgentCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMTOAgentCreator(t testing.TB) *MTOAgentCreator { +type mockConstructorTestingTNewMTOAgentCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewMTOAgentCreator creates a new instance of MTOAgentCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMTOAgentCreator(t mockConstructorTestingTNewMTOAgentCreator) *MTOAgentCreator { mock := &MTOAgentCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MTOAgentUpdater.go b/pkg/services/mocks/MTOAgentUpdater.go index f3fac22397f..9c371a0b7fd 100644 --- a/pkg/services/mocks/MTOAgentUpdater.go +++ b/pkg/services/mocks/MTOAgentUpdater.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // MTOAgentUpdater is an autogenerated mock type for the MTOAgentUpdater type @@ -62,8 +60,13 @@ func (_m *MTOAgentUpdater) UpdateMTOAgentPrime(appCtx appcontext.AppContext, mto return r0, r1 } -// NewMTOAgentUpdater creates a new instance of MTOAgentUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMTOAgentUpdater(t testing.TB) *MTOAgentUpdater { +type mockConstructorTestingTNewMTOAgentUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewMTOAgentUpdater creates a new instance of MTOAgentUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMTOAgentUpdater(t mockConstructorTestingTNewMTOAgentUpdater) *MTOAgentUpdater { mock := &MTOAgentUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MTOServiceItemCreator.go b/pkg/services/mocks/MTOServiceItemCreator.go index ac87d08e6d2..b2861ee7522 100644 --- a/pkg/services/mocks/MTOServiceItemCreator.go +++ b/pkg/services/mocks/MTOServiceItemCreator.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - validate "github.com/gobuffalo/validate/v3" ) @@ -50,8 +48,13 @@ func (_m *MTOServiceItemCreator) CreateMTOServiceItem(appCtx appcontext.AppConte return r0, r1, r2 } -// NewMTOServiceItemCreator creates a new instance of MTOServiceItemCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMTOServiceItemCreator(t testing.TB) *MTOServiceItemCreator { +type mockConstructorTestingTNewMTOServiceItemCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewMTOServiceItemCreator creates a new instance of MTOServiceItemCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMTOServiceItemCreator(t mockConstructorTestingTNewMTOServiceItemCreator) *MTOServiceItemCreator { mock := &MTOServiceItemCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MTOServiceItemUpdater.go b/pkg/services/mocks/MTOServiceItemUpdater.go index fafe71ff471..533f2f3cffc 100644 --- a/pkg/services/mocks/MTOServiceItemUpdater.go +++ b/pkg/services/mocks/MTOServiceItemUpdater.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -110,8 +108,13 @@ func (_m *MTOServiceItemUpdater) UpdateMTOServiceItemPrime(appCtx appcontext.App return r0, r1 } -// NewMTOServiceItemUpdater creates a new instance of MTOServiceItemUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMTOServiceItemUpdater(t testing.TB) *MTOServiceItemUpdater { +type mockConstructorTestingTNewMTOServiceItemUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewMTOServiceItemUpdater creates a new instance of MTOServiceItemUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMTOServiceItemUpdater(t mockConstructorTestingTNewMTOServiceItemUpdater) *MTOServiceItemUpdater { mock := &MTOServiceItemUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MTOShipmentCreator.go b/pkg/services/mocks/MTOShipmentCreator.go index 65bd30c605a..ffebbad707d 100644 --- a/pkg/services/mocks/MTOShipmentCreator.go +++ b/pkg/services/mocks/MTOShipmentCreator.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // MTOShipmentCreator is an autogenerated mock type for the MTOShipmentCreator type @@ -39,8 +37,13 @@ func (_m *MTOShipmentCreator) CreateMTOShipment(appCtx appcontext.AppContext, MT return r0, r1 } -// NewMTOShipmentCreator creates a new instance of MTOShipmentCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMTOShipmentCreator(t testing.TB) *MTOShipmentCreator { +type mockConstructorTestingTNewMTOShipmentCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewMTOShipmentCreator creates a new instance of MTOShipmentCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMTOShipmentCreator(t mockConstructorTestingTNewMTOShipmentCreator) *MTOShipmentCreator { mock := &MTOShipmentCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MTOShipmentFetcher.go b/pkg/services/mocks/MTOShipmentFetcher.go index efeacdbc899..236efc4bd01 100644 --- a/pkg/services/mocks/MTOShipmentFetcher.go +++ b/pkg/services/mocks/MTOShipmentFetcher.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *MTOShipmentFetcher) ListMTOShipments(appCtx appcontext.AppContext, mov return r0, r1 } -// NewMTOShipmentFetcher creates a new instance of MTOShipmentFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMTOShipmentFetcher(t testing.TB) *MTOShipmentFetcher { +type mockConstructorTestingTNewMTOShipmentFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewMTOShipmentFetcher creates a new instance of MTOShipmentFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMTOShipmentFetcher(t mockConstructorTestingTNewMTOShipmentFetcher) *MTOShipmentFetcher { mock := &MTOShipmentFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MTOShipmentStatusUpdater.go b/pkg/services/mocks/MTOShipmentStatusUpdater.go index 9e33e5c6307..e2234a572ab 100644 --- a/pkg/services/mocks/MTOShipmentStatusUpdater.go +++ b/pkg/services/mocks/MTOShipmentStatusUpdater.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *MTOShipmentStatusUpdater) UpdateMTOShipmentStatus(appCtx appcontext.Ap return r0, r1 } -// NewMTOShipmentStatusUpdater creates a new instance of MTOShipmentStatusUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMTOShipmentStatusUpdater(t testing.TB) *MTOShipmentStatusUpdater { +type mockConstructorTestingTNewMTOShipmentStatusUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewMTOShipmentStatusUpdater creates a new instance of MTOShipmentStatusUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMTOShipmentStatusUpdater(t mockConstructorTestingTNewMTOShipmentStatusUpdater) *MTOShipmentStatusUpdater { mock := &MTOShipmentStatusUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MTOShipmentUpdater.go b/pkg/services/mocks/MTOShipmentUpdater.go index 7b3551d0aca..b326af21f31 100644 --- a/pkg/services/mocks/MTOShipmentUpdater.go +++ b/pkg/services/mocks/MTOShipmentUpdater.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -62,8 +60,13 @@ func (_m *MTOShipmentUpdater) UpdateMTOShipment(appCtx appcontext.AppContext, mt return r0, r1 } -// NewMTOShipmentUpdater creates a new instance of MTOShipmentUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMTOShipmentUpdater(t testing.TB) *MTOShipmentUpdater { +type mockConstructorTestingTNewMTOShipmentUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewMTOShipmentUpdater creates a new instance of MTOShipmentUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMTOShipmentUpdater(t mockConstructorTestingTNewMTOShipmentUpdater) *MTOShipmentUpdater { mock := &MTOShipmentUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ManagementServicesPricer.go b/pkg/services/mocks/ManagementServicesPricer.go index 1bd987c0880..76620964a4f 100644 --- a/pkg/services/mocks/ManagementServicesPricer.go +++ b/pkg/services/mocks/ManagementServicesPricer.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" unit "github.com/transcom/mymove/pkg/unit" @@ -82,8 +80,13 @@ func (_m *ManagementServicesPricer) PriceUsingParams(appCtx appcontext.AppContex return r0, r1, r2 } -// NewManagementServicesPricer creates a new instance of ManagementServicesPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewManagementServicesPricer(t testing.TB) *ManagementServicesPricer { +type mockConstructorTestingTNewManagementServicesPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewManagementServicesPricer creates a new instance of ManagementServicesPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewManagementServicesPricer(t mockConstructorTestingTNewManagementServicesPricer) *ManagementServicesPricer { mock := &ManagementServicesPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveDocumentStatusUpdater.go b/pkg/services/mocks/MoveDocumentStatusUpdater.go index e5f511ae673..923b7b98d86 100644 --- a/pkg/services/mocks/MoveDocumentStatusUpdater.go +++ b/pkg/services/mocks/MoveDocumentStatusUpdater.go @@ -10,8 +10,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - validate "github.com/gobuffalo/validate/v3" ) @@ -52,8 +50,13 @@ func (_m *MoveDocumentStatusUpdater) UpdateMoveDocumentStatus(appCtx appcontext. return r0, r1, r2 } -// NewMoveDocumentStatusUpdater creates a new instance of MoveDocumentStatusUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveDocumentStatusUpdater(t testing.TB) *MoveDocumentStatusUpdater { +type mockConstructorTestingTNewMoveDocumentStatusUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveDocumentStatusUpdater creates a new instance of MoveDocumentStatusUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveDocumentStatusUpdater(t mockConstructorTestingTNewMoveDocumentStatusUpdater) *MoveDocumentStatusUpdater { mock := &MoveDocumentStatusUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveDocumentUpdater.go b/pkg/services/mocks/MoveDocumentUpdater.go index 432a5e1ce5e..da43a7dcf9e 100644 --- a/pkg/services/mocks/MoveDocumentUpdater.go +++ b/pkg/services/mocks/MoveDocumentUpdater.go @@ -10,8 +10,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" validate "github.com/gobuffalo/validate/v3" @@ -86,8 +84,13 @@ func (_m *MoveDocumentUpdater) UpdateMoveDocumentStatus(appCtx appcontext.AppCon return r0, r1, r2 } -// NewMoveDocumentUpdater creates a new instance of MoveDocumentUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveDocumentUpdater(t testing.TB) *MoveDocumentUpdater { +type mockConstructorTestingTNewMoveDocumentUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveDocumentUpdater creates a new instance of MoveDocumentUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveDocumentUpdater(t mockConstructorTestingTNewMoveDocumentUpdater) *MoveDocumentUpdater { mock := &MoveDocumentUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveExcessWeightUploader.go b/pkg/services/mocks/MoveExcessWeightUploader.go index be4c0875880..2dc82a236c9 100644 --- a/pkg/services/mocks/MoveExcessWeightUploader.go +++ b/pkg/services/mocks/MoveExcessWeightUploader.go @@ -11,8 +11,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -44,8 +42,13 @@ func (_m *MoveExcessWeightUploader) CreateExcessWeightUpload(appCtx appcontext.A return r0, r1 } -// NewMoveExcessWeightUploader creates a new instance of MoveExcessWeightUploader. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveExcessWeightUploader(t testing.TB) *MoveExcessWeightUploader { +type mockConstructorTestingTNewMoveExcessWeightUploader interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveExcessWeightUploader creates a new instance of MoveExcessWeightUploader. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveExcessWeightUploader(t mockConstructorTestingTNewMoveExcessWeightUploader) *MoveExcessWeightUploader { mock := &MoveExcessWeightUploader{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveFetcher.go b/pkg/services/mocks/MoveFetcher.go index 1a8570273fa..1be7565a238 100644 --- a/pkg/services/mocks/MoveFetcher.go +++ b/pkg/services/mocks/MoveFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // MoveFetcher is an autogenerated mock type for the MoveFetcher type @@ -41,8 +39,13 @@ func (_m *MoveFetcher) FetchMove(appCtx appcontext.AppContext, locator string, s return r0, r1 } -// NewMoveFetcher creates a new instance of MoveFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveFetcher(t testing.TB) *MoveFetcher { +type mockConstructorTestingTNewMoveFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveFetcher creates a new instance of MoveFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveFetcher(t mockConstructorTestingTNewMoveFetcher) *MoveFetcher { mock := &MoveFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveFinancialReviewFlagSetter.go b/pkg/services/mocks/MoveFinancialReviewFlagSetter.go index ce05654f00b..c485adc66b7 100644 --- a/pkg/services/mocks/MoveFinancialReviewFlagSetter.go +++ b/pkg/services/mocks/MoveFinancialReviewFlagSetter.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *MoveFinancialReviewFlagSetter) SetFinancialReviewFlag(appCtx appcontex return r0, r1 } -// NewMoveFinancialReviewFlagSetter creates a new instance of MoveFinancialReviewFlagSetter. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveFinancialReviewFlagSetter(t testing.TB) *MoveFinancialReviewFlagSetter { +type mockConstructorTestingTNewMoveFinancialReviewFlagSetter interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveFinancialReviewFlagSetter creates a new instance of MoveFinancialReviewFlagSetter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveFinancialReviewFlagSetter(t mockConstructorTestingTNewMoveFinancialReviewFlagSetter) *MoveFinancialReviewFlagSetter { mock := &MoveFinancialReviewFlagSetter{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveHistoryFetcher.go b/pkg/services/mocks/MoveHistoryFetcher.go index 9c34b11b1e0..e24abf80df3 100644 --- a/pkg/services/mocks/MoveHistoryFetcher.go +++ b/pkg/services/mocks/MoveHistoryFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // MoveHistoryFetcher is an autogenerated mock type for the MoveHistoryFetcher type @@ -48,8 +46,13 @@ func (_m *MoveHistoryFetcher) FetchMoveHistory(appCtx appcontext.AppContext, par return r0, r1, r2 } -// NewMoveHistoryFetcher creates a new instance of MoveHistoryFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveHistoryFetcher(t testing.TB) *MoveHistoryFetcher { +type mockConstructorTestingTNewMoveHistoryFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveHistoryFetcher creates a new instance of MoveHistoryFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveHistoryFetcher(t mockConstructorTestingTNewMoveHistoryFetcher) *MoveHistoryFetcher { mock := &MoveHistoryFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveListFetcher.go b/pkg/services/mocks/MoveListFetcher.go index 5d9a9b7c569..5990f47a9de 100644 --- a/pkg/services/mocks/MoveListFetcher.go +++ b/pkg/services/mocks/MoveListFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // MoveListFetcher is an autogenerated mock type for the MoveListFetcher type @@ -62,8 +60,13 @@ func (_m *MoveListFetcher) FetchMoveList(appCtx appcontext.AppContext, filters [ return r0, r1 } -// NewMoveListFetcher creates a new instance of MoveListFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveListFetcher(t testing.TB) *MoveListFetcher { +type mockConstructorTestingTNewMoveListFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveListFetcher creates a new instance of MoveListFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveListFetcher(t mockConstructorTestingTNewMoveListFetcher) *MoveListFetcher { mock := &MoveListFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveRouter.go b/pkg/services/mocks/MoveRouter.go index 056d01860b4..7e61a7e63df 100644 --- a/pkg/services/mocks/MoveRouter.go +++ b/pkg/services/mocks/MoveRouter.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // MoveRouter is an autogenerated mock type for the MoveRouter type @@ -109,8 +107,13 @@ func (_m *MoveRouter) Submit(appCtx appcontext.AppContext, move *models.Move) er return r0 } -// NewMoveRouter creates a new instance of MoveRouter. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveRouter(t testing.TB) *MoveRouter { +type mockConstructorTestingTNewMoveRouter interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveRouter creates a new instance of MoveRouter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveRouter(t mockConstructorTestingTNewMoveRouter) *MoveRouter { mock := &MoveRouter{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveSearcher.go b/pkg/services/mocks/MoveSearcher.go index c41cc3b726c..216d60f1bc6 100644 --- a/pkg/services/mocks/MoveSearcher.go +++ b/pkg/services/mocks/MoveSearcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // MoveSearcher is an autogenerated mock type for the MoveSearcher type @@ -48,8 +46,13 @@ func (_m *MoveSearcher) SearchMoves(appCtx appcontext.AppContext, params *servic return r0, r1, r2 } -// NewMoveSearcher creates a new instance of MoveSearcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveSearcher(t testing.TB) *MoveSearcher { +type mockConstructorTestingTNewMoveSearcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveSearcher creates a new instance of MoveSearcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveSearcher(t mockConstructorTestingTNewMoveSearcher) *MoveSearcher { mock := &MoveSearcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveTaskOrderChecker.go b/pkg/services/mocks/MoveTaskOrderChecker.go index 7cc8d81e441..7b4d8f32227 100644 --- a/pkg/services/mocks/MoveTaskOrderChecker.go +++ b/pkg/services/mocks/MoveTaskOrderChecker.go @@ -6,8 +6,6 @@ import ( mock "github.com/stretchr/testify/mock" appcontext "github.com/transcom/mymove/pkg/appcontext" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -37,8 +35,13 @@ func (_m *MoveTaskOrderChecker) MTOAvailableToPrime(appCtx appcontext.AppContext return r0, r1 } -// NewMoveTaskOrderChecker creates a new instance of MoveTaskOrderChecker. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveTaskOrderChecker(t testing.TB) *MoveTaskOrderChecker { +type mockConstructorTestingTNewMoveTaskOrderChecker interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveTaskOrderChecker creates a new instance of MoveTaskOrderChecker. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveTaskOrderChecker(t mockConstructorTestingTNewMoveTaskOrderChecker) *MoveTaskOrderChecker { mock := &MoveTaskOrderChecker{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveTaskOrderCreator.go b/pkg/services/mocks/MoveTaskOrderCreator.go index 7a45a7c9405..996eca7ec41 100644 --- a/pkg/services/mocks/MoveTaskOrderCreator.go +++ b/pkg/services/mocks/MoveTaskOrderCreator.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - validate "github.com/gobuffalo/validate/v3" ) @@ -50,8 +48,13 @@ func (_m *MoveTaskOrderCreator) CreateMoveTaskOrder(appCtx appcontext.AppContext return r0, r1, r2 } -// NewMoveTaskOrderCreator creates a new instance of MoveTaskOrderCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveTaskOrderCreator(t testing.TB) *MoveTaskOrderCreator { +type mockConstructorTestingTNewMoveTaskOrderCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveTaskOrderCreator creates a new instance of MoveTaskOrderCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveTaskOrderCreator(t mockConstructorTestingTNewMoveTaskOrderCreator) *MoveTaskOrderCreator { mock := &MoveTaskOrderCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveTaskOrderFetcher.go b/pkg/services/mocks/MoveTaskOrderFetcher.go index 6152eae00d8..e152f8eef25 100644 --- a/pkg/services/mocks/MoveTaskOrderFetcher.go +++ b/pkg/services/mocks/MoveTaskOrderFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // MoveTaskOrderFetcher is an autogenerated mock type for the MoveTaskOrderFetcher type @@ -87,8 +85,13 @@ func (_m *MoveTaskOrderFetcher) ListPrimeMoveTaskOrders(appCtx appcontext.AppCon return r0, r1 } -// NewMoveTaskOrderFetcher creates a new instance of MoveTaskOrderFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveTaskOrderFetcher(t testing.TB) *MoveTaskOrderFetcher { +type mockConstructorTestingTNewMoveTaskOrderFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveTaskOrderFetcher creates a new instance of MoveTaskOrderFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveTaskOrderFetcher(t mockConstructorTestingTNewMoveTaskOrderFetcher) *MoveTaskOrderFetcher { mock := &MoveTaskOrderFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveTaskOrderHider.go b/pkg/services/mocks/MoveTaskOrderHider.go index f21f1cc6b72..fe12d4a80dd 100644 --- a/pkg/services/mocks/MoveTaskOrderHider.go +++ b/pkg/services/mocks/MoveTaskOrderHider.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // MoveTaskOrderHider is an autogenerated mock type for the MoveTaskOrderHider type @@ -39,8 +37,13 @@ func (_m *MoveTaskOrderHider) Hide(appCtx appcontext.AppContext) (services.Hidde return r0, r1 } -// NewMoveTaskOrderHider creates a new instance of MoveTaskOrderHider. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveTaskOrderHider(t testing.TB) *MoveTaskOrderHider { +type mockConstructorTestingTNewMoveTaskOrderHider interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveTaskOrderHider creates a new instance of MoveTaskOrderHider. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveTaskOrderHider(t mockConstructorTestingTNewMoveTaskOrderHider) *MoveTaskOrderHider { mock := &MoveTaskOrderHider{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveTaskOrderUpdater.go b/pkg/services/mocks/MoveTaskOrderUpdater.go index 52c3c6eff23..98a0e19f620 100644 --- a/pkg/services/mocks/MoveTaskOrderUpdater.go +++ b/pkg/services/mocks/MoveTaskOrderUpdater.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -156,8 +154,13 @@ func (_m *MoveTaskOrderUpdater) UpdateTIORemarks(appCtx appcontext.AppContext, m return r0, r1 } -// NewMoveTaskOrderUpdater creates a new instance of MoveTaskOrderUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveTaskOrderUpdater(t testing.TB) *MoveTaskOrderUpdater { +type mockConstructorTestingTNewMoveTaskOrderUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveTaskOrderUpdater creates a new instance of MoveTaskOrderUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveTaskOrderUpdater(t mockConstructorTestingTNewMoveTaskOrderUpdater) *MoveTaskOrderUpdater { mock := &MoveTaskOrderUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/MoveWeights.go b/pkg/services/mocks/MoveWeights.go index 9719a3f7c7c..7893df6eaac 100644 --- a/pkg/services/mocks/MoveWeights.go +++ b/pkg/services/mocks/MoveWeights.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" validate "github.com/gobuffalo/validate/v3" @@ -75,8 +73,13 @@ func (_m *MoveWeights) CheckExcessWeight(appCtx appcontext.AppContext, moveID uu return r0, r1, r2 } -// NewMoveWeights creates a new instance of MoveWeights. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewMoveWeights(t testing.TB) *MoveWeights { +type mockConstructorTestingTNewMoveWeights interface { + mock.TestingT + Cleanup(func()) +} + +// NewMoveWeights creates a new instance of MoveWeights. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewMoveWeights(t mockConstructorTestingTNewMoveWeights) *MoveWeights { mock := &MoveWeights{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/OfficeListFetcher.go b/pkg/services/mocks/OfficeListFetcher.go index 29a674e53a1..af95dadf98a 100644 --- a/pkg/services/mocks/OfficeListFetcher.go +++ b/pkg/services/mocks/OfficeListFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // OfficeListFetcher is an autogenerated mock type for the OfficeListFetcher type @@ -62,8 +60,13 @@ func (_m *OfficeListFetcher) FetchOfficeList(appCtx appcontext.AppContext, filte return r0, r1 } -// NewOfficeListFetcher creates a new instance of OfficeListFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewOfficeListFetcher(t testing.TB) *OfficeListFetcher { +type mockConstructorTestingTNewOfficeListFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewOfficeListFetcher creates a new instance of OfficeListFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewOfficeListFetcher(t mockConstructorTestingTNewOfficeListFetcher) *OfficeListFetcher { mock := &OfficeListFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/OfficeUserCreator.go b/pkg/services/mocks/OfficeUserCreator.go index 9f93b7641bb..5b9e4bed63f 100644 --- a/pkg/services/mocks/OfficeUserCreator.go +++ b/pkg/services/mocks/OfficeUserCreator.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - validate "github.com/gobuffalo/validate/v3" ) @@ -52,8 +50,13 @@ func (_m *OfficeUserCreator) CreateOfficeUser(appCtx appcontext.AppContext, user return r0, r1, r2 } -// NewOfficeUserCreator creates a new instance of OfficeUserCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewOfficeUserCreator(t testing.TB) *OfficeUserCreator { +type mockConstructorTestingTNewOfficeUserCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewOfficeUserCreator creates a new instance of OfficeUserCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewOfficeUserCreator(t mockConstructorTestingTNewOfficeUserCreator) *OfficeUserCreator { mock := &OfficeUserCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/OfficeUserFetcher.go b/pkg/services/mocks/OfficeUserFetcher.go index 1d6d541d9dd..d0e1f3bdc10 100644 --- a/pkg/services/mocks/OfficeUserFetcher.go +++ b/pkg/services/mocks/OfficeUserFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // OfficeUserFetcher is an autogenerated mock type for the OfficeUserFetcher type @@ -39,8 +37,13 @@ func (_m *OfficeUserFetcher) FetchOfficeUser(appCtx appcontext.AppContext, filte return r0, r1 } -// NewOfficeUserFetcher creates a new instance of OfficeUserFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewOfficeUserFetcher(t testing.TB) *OfficeUserFetcher { +type mockConstructorTestingTNewOfficeUserFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewOfficeUserFetcher creates a new instance of OfficeUserFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewOfficeUserFetcher(t mockConstructorTestingTNewOfficeUserFetcher) *OfficeUserFetcher { mock := &OfficeUserFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/OfficeUserFetcherPop.go b/pkg/services/mocks/OfficeUserFetcherPop.go index 4b1c0d0a653..f7c01b4affa 100644 --- a/pkg/services/mocks/OfficeUserFetcherPop.go +++ b/pkg/services/mocks/OfficeUserFetcherPop.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -39,8 +37,13 @@ func (_m *OfficeUserFetcherPop) FetchOfficeUserByID(appCtx appcontext.AppContext return r0, r1 } -// NewOfficeUserFetcherPop creates a new instance of OfficeUserFetcherPop. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewOfficeUserFetcherPop(t testing.TB) *OfficeUserFetcherPop { +type mockConstructorTestingTNewOfficeUserFetcherPop interface { + mock.TestingT + Cleanup(func()) +} + +// NewOfficeUserFetcherPop creates a new instance of OfficeUserFetcherPop. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewOfficeUserFetcherPop(t mockConstructorTestingTNewOfficeUserFetcherPop) *OfficeUserFetcherPop { mock := &OfficeUserFetcherPop{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/OfficeUserGblocFetcher.go b/pkg/services/mocks/OfficeUserGblocFetcher.go index 292781c7d28..b7eee0c4209 100644 --- a/pkg/services/mocks/OfficeUserGblocFetcher.go +++ b/pkg/services/mocks/OfficeUserGblocFetcher.go @@ -6,8 +6,6 @@ import ( mock "github.com/stretchr/testify/mock" appcontext "github.com/transcom/mymove/pkg/appcontext" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -37,8 +35,13 @@ func (_m *OfficeUserGblocFetcher) FetchGblocForOfficeUser(appCtx appcontext.AppC return r0, r1 } -// NewOfficeUserGblocFetcher creates a new instance of OfficeUserGblocFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewOfficeUserGblocFetcher(t testing.TB) *OfficeUserGblocFetcher { +type mockConstructorTestingTNewOfficeUserGblocFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewOfficeUserGblocFetcher creates a new instance of OfficeUserGblocFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewOfficeUserGblocFetcher(t mockConstructorTestingTNewOfficeUserGblocFetcher) *OfficeUserGblocFetcher { mock := &OfficeUserGblocFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/OfficeUserUpdater.go b/pkg/services/mocks/OfficeUserUpdater.go index e283cfd8b6e..fcd2c0c8243 100644 --- a/pkg/services/mocks/OfficeUserUpdater.go +++ b/pkg/services/mocks/OfficeUserUpdater.go @@ -10,8 +10,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" validate "github.com/gobuffalo/validate/v3" @@ -54,8 +52,13 @@ func (_m *OfficeUserUpdater) UpdateOfficeUser(appCtx appcontext.AppContext, id u return r0, r1, r2 } -// NewOfficeUserUpdater creates a new instance of OfficeUserUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewOfficeUserUpdater(t testing.TB) *OfficeUserUpdater { +type mockConstructorTestingTNewOfficeUserUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewOfficeUserUpdater creates a new instance of OfficeUserUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewOfficeUserUpdater(t mockConstructorTestingTNewOfficeUserUpdater) *OfficeUserUpdater { mock := &OfficeUserUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/OrderFetcher.go b/pkg/services/mocks/OrderFetcher.go index 4ba0d9b33a2..d60ea7180d5 100644 --- a/pkg/services/mocks/OrderFetcher.go +++ b/pkg/services/mocks/OrderFetcher.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -73,8 +71,13 @@ func (_m *OrderFetcher) ListOrders(appCtx appcontext.AppContext, officeUserID uu return r0, r1, r2 } -// NewOrderFetcher creates a new instance of OrderFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewOrderFetcher(t testing.TB) *OrderFetcher { +type mockConstructorTestingTNewOrderFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewOrderFetcher creates a new instance of OrderFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewOrderFetcher(t mockConstructorTestingTNewOrderFetcher) *OrderFetcher { mock := &OrderFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/OrderUpdater.go b/pkg/services/mocks/OrderUpdater.go index f617568d189..2f8f1f6b28b 100644 --- a/pkg/services/mocks/OrderUpdater.go +++ b/pkg/services/mocks/OrderUpdater.go @@ -14,8 +14,6 @@ import ( storage "github.com/transcom/mymove/pkg/storage" - testing "testing" - uuid "github.com/gofrs/uuid" validate "github.com/gobuffalo/validate/v3" @@ -191,8 +189,13 @@ func (_m *OrderUpdater) UploadAmendedOrdersAsCustomer(appCtx appcontext.AppConte return r0, r1, r2, r3 } -// NewOrderUpdater creates a new instance of OrderUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewOrderUpdater(t testing.TB) *OrderUpdater { +type mockConstructorTestingTNewOrderUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewOrderUpdater creates a new instance of OrderUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewOrderUpdater(t mockConstructorTestingTNewOrderUpdater) *OrderUpdater { mock := &OrderUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/OrganizationListFetcher.go b/pkg/services/mocks/OrganizationListFetcher.go index b114d99a564..fd840e85234 100644 --- a/pkg/services/mocks/OrganizationListFetcher.go +++ b/pkg/services/mocks/OrganizationListFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // OrganizationListFetcher is an autogenerated mock type for the OrganizationListFetcher type @@ -62,8 +60,13 @@ func (_m *OrganizationListFetcher) FetchOrganizationList(appCtx appcontext.AppCo return r0, r1 } -// NewOrganizationListFetcher creates a new instance of OrganizationListFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewOrganizationListFetcher(t testing.TB) *OrganizationListFetcher { +type mockConstructorTestingTNewOrganizationListFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewOrganizationListFetcher creates a new instance of OrganizationListFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewOrganizationListFetcher(t mockConstructorTestingTNewOrganizationListFetcher) *OrganizationListFetcher { mock := &OrganizationListFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PPMEstimator.go b/pkg/services/mocks/PPMEstimator.go index dcd74bcbb8b..8ec6075c8f4 100644 --- a/pkg/services/mocks/PPMEstimator.go +++ b/pkg/services/mocks/PPMEstimator.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - unit "github.com/transcom/mymove/pkg/unit" ) @@ -41,8 +39,13 @@ func (_m *PPMEstimator) EstimateIncentiveWithDefaultChecks(appCtx appcontext.App return r0, r1 } -// NewPPMEstimator creates a new instance of PPMEstimator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPPMEstimator(t testing.TB) *PPMEstimator { +type mockConstructorTestingTNewPPMEstimator interface { + mock.TestingT + Cleanup(func()) +} + +// NewPPMEstimator creates a new instance of PPMEstimator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPPMEstimator(t mockConstructorTestingTNewPPMEstimator) *PPMEstimator { mock := &PPMEstimator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PPMShipmentCreator.go b/pkg/services/mocks/PPMShipmentCreator.go index e0066109b1a..1b498648a87 100644 --- a/pkg/services/mocks/PPMShipmentCreator.go +++ b/pkg/services/mocks/PPMShipmentCreator.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // PPMShipmentCreator is an autogenerated mock type for the PPMShipmentCreator type @@ -39,8 +37,13 @@ func (_m *PPMShipmentCreator) CreatePPMShipmentWithDefaultCheck(appCtx appcontex return r0, r1 } -// NewPPMShipmentCreator creates a new instance of PPMShipmentCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPPMShipmentCreator(t testing.TB) *PPMShipmentCreator { +type mockConstructorTestingTNewPPMShipmentCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewPPMShipmentCreator creates a new instance of PPMShipmentCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPPMShipmentCreator(t mockConstructorTestingTNewPPMShipmentCreator) *PPMShipmentCreator { mock := &PPMShipmentCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PPMShipmentUpdater.go b/pkg/services/mocks/PPMShipmentUpdater.go index 087f0e6eae1..c6992756eef 100644 --- a/pkg/services/mocks/PPMShipmentUpdater.go +++ b/pkg/services/mocks/PPMShipmentUpdater.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *PPMShipmentUpdater) UpdatePPMShipmentWithDefaultCheck(appCtx appcontex return r0, r1 } -// NewPPMShipmentUpdater creates a new instance of PPMShipmentUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPPMShipmentUpdater(t testing.TB) *PPMShipmentUpdater { +type mockConstructorTestingTNewPPMShipmentUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewPPMShipmentUpdater creates a new instance of PPMShipmentUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPPMShipmentUpdater(t mockConstructorTestingTNewPPMShipmentUpdater) *PPMShipmentUpdater { mock := &PPMShipmentUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PaymentRequestCreator.go b/pkg/services/mocks/PaymentRequestCreator.go index bd896f10acb..93eb71d1435 100644 --- a/pkg/services/mocks/PaymentRequestCreator.go +++ b/pkg/services/mocks/PaymentRequestCreator.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // PaymentRequestCreator is an autogenerated mock type for the PaymentRequestCreator type @@ -39,8 +37,13 @@ func (_m *PaymentRequestCreator) CreatePaymentRequestCheck(appCtx appcontext.App return r0, r1 } -// NewPaymentRequestCreator creates a new instance of PaymentRequestCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPaymentRequestCreator(t testing.TB) *PaymentRequestCreator { +type mockConstructorTestingTNewPaymentRequestCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewPaymentRequestCreator creates a new instance of PaymentRequestCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPaymentRequestCreator(t mockConstructorTestingTNewPaymentRequestCreator) *PaymentRequestCreator { mock := &PaymentRequestCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PaymentRequestFetcher.go b/pkg/services/mocks/PaymentRequestFetcher.go index c2ecb4080b7..bc0f3fc97bb 100644 --- a/pkg/services/mocks/PaymentRequestFetcher.go +++ b/pkg/services/mocks/PaymentRequestFetcher.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -39,8 +37,13 @@ func (_m *PaymentRequestFetcher) FetchPaymentRequest(appCtx appcontext.AppContex return r0, r1 } -// NewPaymentRequestFetcher creates a new instance of PaymentRequestFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPaymentRequestFetcher(t testing.TB) *PaymentRequestFetcher { +type mockConstructorTestingTNewPaymentRequestFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewPaymentRequestFetcher creates a new instance of PaymentRequestFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPaymentRequestFetcher(t mockConstructorTestingTNewPaymentRequestFetcher) *PaymentRequestFetcher { mock := &PaymentRequestFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PaymentRequestListFetcher.go b/pkg/services/mocks/PaymentRequestListFetcher.go index 1bb90ca498c..f18e69496c5 100644 --- a/pkg/services/mocks/PaymentRequestListFetcher.go +++ b/pkg/services/mocks/PaymentRequestListFetcher.go @@ -10,8 +10,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -73,8 +71,13 @@ func (_m *PaymentRequestListFetcher) FetchPaymentRequestListByMove(appCtx appcon return r0, r1 } -// NewPaymentRequestListFetcher creates a new instance of PaymentRequestListFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPaymentRequestListFetcher(t testing.TB) *PaymentRequestListFetcher { +type mockConstructorTestingTNewPaymentRequestListFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewPaymentRequestListFetcher creates a new instance of PaymentRequestListFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPaymentRequestListFetcher(t mockConstructorTestingTNewPaymentRequestListFetcher) *PaymentRequestListFetcher { mock := &PaymentRequestListFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PaymentRequestRecalculator.go b/pkg/services/mocks/PaymentRequestRecalculator.go index 7d857e3bff9..1d3f95e4f8f 100644 --- a/pkg/services/mocks/PaymentRequestRecalculator.go +++ b/pkg/services/mocks/PaymentRequestRecalculator.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *PaymentRequestRecalculator) RecalculatePaymentRequest(appCtx appcontex return r0, r1 } -// NewPaymentRequestRecalculator creates a new instance of PaymentRequestRecalculator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPaymentRequestRecalculator(t testing.TB) *PaymentRequestRecalculator { +type mockConstructorTestingTNewPaymentRequestRecalculator interface { + mock.TestingT + Cleanup(func()) +} + +// NewPaymentRequestRecalculator creates a new instance of PaymentRequestRecalculator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPaymentRequestRecalculator(t mockConstructorTestingTNewPaymentRequestRecalculator) *PaymentRequestRecalculator { mock := &PaymentRequestRecalculator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PaymentRequestReviewedFetcher.go b/pkg/services/mocks/PaymentRequestReviewedFetcher.go index 8ade36becbf..5f90ec70410 100644 --- a/pkg/services/mocks/PaymentRequestReviewedFetcher.go +++ b/pkg/services/mocks/PaymentRequestReviewedFetcher.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // PaymentRequestReviewedFetcher is an autogenerated mock type for the PaymentRequestReviewedFetcher type @@ -39,8 +37,13 @@ func (_m *PaymentRequestReviewedFetcher) FetchReviewedPaymentRequest(appCtx appc return r0, r1 } -// NewPaymentRequestReviewedFetcher creates a new instance of PaymentRequestReviewedFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPaymentRequestReviewedFetcher(t testing.TB) *PaymentRequestReviewedFetcher { +type mockConstructorTestingTNewPaymentRequestReviewedFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewPaymentRequestReviewedFetcher creates a new instance of PaymentRequestReviewedFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPaymentRequestReviewedFetcher(t mockConstructorTestingTNewPaymentRequestReviewedFetcher) *PaymentRequestReviewedFetcher { mock := &PaymentRequestReviewedFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PaymentRequestReviewedProcessor.go b/pkg/services/mocks/PaymentRequestReviewedProcessor.go index 21f65d9f013..52f3397cf8a 100644 --- a/pkg/services/mocks/PaymentRequestReviewedProcessor.go +++ b/pkg/services/mocks/PaymentRequestReviewedProcessor.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // PaymentRequestReviewedProcessor is an autogenerated mock type for the PaymentRequestReviewedProcessor type @@ -35,8 +33,13 @@ func (_m *PaymentRequestReviewedProcessor) ProcessReviewedPaymentRequest(appCtx _m.Called(appCtx) } -// NewPaymentRequestReviewedProcessor creates a new instance of PaymentRequestReviewedProcessor. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPaymentRequestReviewedProcessor(t testing.TB) *PaymentRequestReviewedProcessor { +type mockConstructorTestingTNewPaymentRequestReviewedProcessor interface { + mock.TestingT + Cleanup(func()) +} + +// NewPaymentRequestReviewedProcessor creates a new instance of PaymentRequestReviewedProcessor. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPaymentRequestReviewedProcessor(t mockConstructorTestingTNewPaymentRequestReviewedProcessor) *PaymentRequestReviewedProcessor { mock := &PaymentRequestReviewedProcessor{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PaymentRequestShipmentRecalculator.go b/pkg/services/mocks/PaymentRequestShipmentRecalculator.go index 661fb5f36ea..87f28f3e1c5 100644 --- a/pkg/services/mocks/PaymentRequestShipmentRecalculator.go +++ b/pkg/services/mocks/PaymentRequestShipmentRecalculator.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *PaymentRequestShipmentRecalculator) ShipmentRecalculatePaymentRequest( return r0, r1 } -// NewPaymentRequestShipmentRecalculator creates a new instance of PaymentRequestShipmentRecalculator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPaymentRequestShipmentRecalculator(t testing.TB) *PaymentRequestShipmentRecalculator { +type mockConstructorTestingTNewPaymentRequestShipmentRecalculator interface { + mock.TestingT + Cleanup(func()) +} + +// NewPaymentRequestShipmentRecalculator creates a new instance of PaymentRequestShipmentRecalculator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPaymentRequestShipmentRecalculator(t mockConstructorTestingTNewPaymentRequestShipmentRecalculator) *PaymentRequestShipmentRecalculator { mock := &PaymentRequestShipmentRecalculator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PaymentRequestStatusUpdater.go b/pkg/services/mocks/PaymentRequestStatusUpdater.go index ed185c46be0..ac1ee980d2a 100644 --- a/pkg/services/mocks/PaymentRequestStatusUpdater.go +++ b/pkg/services/mocks/PaymentRequestStatusUpdater.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // PaymentRequestStatusUpdater is an autogenerated mock type for the PaymentRequestStatusUpdater type @@ -39,8 +37,13 @@ func (_m *PaymentRequestStatusUpdater) UpdatePaymentRequestStatus(appCtx appcont return r0, r1 } -// NewPaymentRequestStatusUpdater creates a new instance of PaymentRequestStatusUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPaymentRequestStatusUpdater(t testing.TB) *PaymentRequestStatusUpdater { +type mockConstructorTestingTNewPaymentRequestStatusUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewPaymentRequestStatusUpdater creates a new instance of PaymentRequestStatusUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPaymentRequestStatusUpdater(t mockConstructorTestingTNewPaymentRequestStatusUpdater) *PaymentRequestStatusUpdater { mock := &PaymentRequestStatusUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PaymentRequestUploadCreator.go b/pkg/services/mocks/PaymentRequestUploadCreator.go index c8f0cf5adb6..e769a8522b3 100644 --- a/pkg/services/mocks/PaymentRequestUploadCreator.go +++ b/pkg/services/mocks/PaymentRequestUploadCreator.go @@ -11,8 +11,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -44,8 +42,13 @@ func (_m *PaymentRequestUploadCreator) CreateUpload(appCtx appcontext.AppContext return r0, r1 } -// NewPaymentRequestUploadCreator creates a new instance of PaymentRequestUploadCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPaymentRequestUploadCreator(t testing.TB) *PaymentRequestUploadCreator { +type mockConstructorTestingTNewPaymentRequestUploadCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewPaymentRequestUploadCreator creates a new instance of PaymentRequestUploadCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPaymentRequestUploadCreator(t mockConstructorTestingTNewPaymentRequestUploadCreator) *PaymentRequestUploadCreator { mock := &PaymentRequestUploadCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PaymentServiceItemStatusUpdater.go b/pkg/services/mocks/PaymentServiceItemStatusUpdater.go index 8e656e91db9..e3a19b6b7b6 100644 --- a/pkg/services/mocks/PaymentServiceItemStatusUpdater.go +++ b/pkg/services/mocks/PaymentServiceItemStatusUpdater.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" validate "github.com/gobuffalo/validate/v3" @@ -50,8 +48,13 @@ func (_m *PaymentServiceItemStatusUpdater) UpdatePaymentServiceItemStatus(appCtx return r0, r1, r2 } -// NewPaymentServiceItemStatusUpdater creates a new instance of PaymentServiceItemStatusUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPaymentServiceItemStatusUpdater(t testing.TB) *PaymentServiceItemStatusUpdater { +type mockConstructorTestingTNewPaymentServiceItemStatusUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewPaymentServiceItemStatusUpdater creates a new instance of PaymentServiceItemStatusUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPaymentServiceItemStatusUpdater(t mockConstructorTestingTNewPaymentServiceItemStatusUpdater) *PaymentServiceItemStatusUpdater { mock := &PaymentServiceItemStatusUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/PostalCodeValidator.go b/pkg/services/mocks/PostalCodeValidator.go index b18a1cb2549..084654eb8cd 100644 --- a/pkg/services/mocks/PostalCodeValidator.go +++ b/pkg/services/mocks/PostalCodeValidator.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // PostalCodeValidator is an autogenerated mock type for the PostalCodeValidator type @@ -37,8 +35,13 @@ func (_m *PostalCodeValidator) ValidatePostalCode(appCtx appcontext.AppContext, return r0, r1 } -// NewPostalCodeValidator creates a new instance of PostalCodeValidator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewPostalCodeValidator(t testing.TB) *PostalCodeValidator { +type mockConstructorTestingTNewPostalCodeValidator interface { + mock.TestingT + Cleanup(func()) +} + +// NewPostalCodeValidator creates a new instance of PostalCodeValidator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewPostalCodeValidator(t mockConstructorTestingTNewPostalCodeValidator) *PostalCodeValidator { mock := &PostalCodeValidator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/QueryAssociation.go b/pkg/services/mocks/QueryAssociation.go index 5d271423f2d..e62ca2b9a9f 100644 --- a/pkg/services/mocks/QueryAssociation.go +++ b/pkg/services/mocks/QueryAssociation.go @@ -2,11 +2,7 @@ package mocks -import ( - mock "github.com/stretchr/testify/mock" - - testing "testing" -) +import mock "github.com/stretchr/testify/mock" // QueryAssociation is an autogenerated mock type for the QueryAssociation type type QueryAssociation struct { @@ -27,8 +23,13 @@ func (_m *QueryAssociation) Field() string { return r0 } -// NewQueryAssociation creates a new instance of QueryAssociation. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewQueryAssociation(t testing.TB) *QueryAssociation { +type mockConstructorTestingTNewQueryAssociation interface { + mock.TestingT + Cleanup(func()) +} + +// NewQueryAssociation creates a new instance of QueryAssociation. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewQueryAssociation(t mockConstructorTestingTNewQueryAssociation) *QueryAssociation { mock := &QueryAssociation{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/QueryAssociations.go b/pkg/services/mocks/QueryAssociations.go index 53f3a12cbd8..fe5e41a2eb1 100644 --- a/pkg/services/mocks/QueryAssociations.go +++ b/pkg/services/mocks/QueryAssociations.go @@ -2,11 +2,7 @@ package mocks -import ( - mock "github.com/stretchr/testify/mock" - - testing "testing" -) +import mock "github.com/stretchr/testify/mock" // QueryAssociations is an autogenerated mock type for the QueryAssociations type type QueryAssociations struct { @@ -43,8 +39,13 @@ func (_m *QueryAssociations) StringGetAssociations() []string { return r0 } -// NewQueryAssociations creates a new instance of QueryAssociations. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewQueryAssociations(t testing.TB) *QueryAssociations { +type mockConstructorTestingTNewQueryAssociations interface { + mock.TestingT + Cleanup(func()) +} + +// NewQueryAssociations creates a new instance of QueryAssociations. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewQueryAssociations(t mockConstructorTestingTNewQueryAssociations) *QueryAssociations { mock := &QueryAssociations{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/QueryFilter.go b/pkg/services/mocks/QueryFilter.go index 698727fd33f..e71ec5f658c 100644 --- a/pkg/services/mocks/QueryFilter.go +++ b/pkg/services/mocks/QueryFilter.go @@ -2,11 +2,7 @@ package mocks -import ( - mock "github.com/stretchr/testify/mock" - - testing "testing" -) +import mock "github.com/stretchr/testify/mock" // QueryFilter is an autogenerated mock type for the QueryFilter type type QueryFilter struct { @@ -57,8 +53,13 @@ func (_m *QueryFilter) Value() interface{} { return r0 } -// NewQueryFilter creates a new instance of QueryFilter. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewQueryFilter(t testing.TB) *QueryFilter { +type mockConstructorTestingTNewQueryFilter interface { + mock.TestingT + Cleanup(func()) +} + +// NewQueryFilter creates a new instance of QueryFilter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewQueryFilter(t mockConstructorTestingTNewQueryFilter) *QueryFilter { mock := &QueryFilter{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/QueryOrder.go b/pkg/services/mocks/QueryOrder.go index da236f6a9ee..af9ae4186e4 100644 --- a/pkg/services/mocks/QueryOrder.go +++ b/pkg/services/mocks/QueryOrder.go @@ -2,11 +2,7 @@ package mocks -import ( - mock "github.com/stretchr/testify/mock" - - testing "testing" -) +import mock "github.com/stretchr/testify/mock" // QueryOrder is an autogenerated mock type for the QueryOrder type type QueryOrder struct { @@ -45,8 +41,13 @@ func (_m *QueryOrder) SortOrder() *bool { return r0 } -// NewQueryOrder creates a new instance of QueryOrder. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewQueryOrder(t testing.TB) *QueryOrder { +type mockConstructorTestingTNewQueryOrder interface { + mock.TestingT + Cleanup(func()) +} + +// NewQueryOrder creates a new instance of QueryOrder. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewQueryOrder(t mockConstructorTestingTNewQueryOrder) *QueryOrder { mock := &QueryOrder{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/SFTPClient.go b/pkg/services/mocks/SFTPClient.go index fa2ed2776d3..55719255858 100644 --- a/pkg/services/mocks/SFTPClient.go +++ b/pkg/services/mocks/SFTPClient.go @@ -7,8 +7,6 @@ import ( mock "github.com/stretchr/testify/mock" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // SFTPClient is an autogenerated mock type for the SFTPClient type @@ -76,8 +74,13 @@ func (_m *SFTPClient) Remove(path string) error { return r0 } -// NewSFTPClient creates a new instance of SFTPClient. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewSFTPClient(t testing.TB) *SFTPClient { +type mockConstructorTestingTNewSFTPClient interface { + mock.TestingT + Cleanup(func()) +} + +// NewSFTPClient creates a new instance of SFTPClient. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSFTPClient(t mockConstructorTestingTNewSFTPClient) *SFTPClient { mock := &SFTPClient{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/SFTPFiler.go b/pkg/services/mocks/SFTPFiler.go index e06445433d8..31246169d48 100644 --- a/pkg/services/mocks/SFTPFiler.go +++ b/pkg/services/mocks/SFTPFiler.go @@ -6,8 +6,6 @@ import ( io "io" mock "github.com/stretchr/testify/mock" - - testing "testing" ) // SFTPFiler is an autogenerated mock type for the SFTPFiler type @@ -50,8 +48,13 @@ func (_m *SFTPFiler) WriteTo(w io.Writer) (int64, error) { return r0, r1 } -// NewSFTPFiler creates a new instance of SFTPFiler. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewSFTPFiler(t testing.TB) *SFTPFiler { +type mockConstructorTestingTNewSFTPFiler interface { + mock.TestingT + Cleanup(func()) +} + +// NewSFTPFiler creates a new instance of SFTPFiler. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSFTPFiler(t mockConstructorTestingTNewSFTPFiler) *SFTPFiler { mock := &SFTPFiler{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/SITExtensionApprover.go b/pkg/services/mocks/SITExtensionApprover.go index 58d00e29954..86503db059e 100644 --- a/pkg/services/mocks/SITExtensionApprover.go +++ b/pkg/services/mocks/SITExtensionApprover.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *SITExtensionApprover) ApproveSITExtension(appCtx appcontext.AppContext return r0, r1 } -// NewSITExtensionApprover creates a new instance of SITExtensionApprover. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewSITExtensionApprover(t testing.TB) *SITExtensionApprover { +type mockConstructorTestingTNewSITExtensionApprover interface { + mock.TestingT + Cleanup(func()) +} + +// NewSITExtensionApprover creates a new instance of SITExtensionApprover. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSITExtensionApprover(t mockConstructorTestingTNewSITExtensionApprover) *SITExtensionApprover { mock := &SITExtensionApprover{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/SITExtensionCreatorAsTOO.go b/pkg/services/mocks/SITExtensionCreatorAsTOO.go index be6aec54408..d23f358c7e3 100644 --- a/pkg/services/mocks/SITExtensionCreatorAsTOO.go +++ b/pkg/services/mocks/SITExtensionCreatorAsTOO.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *SITExtensionCreatorAsTOO) CreateSITExtensionAsTOO(appCtx appcontext.Ap return r0, r1 } -// NewSITExtensionCreatorAsTOO creates a new instance of SITExtensionCreatorAsTOO. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewSITExtensionCreatorAsTOO(t testing.TB) *SITExtensionCreatorAsTOO { +type mockConstructorTestingTNewSITExtensionCreatorAsTOO interface { + mock.TestingT + Cleanup(func()) +} + +// NewSITExtensionCreatorAsTOO creates a new instance of SITExtensionCreatorAsTOO. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSITExtensionCreatorAsTOO(t mockConstructorTestingTNewSITExtensionCreatorAsTOO) *SITExtensionCreatorAsTOO { mock := &SITExtensionCreatorAsTOO{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/SITExtensionDenier.go b/pkg/services/mocks/SITExtensionDenier.go index 298e516d058..d8b274250f9 100644 --- a/pkg/services/mocks/SITExtensionDenier.go +++ b/pkg/services/mocks/SITExtensionDenier.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *SITExtensionDenier) DenySITExtension(appCtx appcontext.AppContext, shi return r0, r1 } -// NewSITExtensionDenier creates a new instance of SITExtensionDenier. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewSITExtensionDenier(t testing.TB) *SITExtensionDenier { +type mockConstructorTestingTNewSITExtensionDenier interface { + mock.TestingT + Cleanup(func()) +} + +// NewSITExtensionDenier creates a new instance of SITExtensionDenier. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSITExtensionDenier(t mockConstructorTestingTNewSITExtensionDenier) *SITExtensionDenier { mock := &SITExtensionDenier{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ServiceItemPricer.go b/pkg/services/mocks/ServiceItemPricer.go index ead0d1fa275..625d8046c84 100644 --- a/pkg/services/mocks/ServiceItemPricer.go +++ b/pkg/services/mocks/ServiceItemPricer.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - unit "github.com/transcom/mymove/pkg/unit" ) @@ -48,8 +46,13 @@ func (_m *ServiceItemPricer) PriceServiceItem(appCtx appcontext.AppContext, item return r0, r1, r2 } -// NewServiceItemPricer creates a new instance of ServiceItemPricer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewServiceItemPricer(t testing.TB) *ServiceItemPricer { +type mockConstructorTestingTNewServiceItemPricer interface { + mock.TestingT + Cleanup(func()) +} + +// NewServiceItemPricer creates a new instance of ServiceItemPricer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewServiceItemPricer(t mockConstructorTestingTNewServiceItemPricer) *ServiceItemPricer { mock := &ServiceItemPricer{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentApprover.go b/pkg/services/mocks/ShipmentApprover.go index 5f9a292e9bf..842a5cd21db 100644 --- a/pkg/services/mocks/ShipmentApprover.go +++ b/pkg/services/mocks/ShipmentApprover.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *ShipmentApprover) ApproveShipment(appCtx appcontext.AppContext, shipme return r0, r1 } -// NewShipmentApprover creates a new instance of ShipmentApprover. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentApprover(t testing.TB) *ShipmentApprover { +type mockConstructorTestingTNewShipmentApprover interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentApprover creates a new instance of ShipmentApprover. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentApprover(t mockConstructorTestingTNewShipmentApprover) *ShipmentApprover { mock := &ShipmentApprover{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentBillableWeightCalculator.go b/pkg/services/mocks/ShipmentBillableWeightCalculator.go index 06458ccfd79..83e8d1e6b7b 100644 --- a/pkg/services/mocks/ShipmentBillableWeightCalculator.go +++ b/pkg/services/mocks/ShipmentBillableWeightCalculator.go @@ -7,8 +7,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // ShipmentBillableWeightCalculator is an autogenerated mock type for the ShipmentBillableWeightCalculator type @@ -37,8 +35,13 @@ func (_m *ShipmentBillableWeightCalculator) CalculateShipmentBillableWeight(ship return r0, r1 } -// NewShipmentBillableWeightCalculator creates a new instance of ShipmentBillableWeightCalculator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentBillableWeightCalculator(t testing.TB) *ShipmentBillableWeightCalculator { +type mockConstructorTestingTNewShipmentBillableWeightCalculator interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentBillableWeightCalculator creates a new instance of ShipmentBillableWeightCalculator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentBillableWeightCalculator(t mockConstructorTestingTNewShipmentBillableWeightCalculator) *ShipmentBillableWeightCalculator { mock := &ShipmentBillableWeightCalculator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentCancellationRequester.go b/pkg/services/mocks/ShipmentCancellationRequester.go index 724193038f2..592653240f0 100644 --- a/pkg/services/mocks/ShipmentCancellationRequester.go +++ b/pkg/services/mocks/ShipmentCancellationRequester.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *ShipmentCancellationRequester) RequestShipmentCancellation(appCtx appc return r0, r1 } -// NewShipmentCancellationRequester creates a new instance of ShipmentCancellationRequester. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentCancellationRequester(t testing.TB) *ShipmentCancellationRequester { +type mockConstructorTestingTNewShipmentCancellationRequester interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentCancellationRequester creates a new instance of ShipmentCancellationRequester. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentCancellationRequester(t mockConstructorTestingTNewShipmentCancellationRequester) *ShipmentCancellationRequester { mock := &ShipmentCancellationRequester{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentCreator.go b/pkg/services/mocks/ShipmentCreator.go index 72687276026..06fbb7978e7 100644 --- a/pkg/services/mocks/ShipmentCreator.go +++ b/pkg/services/mocks/ShipmentCreator.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // ShipmentCreator is an autogenerated mock type for the ShipmentCreator type @@ -39,8 +37,13 @@ func (_m *ShipmentCreator) CreateShipment(appCtx appcontext.AppContext, shipment return r0, r1 } -// NewShipmentCreator creates a new instance of ShipmentCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentCreator(t testing.TB) *ShipmentCreator { +type mockConstructorTestingTNewShipmentCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentCreator creates a new instance of ShipmentCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentCreator(t mockConstructorTestingTNewShipmentCreator) *ShipmentCreator { mock := &ShipmentCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentDeleter.go b/pkg/services/mocks/ShipmentDeleter.go index 528e60dc5d7..f909cd13866 100644 --- a/pkg/services/mocks/ShipmentDeleter.go +++ b/pkg/services/mocks/ShipmentDeleter.go @@ -6,8 +6,6 @@ import ( mock "github.com/stretchr/testify/mock" appcontext "github.com/transcom/mymove/pkg/appcontext" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -39,8 +37,13 @@ func (_m *ShipmentDeleter) DeleteShipment(appCtx appcontext.AppContext, shipment return r0, r1 } -// NewShipmentDeleter creates a new instance of ShipmentDeleter. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentDeleter(t testing.TB) *ShipmentDeleter { +type mockConstructorTestingTNewShipmentDeleter interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentDeleter creates a new instance of ShipmentDeleter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentDeleter(t mockConstructorTestingTNewShipmentDeleter) *ShipmentDeleter { mock := &ShipmentDeleter{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentDiversionApprover.go b/pkg/services/mocks/ShipmentDiversionApprover.go index 8dc01628294..c341ebd1648 100644 --- a/pkg/services/mocks/ShipmentDiversionApprover.go +++ b/pkg/services/mocks/ShipmentDiversionApprover.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *ShipmentDiversionApprover) ApproveShipmentDiversion(appCtx appcontext. return r0, r1 } -// NewShipmentDiversionApprover creates a new instance of ShipmentDiversionApprover. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentDiversionApprover(t testing.TB) *ShipmentDiversionApprover { +type mockConstructorTestingTNewShipmentDiversionApprover interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentDiversionApprover creates a new instance of ShipmentDiversionApprover. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentDiversionApprover(t mockConstructorTestingTNewShipmentDiversionApprover) *ShipmentDiversionApprover { mock := &ShipmentDiversionApprover{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentDiversionRequester.go b/pkg/services/mocks/ShipmentDiversionRequester.go index b40f0b5acb5..fafb232bcad 100644 --- a/pkg/services/mocks/ShipmentDiversionRequester.go +++ b/pkg/services/mocks/ShipmentDiversionRequester.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *ShipmentDiversionRequester) RequestShipmentDiversion(appCtx appcontext return r0, r1 } -// NewShipmentDiversionRequester creates a new instance of ShipmentDiversionRequester. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentDiversionRequester(t testing.TB) *ShipmentDiversionRequester { +type mockConstructorTestingTNewShipmentDiversionRequester interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentDiversionRequester creates a new instance of ShipmentDiversionRequester. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentDiversionRequester(t mockConstructorTestingTNewShipmentDiversionRequester) *ShipmentDiversionRequester { mock := &ShipmentDiversionRequester{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentRejecter.go b/pkg/services/mocks/ShipmentRejecter.go index 0de88fe5f70..d7e1064e11b 100644 --- a/pkg/services/mocks/ShipmentRejecter.go +++ b/pkg/services/mocks/ShipmentRejecter.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *ShipmentRejecter) RejectShipment(appCtx appcontext.AppContext, shipmen return r0, r1 } -// NewShipmentRejecter creates a new instance of ShipmentRejecter. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentRejecter(t testing.TB) *ShipmentRejecter { +type mockConstructorTestingTNewShipmentRejecter interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentRejecter creates a new instance of ShipmentRejecter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentRejecter(t mockConstructorTestingTNewShipmentRejecter) *ShipmentRejecter { mock := &ShipmentRejecter{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentReweighRequester.go b/pkg/services/mocks/ShipmentReweighRequester.go index 85f7a71d010..0b19b5b5266 100644 --- a/pkg/services/mocks/ShipmentReweighRequester.go +++ b/pkg/services/mocks/ShipmentReweighRequester.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *ShipmentReweighRequester) RequestShipmentReweigh(appCtx appcontext.App return r0, r1 } -// NewShipmentReweighRequester creates a new instance of ShipmentReweighRequester. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentReweighRequester(t testing.TB) *ShipmentReweighRequester { +type mockConstructorTestingTNewShipmentReweighRequester interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentReweighRequester creates a new instance of ShipmentReweighRequester. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentReweighRequester(t mockConstructorTestingTNewShipmentReweighRequester) *ShipmentReweighRequester { mock := &ShipmentReweighRequester{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentRouter.go b/pkg/services/mocks/ShipmentRouter.go index c0352690ffc..dbdab4dcd8a 100644 --- a/pkg/services/mocks/ShipmentRouter.go +++ b/pkg/services/mocks/ShipmentRouter.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // ShipmentRouter is an autogenerated mock type for the ShipmentRouter type @@ -114,8 +112,13 @@ func (_m *ShipmentRouter) Submit(appCtx appcontext.AppContext, shipment *models. return r0 } -// NewShipmentRouter creates a new instance of ShipmentRouter. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentRouter(t testing.TB) *ShipmentRouter { +type mockConstructorTestingTNewShipmentRouter interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentRouter creates a new instance of ShipmentRouter. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentRouter(t mockConstructorTestingTNewShipmentRouter) *ShipmentRouter { mock := &ShipmentRouter{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentSITStatus.go b/pkg/services/mocks/ShipmentSITStatus.go index 199ca0c147d..ddfe294e1cc 100644 --- a/pkg/services/mocks/ShipmentSITStatus.go +++ b/pkg/services/mocks/ShipmentSITStatus.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // ShipmentSITStatus is an autogenerated mock type for the ShipmentSITStatus type @@ -78,8 +76,13 @@ func (_m *ShipmentSITStatus) CalculateShipmentsSITStatuses(appCtx appcontext.App return r0 } -// NewShipmentSITStatus creates a new instance of ShipmentSITStatus. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentSITStatus(t testing.TB) *ShipmentSITStatus { +type mockConstructorTestingTNewShipmentSITStatus interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentSITStatus creates a new instance of ShipmentSITStatus. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentSITStatus(t mockConstructorTestingTNewShipmentSITStatus) *ShipmentSITStatus { mock := &ShipmentSITStatus{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentUpdater.go b/pkg/services/mocks/ShipmentUpdater.go index 390e5d62845..7e8dd0c4044 100644 --- a/pkg/services/mocks/ShipmentUpdater.go +++ b/pkg/services/mocks/ShipmentUpdater.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // ShipmentUpdater is an autogenerated mock type for the ShipmentUpdater type @@ -39,8 +37,13 @@ func (_m *ShipmentUpdater) UpdateShipment(appCtx appcontext.AppContext, shipment return r0, r1 } -// NewShipmentUpdater creates a new instance of ShipmentUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentUpdater(t testing.TB) *ShipmentUpdater { +type mockConstructorTestingTNewShipmentUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentUpdater creates a new instance of ShipmentUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentUpdater(t mockConstructorTestingTNewShipmentUpdater) *ShipmentUpdater { mock := &ShipmentUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/ShipmentsPaymentSITBalance.go b/pkg/services/mocks/ShipmentsPaymentSITBalance.go index 2db590b9b46..c3757955348 100644 --- a/pkg/services/mocks/ShipmentsPaymentSITBalance.go +++ b/pkg/services/mocks/ShipmentsPaymentSITBalance.go @@ -8,8 +8,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -41,8 +39,13 @@ func (_m *ShipmentsPaymentSITBalance) ListShipmentPaymentSITBalance(appCtx appco return r0, r1 } -// NewShipmentsPaymentSITBalance creates a new instance of ShipmentsPaymentSITBalance. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewShipmentsPaymentSITBalance(t testing.TB) *ShipmentsPaymentSITBalance { +type mockConstructorTestingTNewShipmentsPaymentSITBalance interface { + mock.TestingT + Cleanup(func()) +} + +// NewShipmentsPaymentSITBalance creates a new instance of ShipmentsPaymentSITBalance. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewShipmentsPaymentSITBalance(t mockConstructorTestingTNewShipmentsPaymentSITBalance) *ShipmentsPaymentSITBalance { mock := &ShipmentsPaymentSITBalance{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/SyncadaFileProcessor.go b/pkg/services/mocks/SyncadaFileProcessor.go index e1e65febdcf..95539810b2f 100644 --- a/pkg/services/mocks/SyncadaFileProcessor.go +++ b/pkg/services/mocks/SyncadaFileProcessor.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // SyncadaFileProcessor is an autogenerated mock type for the SyncadaFileProcessor type @@ -44,8 +42,13 @@ func (_m *SyncadaFileProcessor) ProcessFile(appCtx appcontext.AppContext, syncad return r0 } -// NewSyncadaFileProcessor creates a new instance of SyncadaFileProcessor. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewSyncadaFileProcessor(t testing.TB) *SyncadaFileProcessor { +type mockConstructorTestingTNewSyncadaFileProcessor interface { + mock.TestingT + Cleanup(func()) +} + +// NewSyncadaFileProcessor creates a new instance of SyncadaFileProcessor. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSyncadaFileProcessor(t mockConstructorTestingTNewSyncadaFileProcessor) *SyncadaFileProcessor { mock := &SyncadaFileProcessor{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/SyncadaSFTPReader.go b/pkg/services/mocks/SyncadaSFTPReader.go index 4b41614ce12..93771380892 100644 --- a/pkg/services/mocks/SyncadaSFTPReader.go +++ b/pkg/services/mocks/SyncadaSFTPReader.go @@ -8,8 +8,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - time "time" ) @@ -39,8 +37,13 @@ func (_m *SyncadaSFTPReader) FetchAndProcessSyncadaFiles(appCtx appcontext.AppCo return r0, r1 } -// NewSyncadaSFTPReader creates a new instance of SyncadaSFTPReader. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewSyncadaSFTPReader(t testing.TB) *SyncadaSFTPReader { +type mockConstructorTestingTNewSyncadaSFTPReader interface { + mock.TestingT + Cleanup(func()) +} + +// NewSyncadaSFTPReader creates a new instance of SyncadaSFTPReader. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSyncadaSFTPReader(t mockConstructorTestingTNewSyncadaSFTPReader) *SyncadaSFTPReader { mock := &SyncadaSFTPReader{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/SyncadaSFTPSender.go b/pkg/services/mocks/SyncadaSFTPSender.go index b5694b33dc0..915f82014ad 100644 --- a/pkg/services/mocks/SyncadaSFTPSender.go +++ b/pkg/services/mocks/SyncadaSFTPSender.go @@ -8,8 +8,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" mock "github.com/stretchr/testify/mock" - - testing "testing" ) // SyncadaSFTPSender is an autogenerated mock type for the SyncadaSFTPSender type @@ -38,8 +36,13 @@ func (_m *SyncadaSFTPSender) SendToSyncadaViaSFTP(appCtx appcontext.AppContext, return r0, r1 } -// NewSyncadaSFTPSender creates a new instance of SyncadaSFTPSender. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewSyncadaSFTPSender(t testing.TB) *SyncadaSFTPSender { +type mockConstructorTestingTNewSyncadaSFTPSender interface { + mock.TestingT + Cleanup(func()) +} + +// NewSyncadaSFTPSender creates a new instance of SyncadaSFTPSender. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewSyncadaSFTPSender(t mockConstructorTestingTNewSyncadaSFTPSender) *SyncadaSFTPSender { mock := &SyncadaSFTPSender{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/TableFromSliceCreator.go b/pkg/services/mocks/TableFromSliceCreator.go index 9012254af7c..cc22dd0d0c7 100644 --- a/pkg/services/mocks/TableFromSliceCreator.go +++ b/pkg/services/mocks/TableFromSliceCreator.go @@ -5,8 +5,6 @@ package mocks import ( mock "github.com/stretchr/testify/mock" appcontext "github.com/transcom/mymove/pkg/appcontext" - - testing "testing" ) // TableFromSliceCreator is an autogenerated mock type for the TableFromSliceCreator type @@ -28,8 +26,13 @@ func (_m *TableFromSliceCreator) CreateTableFromSlice(appCtx appcontext.AppConte return r0 } -// NewTableFromSliceCreator creates a new instance of TableFromSliceCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewTableFromSliceCreator(t testing.TB) *TableFromSliceCreator { +type mockConstructorTestingTNewTableFromSliceCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewTableFromSliceCreator creates a new instance of TableFromSliceCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewTableFromSliceCreator(t mockConstructorTestingTNewTableFromSliceCreator) *TableFromSliceCreator { mock := &TableFromSliceCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/TransportationServiceProviderPerformanceFetcher.go b/pkg/services/mocks/TransportationServiceProviderPerformanceFetcher.go index 27015cb732d..90bc429b2a4 100644 --- a/pkg/services/mocks/TransportationServiceProviderPerformanceFetcher.go +++ b/pkg/services/mocks/TransportationServiceProviderPerformanceFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // TransportationServiceProviderPerformanceFetcher is an autogenerated mock type for the TransportationServiceProviderPerformanceFetcher type @@ -39,8 +37,13 @@ func (_m *TransportationServiceProviderPerformanceFetcher) FetchTransportationSe return r0, r1 } -// NewTransportationServiceProviderPerformanceFetcher creates a new instance of TransportationServiceProviderPerformanceFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewTransportationServiceProviderPerformanceFetcher(t testing.TB) *TransportationServiceProviderPerformanceFetcher { +type mockConstructorTestingTNewTransportationServiceProviderPerformanceFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewTransportationServiceProviderPerformanceFetcher creates a new instance of TransportationServiceProviderPerformanceFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewTransportationServiceProviderPerformanceFetcher(t mockConstructorTestingTNewTransportationServiceProviderPerformanceFetcher) *TransportationServiceProviderPerformanceFetcher { mock := &TransportationServiceProviderPerformanceFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/TransportationServiceProviderPerformanceListFetcher.go b/pkg/services/mocks/TransportationServiceProviderPerformanceListFetcher.go index 86231d3caea..4d2d28803c8 100644 --- a/pkg/services/mocks/TransportationServiceProviderPerformanceListFetcher.go +++ b/pkg/services/mocks/TransportationServiceProviderPerformanceListFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // TransportationServiceProviderPerformanceListFetcher is an autogenerated mock type for the TransportationServiceProviderPerformanceListFetcher type @@ -62,8 +60,13 @@ func (_m *TransportationServiceProviderPerformanceListFetcher) FetchTransportati return r0, r1 } -// NewTransportationServiceProviderPerformanceListFetcher creates a new instance of TransportationServiceProviderPerformanceListFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewTransportationServiceProviderPerformanceListFetcher(t testing.TB) *TransportationServiceProviderPerformanceListFetcher { +type mockConstructorTestingTNewTransportationServiceProviderPerformanceListFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewTransportationServiceProviderPerformanceListFetcher creates a new instance of TransportationServiceProviderPerformanceListFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewTransportationServiceProviderPerformanceListFetcher(t mockConstructorTestingTNewTransportationServiceProviderPerformanceListFetcher) *TransportationServiceProviderPerformanceListFetcher { mock := &TransportationServiceProviderPerformanceListFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/UploadCreator.go b/pkg/services/mocks/UploadCreator.go index f8122f5a1c2..24da02323c0 100644 --- a/pkg/services/mocks/UploadCreator.go +++ b/pkg/services/mocks/UploadCreator.go @@ -10,8 +10,6 @@ import ( mock "github.com/stretchr/testify/mock" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // UploadCreator is an autogenerated mock type for the UploadCreator type @@ -42,8 +40,13 @@ func (_m *UploadCreator) CreateUpload(appCtx appcontext.AppContext, file io.Read return r0, r1 } -// NewUploadCreator creates a new instance of UploadCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewUploadCreator(t testing.TB) *UploadCreator { +type mockConstructorTestingTNewUploadCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewUploadCreator creates a new instance of UploadCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewUploadCreator(t mockConstructorTestingTNewUploadCreator) *UploadCreator { mock := &UploadCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/UploadInformationFetcher.go b/pkg/services/mocks/UploadInformationFetcher.go index f8acd973fd0..847d745bb6c 100644 --- a/pkg/services/mocks/UploadInformationFetcher.go +++ b/pkg/services/mocks/UploadInformationFetcher.go @@ -8,8 +8,6 @@ import ( services "github.com/transcom/mymove/pkg/services" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -39,8 +37,13 @@ func (_m *UploadInformationFetcher) FetchUploadInformation(appCtx appcontext.App return r0, r1 } -// NewUploadInformationFetcher creates a new instance of UploadInformationFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewUploadInformationFetcher(t testing.TB) *UploadInformationFetcher { +type mockConstructorTestingTNewUploadInformationFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewUploadInformationFetcher creates a new instance of UploadInformationFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewUploadInformationFetcher(t mockConstructorTestingTNewUploadInformationFetcher) *UploadInformationFetcher { mock := &UploadInformationFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/UserFetcher.go b/pkg/services/mocks/UserFetcher.go index c133b9507f0..e27b55ccc81 100644 --- a/pkg/services/mocks/UserFetcher.go +++ b/pkg/services/mocks/UserFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // UserFetcher is an autogenerated mock type for the UserFetcher type @@ -39,8 +37,13 @@ func (_m *UserFetcher) FetchUser(appCtx appcontext.AppContext, filters []service return r0, r1 } -// NewUserFetcher creates a new instance of UserFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewUserFetcher(t testing.TB) *UserFetcher { +type mockConstructorTestingTNewUserFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewUserFetcher creates a new instance of UserFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewUserFetcher(t mockConstructorTestingTNewUserFetcher) *UserFetcher { mock := &UserFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/UserRoleAssociator.go b/pkg/services/mocks/UserRoleAssociator.go index d736c0f6187..b328c0c82e5 100644 --- a/pkg/services/mocks/UserRoleAssociator.go +++ b/pkg/services/mocks/UserRoleAssociator.go @@ -10,8 +10,6 @@ import ( roles "github.com/transcom/mymove/pkg/models/roles" - testing "testing" - uuid "github.com/gofrs/uuid" ) @@ -43,8 +41,13 @@ func (_m *UserRoleAssociator) UpdateUserRoles(appCtx appcontext.AppContext, user return r0, r1 } -// NewUserRoleAssociator creates a new instance of UserRoleAssociator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewUserRoleAssociator(t testing.TB) *UserRoleAssociator { +type mockConstructorTestingTNewUserRoleAssociator interface { + mock.TestingT + Cleanup(func()) +} + +// NewUserRoleAssociator creates a new instance of UserRoleAssociator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewUserRoleAssociator(t mockConstructorTestingTNewUserRoleAssociator) *UserRoleAssociator { mock := &UserRoleAssociator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/UserSessionRevocation.go b/pkg/services/mocks/UserSessionRevocation.go index bef1368308f..b95ecefd61a 100644 --- a/pkg/services/mocks/UserSessionRevocation.go +++ b/pkg/services/mocks/UserSessionRevocation.go @@ -12,8 +12,6 @@ import ( scs "github.com/alexedwards/scs/v2" - testing "testing" - uuid "github.com/gofrs/uuid" validate "github.com/gobuffalo/validate/v3" @@ -56,8 +54,13 @@ func (_m *UserSessionRevocation) RevokeUserSession(appCtx appcontext.AppContext, return r0, r1, r2 } -// NewUserSessionRevocation creates a new instance of UserSessionRevocation. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewUserSessionRevocation(t testing.TB) *UserSessionRevocation { +type mockConstructorTestingTNewUserSessionRevocation interface { + mock.TestingT + Cleanup(func()) +} + +// NewUserSessionRevocation creates a new instance of UserSessionRevocation. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewUserSessionRevocation(t mockConstructorTestingTNewUserSessionRevocation) *UserSessionRevocation { mock := &UserSessionRevocation{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/UserUpdater.go b/pkg/services/mocks/UserUpdater.go index c084cd722b3..8bfcf3570a4 100644 --- a/pkg/services/mocks/UserUpdater.go +++ b/pkg/services/mocks/UserUpdater.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - uuid "github.com/gofrs/uuid" validate "github.com/gobuffalo/validate/v3" @@ -52,8 +50,13 @@ func (_m *UserUpdater) UpdateUser(appCtx appcontext.AppContext, id uuid.UUID, us return r0, r1, r2 } -// NewUserUpdater creates a new instance of UserUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewUserUpdater(t testing.TB) *UserUpdater { +type mockConstructorTestingTNewUserUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewUserUpdater creates a new instance of UserUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewUserUpdater(t mockConstructorTestingTNewUserUpdater) *UserUpdater { mock := &UserUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/WebhookSubscriptionCreator.go b/pkg/services/mocks/WebhookSubscriptionCreator.go index aa4663af9ab..06f212bee68 100644 --- a/pkg/services/mocks/WebhookSubscriptionCreator.go +++ b/pkg/services/mocks/WebhookSubscriptionCreator.go @@ -8,8 +8,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - validate "github.com/gobuffalo/validate/v3" ) @@ -50,8 +48,13 @@ func (_m *WebhookSubscriptionCreator) CreateWebhookSubscription(appCtx appcontex return r0, r1, r2 } -// NewWebhookSubscriptionCreator creates a new instance of WebhookSubscriptionCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewWebhookSubscriptionCreator(t testing.TB) *WebhookSubscriptionCreator { +type mockConstructorTestingTNewWebhookSubscriptionCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewWebhookSubscriptionCreator creates a new instance of WebhookSubscriptionCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewWebhookSubscriptionCreator(t mockConstructorTestingTNewWebhookSubscriptionCreator) *WebhookSubscriptionCreator { mock := &WebhookSubscriptionCreator{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/WebhookSubscriptionFetcher.go b/pkg/services/mocks/WebhookSubscriptionFetcher.go index 9214852907a..0b5b72f8517 100644 --- a/pkg/services/mocks/WebhookSubscriptionFetcher.go +++ b/pkg/services/mocks/WebhookSubscriptionFetcher.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" services "github.com/transcom/mymove/pkg/services" - - testing "testing" ) // WebhookSubscriptionFetcher is an autogenerated mock type for the WebhookSubscriptionFetcher type @@ -39,8 +37,13 @@ func (_m *WebhookSubscriptionFetcher) FetchWebhookSubscription(appCtx appcontext return r0, r1 } -// NewWebhookSubscriptionFetcher creates a new instance of WebhookSubscriptionFetcher. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewWebhookSubscriptionFetcher(t testing.TB) *WebhookSubscriptionFetcher { +type mockConstructorTestingTNewWebhookSubscriptionFetcher interface { + mock.TestingT + Cleanup(func()) +} + +// NewWebhookSubscriptionFetcher creates a new instance of WebhookSubscriptionFetcher. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewWebhookSubscriptionFetcher(t mockConstructorTestingTNewWebhookSubscriptionFetcher) *WebhookSubscriptionFetcher { mock := &WebhookSubscriptionFetcher{} mock.Mock.Test(t) diff --git a/pkg/services/mocks/WebhookSubscriptionUpdater.go b/pkg/services/mocks/WebhookSubscriptionUpdater.go index c65f480caa3..a82bcde22d6 100644 --- a/pkg/services/mocks/WebhookSubscriptionUpdater.go +++ b/pkg/services/mocks/WebhookSubscriptionUpdater.go @@ -7,8 +7,6 @@ import ( appcontext "github.com/transcom/mymove/pkg/appcontext" models "github.com/transcom/mymove/pkg/models" - - testing "testing" ) // WebhookSubscriptionUpdater is an autogenerated mock type for the WebhookSubscriptionUpdater type @@ -39,8 +37,13 @@ func (_m *WebhookSubscriptionUpdater) UpdateWebhookSubscription(appCtx appcontex return r0, r1 } -// NewWebhookSubscriptionUpdater creates a new instance of WebhookSubscriptionUpdater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewWebhookSubscriptionUpdater(t testing.TB) *WebhookSubscriptionUpdater { +type mockConstructorTestingTNewWebhookSubscriptionUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewWebhookSubscriptionUpdater creates a new instance of WebhookSubscriptionUpdater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewWebhookSubscriptionUpdater(t mockConstructorTestingTNewWebhookSubscriptionUpdater) *WebhookSubscriptionUpdater { mock := &WebhookSubscriptionUpdater{} mock.Mock.Test(t) diff --git a/pkg/services/move_documents/mocks/Updater.go b/pkg/services/move_documents/mocks/Updater.go index 457fed6eac8..539c3603e14 100644 --- a/pkg/services/move_documents/mocks/Updater.go +++ b/pkg/services/move_documents/mocks/Updater.go @@ -10,8 +10,6 @@ import ( models "github.com/transcom/mymove/pkg/models" - testing "testing" - validate "github.com/gobuffalo/validate/v3" ) @@ -52,8 +50,13 @@ func (_m *Updater) Update(appCtx appcontext.AppContext, moveDocumentPayload *int return r0, r1, r2 } -// NewUpdater creates a new instance of Updater. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewUpdater(t testing.TB) *Updater { +type mockConstructorTestingTNewUpdater interface { + mock.TestingT + Cleanup(func()) +} + +// NewUpdater creates a new instance of Updater. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewUpdater(t mockConstructorTestingTNewUpdater) *Updater { mock := &Updater{} mock.Mock.Test(t) diff --git a/pkg/services/paperwork/mocks/FileStorer.go b/pkg/services/paperwork/mocks/FileStorer.go index a8918dca0cd..d17f7af44fb 100644 --- a/pkg/services/paperwork/mocks/FileStorer.go +++ b/pkg/services/paperwork/mocks/FileStorer.go @@ -5,8 +5,6 @@ package mocks import ( afero "github.com/spf13/afero" mock "github.com/stretchr/testify/mock" - - testing "testing" ) // FileStorer is an autogenerated mock type for the FileStorer type @@ -37,8 +35,13 @@ func (_m *FileStorer) Create(_a0 string) (afero.File, error) { return r0, r1 } -// NewFileStorer creates a new instance of FileStorer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewFileStorer(t testing.TB) *FileStorer { +type mockConstructorTestingTNewFileStorer interface { + mock.TestingT + Cleanup(func()) +} + +// NewFileStorer creates a new instance of FileStorer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewFileStorer(t mockConstructorTestingTNewFileStorer) *FileStorer { mock := &FileStorer{} mock.Mock.Test(t) diff --git a/pkg/services/paperwork/mocks/FormFiller.go b/pkg/services/paperwork/mocks/FormFiller.go index 09bb6a85845..46fbab7cd1f 100644 --- a/pkg/services/paperwork/mocks/FormFiller.go +++ b/pkg/services/paperwork/mocks/FormFiller.go @@ -7,8 +7,6 @@ import ( mock "github.com/stretchr/testify/mock" paperwork "github.com/transcom/mymove/pkg/paperwork" - - testing "testing" ) // FormFiller is an autogenerated mock type for the FormFiller type @@ -44,8 +42,13 @@ func (_m *FormFiller) Output(_a0 io.Writer) error { return r0 } -// NewFormFiller creates a new instance of FormFiller. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewFormFiller(t testing.TB) *FormFiller { +type mockConstructorTestingTNewFormFiller interface { + mock.TestingT + Cleanup(func()) +} + +// NewFormFiller creates a new instance of FormFiller. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewFormFiller(t mockConstructorTestingTNewFormFiller) *FormFiller { mock := &FormFiller{} mock.Mock.Test(t) diff --git a/pkg/services/support/mocks/InternalMoveTaskOrderCreator.go b/pkg/services/support/mocks/InternalMoveTaskOrderCreator.go index 39078459356..31b9f5c9a6a 100644 --- a/pkg/services/support/mocks/InternalMoveTaskOrderCreator.go +++ b/pkg/services/support/mocks/InternalMoveTaskOrderCreator.go @@ -9,8 +9,6 @@ import ( models "github.com/transcom/mymove/pkg/models" supportmessages "github.com/transcom/mymove/pkg/gen/supportmessages" - - testing "testing" ) // InternalMoveTaskOrderCreator is an autogenerated mock type for the InternalMoveTaskOrderCreator type @@ -41,8 +39,13 @@ func (_m *InternalMoveTaskOrderCreator) InternalCreateMoveTaskOrder(appCtx appco return r0, r1 } -// NewInternalMoveTaskOrderCreator creates a new instance of InternalMoveTaskOrderCreator. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewInternalMoveTaskOrderCreator(t testing.TB) *InternalMoveTaskOrderCreator { +type mockConstructorTestingTNewInternalMoveTaskOrderCreator interface { + mock.TestingT + Cleanup(func()) +} + +// NewInternalMoveTaskOrderCreator creates a new instance of InternalMoveTaskOrderCreator. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewInternalMoveTaskOrderCreator(t mockConstructorTestingTNewInternalMoveTaskOrderCreator) *InternalMoveTaskOrderCreator { mock := &InternalMoveTaskOrderCreator{} mock.Mock.Test(t) diff --git a/pkg/storage/mocks/FileStorer.go b/pkg/storage/mocks/FileStorer.go index 86330a70e09..8c29a5e200d 100644 --- a/pkg/storage/mocks/FileStorer.go +++ b/pkg/storage/mocks/FileStorer.go @@ -10,8 +10,6 @@ import ( mock "github.com/stretchr/testify/mock" storage "github.com/transcom/mymove/pkg/storage" - - testing "testing" ) // FileStorer is an autogenerated mock type for the FileStorer type @@ -155,8 +153,13 @@ func (_m *FileStorer) TempFileSystem() *afero.Afero { return r0 } -// NewFileStorer creates a new instance of FileStorer. It also registers the testing.TB interface on the mock and a cleanup function to assert the mocks expectations. -func NewFileStorer(t testing.TB) *FileStorer { +type mockConstructorTestingTNewFileStorer interface { + mock.TestingT + Cleanup(func()) +} + +// NewFileStorer creates a new instance of FileStorer. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +func NewFileStorer(t mockConstructorTestingTNewFileStorer) *FileStorer { mock := &FileStorer{} mock.Mock.Test(t)