mirror of
https://github.com/go-sigma/sigma.git
synced 2026-10-28 15:34:34 +08:00
refactor(mocks): generate mocks into source packages
Move generated mocks out of the `mocks/` subpackages and into the source packages as `*_mocks.go` files for `pkg/distribution/clients` and `pkg/service/password`, updating the go:generate directives to emit `-package=clients` / `-package=password`. Update the import in `pkg/service/users/users_test.go` to reference the new location. Also: - add `go.uber.org/mock/mockgen` to the tool directives and refresh module dependencies - bump CI service images (mysql 9, postgres 18-alpine) and drop the removed mocks packages from the coverage exclusion list - clean up .gitignore and ignore local tool artifacts (.pi/, skills-lock.json) Verification: - go vet -tags "netgo,timetzdata,exclude_graphdriver_btrfs,containers_image_openpgp" ./pkg/service/users/ ./pkg/service/password/ ./pkg/distribution/clients/ - go test -tags "netgo,timetzdata,exclude_graphdriver_btrfs,containers_image_openpgp" ./pkg/service/users/
This commit is contained in:
Tosone committed
1 parent
476df70a60
commit
720022de3e
10 files changed
+75
-135
No files matched your search
@@ -21,7 +21,7 @@ jobs:
|
||||
bun: ["latest"]
|
||||
services:
|
||||
mysql:
|
||||
image: mysql:8.0
|
||||
image: mysql:9
|
||||
env:
|
||||
MYSQL_ROOT_PASSWORD: sigma
|
||||
MYSQL_DATABASE: sigma
|
||||
@@ -31,7 +31,7 @@ jobs:
|
||||
- 3306:3306
|
||||
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=10
|
||||
postgresql:
|
||||
image: postgres:15-alpine
|
||||
image: postgres:18-alpine
|
||||
env:
|
||||
POSTGRES_PASSWORD: sigma
|
||||
POSTGRES_USER: sigma
|
||||
@@ -114,9 +114,6 @@ jobs:
|
||||
"pkg/dal/models"
|
||||
"pkg/dal/query"
|
||||
"pkg/dal/cmd"
|
||||
"pkg/distribution/clients/mocks"
|
||||
"pkg/service/password/mocks"
|
||||
"pkg/storage/cos"
|
||||
"pkg/version"
|
||||
)
|
||||
if [ "${GITHUB_EVENT_NAME}" = "pull_request" ]; then
|
||||
|
||||
+4
-18
@@ -20,7 +20,6 @@
|
||||
|
||||
# Dependency directories (remove the comment below to include it)
|
||||
vendor/
|
||||
!3rdparty/distribution/vendor
|
||||
|
||||
# Binaries for programs
|
||||
bin/sigma*
|
||||
@@ -35,9 +34,6 @@ yarn-error.log*
|
||||
lerna-debug.log*
|
||||
.pnpm-debug.log*
|
||||
|
||||
# Diagnostic reports (https://nodejs.org/api/report.html)
|
||||
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
|
||||
|
||||
# Runtime data
|
||||
pids
|
||||
*.pid
|
||||
@@ -97,9 +93,6 @@ web_modules/
|
||||
# Output of 'npm pack'
|
||||
*.tgz
|
||||
|
||||
# Yarn Integrity file
|
||||
.yarn-integrity
|
||||
|
||||
# dotenv environment variable files
|
||||
.env
|
||||
.env.development.local
|
||||
@@ -132,9 +125,6 @@ dist
|
||||
# vuepress v2.x temp and cache directory
|
||||
.temp
|
||||
|
||||
# Docusaurus cache and generated files
|
||||
.docusaurus
|
||||
|
||||
# Serverless directories
|
||||
.serverless/
|
||||
|
||||
@@ -174,12 +164,6 @@ dist
|
||||
node_modules
|
||||
web/pkg/
|
||||
|
||||
*.sublime*
|
||||
|
||||
psd
|
||||
thumb
|
||||
sketch
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/go,node,react
|
||||
|
||||
# jetbrains ide
|
||||
@@ -192,8 +176,6 @@ conf/sigma-dev.yaml
|
||||
*.db
|
||||
*.db*
|
||||
|
||||
pkg/**/*.html
|
||||
|
||||
.vscode/
|
||||
.zed/
|
||||
|
||||
@@ -202,3 +184,7 @@ pkg/**/*.html
|
||||
*.zstd
|
||||
coverage.txt
|
||||
.trae/
|
||||
|
||||
# local tools
|
||||
.pi/
|
||||
skills-lock.json
|
||||
@@ -498,7 +498,6 @@ require (
|
||||
github.com/zclconf/go-cty v1.17.0 // indirect
|
||||
go.mongodb.org/mongo-driver v1.17.9 // indirect
|
||||
go.mongodb.org/mongo-driver/v2 v2.9.0 // indirect
|
||||
go.opencensus.io v0.24.0 // indirect
|
||||
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
|
||||
go.opentelemetry.io/contrib/detectors/gcp v1.44.0 // indirect
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0 // indirect
|
||||
@@ -557,6 +556,7 @@ tool (
|
||||
github.com/abice/go-enum
|
||||
github.com/google/addlicense
|
||||
github.com/swaggo/swag/cmd/swag
|
||||
go.uber.org/mock/mockgen
|
||||
)
|
||||
|
||||
exclude google.golang.org/grpc/stats/opentelemetry v0.0.0-20240907200651-3ffb98b2c93a
|
||||
@@ -149,8 +149,6 @@ github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSC
|
||||
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
|
||||
github.com/Microsoft/go-winio v0.6.3-0.20251027160822-ad3df93bed29 h1:0kQAzHq8vLs7Pptv+7TxjdETLf/nIqJpIB4oC6Ba4vY=
|
||||
github.com/Microsoft/go-winio v0.6.3-0.20251027160822-ad3df93bed29/go.mod h1:ZWa7ssZJT30CCDGJ7fk/2SBTq9BIQrrVjrcss0UW2s0=
|
||||
github.com/Microsoft/hcsshim v0.15.0-rc.1 h1:FbbwtQmiD+BVHynGkx5S65JkLyhkEiiTP8nrpmg2SZw=
|
||||
github.com/Microsoft/hcsshim v0.15.0-rc.1/go.mod h1:HWvvUPIy9HF6LotILj1G4VyS065rcLQ6tqj6tMUdOfI=
|
||||
github.com/Microsoft/hcsshim v0.15.0-rc.4 h1:aZFX4LH0S20Lgjq0wG61StIClj7im4yzrxIClkaR8Z8=
|
||||
github.com/Microsoft/hcsshim v0.15.0-rc.4/go.mod h1:BA9CBztgu4h/6Jsvo1O1M4qjWw09PoYpaEYgexPE578=
|
||||
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
|
||||
@@ -176,8 +174,6 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
|
||||
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/alicebob/miniredis/v2 v2.38.0 h1:nZAzCR+Lj+Vxk4ZXzm2NuKq2O33RXj1XxJ2e2uP9jiw=
|
||||
github.com/alicebob/miniredis/v2 v2.38.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj6OXMm/+iu5cLMM=
|
||||
github.com/alicebob/miniredis/v2 v2.39.0 h1:M7WbmV5BmV56L8KTG0rw6vEQ+woTOghpDgin2xv4A0g=
|
||||
github.com/alicebob/miniredis/v2 v2.39.0/go.mod h1:TcL7YfarKPGDAthEtl5NBeHZfeUQj6OXMm/+iu5cLMM=
|
||||
github.com/aliyun/aliyun-oss-go-sdk v3.0.2+incompatible h1:8psS8a+wKfiLt1iVDX79F7Y6wUM49Lcha2FMXt4UM8g=
|
||||
@@ -554,8 +550,6 @@ github.com/fxamacker/cbor/v2 v2.9.1/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj2
|
||||
github.com/gabriel-vasile/mimetype v1.4.15 h1:05iP/CYtZ/w455R/KZM6rZ5ieAdh99UPtd+d3YzLmaI=
|
||||
github.com/gabriel-vasile/mimetype v1.4.15/go.mod h1:azpTcoLcDZRNgFou5j+APrqQx9HqVPWa6ijYQIIVswQ=
|
||||
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
|
||||
github.com/gin-contrib/cors v1.7.7 h1:Oh9joP463x7Mw72vhvJ61YQm8ODh9b04YR7vsOErD0Q=
|
||||
github.com/gin-contrib/cors v1.7.7/go.mod h1:K5tW0RkzJtWSiOdikXloy8VEZlgdVNpHNw8FpjUPNrE=
|
||||
github.com/gin-contrib/cors v1.7.8 h1:U0jjyXlWXMEx27hFE6hmdg/TOZviYgsOGGT+kLmUZrc=
|
||||
github.com/gin-contrib/cors v1.7.8/go.mod h1:u3nLI2pP1IlJn7tbvL7iiubDO9quBZ8FXP9LxmqpsPI=
|
||||
github.com/gin-contrib/pprof v1.5.5 h1:Q2AuW2ZZtALyK7gMQ74dYCMq+i//9/AM7fQChw+6ksU=
|
||||
@@ -685,8 +679,6 @@ github.com/go-restruct/restruct v1.2.0-alpha/go.mod h1:KqrpKpn4M8OLznErihXTGLlsX
|
||||
github.com/go-rod/rod v0.116.2 h1:A5t2Ky2A+5eD/ZJQr1EfsQSe5rms5Xof/qj296e+ZqA=
|
||||
github.com/go-rod/rod v0.116.2/go.mod h1:H+CMO9SCNc2TJ2WfrG+pKhITz57uGNYU43qYHh438Mg=
|
||||
github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
|
||||
github.com/go-sql-driver/mysql v1.10.0 h1:Q+1LV8DkHJvSYAdR83XzuhDaTykuDx0l6fkXxoWCWfw=
|
||||
github.com/go-sql-driver/mysql v1.10.0/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk=
|
||||
github.com/go-sql-driver/mysql v1.10.1 h1:arlSnNLq6a5yxGxV7qg9lF4j0C+KwD6NbQyKr9QL6ME=
|
||||
github.com/go-sql-driver/mysql v1.10.1/go.mod h1:M+cqaI7+xxXGG9swrdeUIoPG3Y3KCkF0pZej+SK+nWk=
|
||||
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
|
||||
@@ -1183,8 +1175,6 @@ github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c h1:cqn374
|
||||
github.com/mitchellh/mapstructure v1.5.1-0.20231216201459-8508981c8b6c/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
|
||||
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
|
||||
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
|
||||
github.com/moby/buildkit v0.32.2 h1:Sfy7+u6dUv/2yuBc9KCoK70Re8atuV8aPZ5UOC068Vc=
|
||||
github.com/moby/buildkit v0.32.2/go.mod h1:0GB/EJ1d+4VIVqIAgy3asaoGkVXy7IrDfVy7mPhOvg8=
|
||||
github.com/moby/buildkit v0.33.0 h1:zBbt1FiMcTB/oFg1iCNcKa83k5Rn8MGcVjXFIcfYhuQ=
|
||||
github.com/moby/buildkit v0.33.0/go.mod h1:uNKSZnfMk1aSa18JiCR5BT68M/3jIDGo6XuAByUK3ek=
|
||||
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
|
||||
@@ -1213,8 +1203,6 @@ github.com/moby/sys/signal v0.7.1 h1:PrQxdvxcGijdo6UXXo/lU/TvHUWyPhj7UOpSo8tuvk0
|
||||
github.com/moby/sys/signal v0.7.1/go.mod h1:Se1VGehYokAkrSQwL4tDzHvETwUZlnY7S5XtQ50mQp8=
|
||||
github.com/moby/sys/user v0.4.1 h1:RgjRlaDKi/Xmyrz4t8lyzXT6v2ooFeO/7xtchmhVWE0=
|
||||
github.com/moby/sys/user v0.4.1/go.mod h1:E9QsW5WRe1kUAf7kW8hXKwu1uhsZEAdPLYHYSDudF4Y=
|
||||
github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
|
||||
github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
|
||||
github.com/moby/sys/userns v0.2.0 h1:nEtDtp7NCV/6dutSklNe8FrENPwFdc4mXnZqC/JWgXM=
|
||||
github.com/moby/sys/userns v0.2.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
|
||||
github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
|
||||
@@ -1285,8 +1273,6 @@ github.com/onsi/gomega v1.42.1 h1:iN1rCUX+44NZ1Dc97MPoeFYbFR0vh8zxoxMFwKdyZ6I=
|
||||
github.com/onsi/gomega v1.42.1/go.mod h1:REff/hsDsodHoKlWsP2mAPhu1+5/6hVYNf9rIEBpeSg=
|
||||
github.com/opencontainers/cgroups v0.0.8 h1:dQZyCsB73ggKJUzNl4FLbpvArrLv1tLOjMYPHswdUrI=
|
||||
github.com/opencontainers/cgroups v0.0.8/go.mod h1:hPBRvnBhLZueEN0eJyozMeM3HeFGYlZW9KnO//px6G4=
|
||||
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20260827170726-3ecd27b5c78d h1:uKQM6y9UtP+DdLNGrkqu6e2lc4QXvxwWBRbGEJxQJs4=
|
||||
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20260827170726-3ecd27b5c78d/go.mod h1:Va0IMqkjv62YSEytL4sgxrkiD9IzU0T0bX/ZZEtMnSQ=
|
||||
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20260831232431-97274622c111 h1:oD6hNOyGX1BeC32TxPjLolobV8cUMfb9Kk6qtJoogQM=
|
||||
github.com/opencontainers/distribution-spec/specs-go v0.0.0-20260831232431-97274622c111/go.mod h1:Va0IMqkjv62YSEytL4sgxrkiD9IzU0T0bX/ZZEtMnSQ=
|
||||
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
|
||||
@@ -1475,8 +1461,6 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
|
||||
github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
|
||||
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
|
||||
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||
github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
|
||||
github.com/sirupsen/logrus v1.9.4/go.mod h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
|
||||
github.com/sirupsen/logrus v1.10.1 h1:xi4336Zh11WpU14fXR6I67V3yaTPQYwRx2WEtHbRg4Q=
|
||||
github.com/sirupsen/logrus v1.10.1/go.mod h1:vsQHnG7xzNsxk3NrwboUiWPnIC3dmbjcGPykD7+tiHk=
|
||||
github.com/skeema/knownhosts v1.3.2 h1:EDL9mgf4NzwMXCTfaxSD/o/a5fxDw/xL9nkU28JjdBg=
|
||||
@@ -1589,9 +1573,8 @@ github.com/tink-crypto/tink-go/v2 v2.7.0 h1:k7QnUXJ1cRDpvoy/5l1FimZqMAArRff8vjUq
|
||||
github.com/tink-crypto/tink-go/v2 v2.7.0/go.mod h1:cWNpQ/yAT/QHzAV0kBGMOSJzzYTKofDZdJaUqOPPWCI=
|
||||
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 h1:e/5i7d4oYZ+C1wj2THlRK+oAhjeS/TRQwMfkIuet3w0=
|
||||
github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399/go.mod h1:LdwHTNJT99C5fTAzDz0ud328OgXz+gierycbcIx2fRs=
|
||||
github.com/tonistiigi/fsutil v0.0.0-20260717003753-6d9dc2ebad62 h1:uppBiK+tE8tYG6fc0N8VnsC7FMZcWxnXIyaQ9GcUIU8=
|
||||
github.com/tonistiigi/fsutil v0.0.0-20260717003753-6d9dc2ebad62/go.mod h1:K5zrLch9UaSGNiek5XHZeqZUf1zPWJHqDfLIcnpquQ4=
|
||||
github.com/tonistiigi/fsutil v0.0.0-20260819142231-83cac42c1c52 h1:SGUsSbltLA7/kcCcWVaw6FtqkwvOCM9Ypq0ZLtsVbUE=
|
||||
github.com/tonistiigi/fsutil v0.0.0-20260819142231-83cac42c1c52/go.mod h1:oO0lfhK8QAY3alnpiYXcRVjyVx95XGWZE3K2M+AqfcM=
|
||||
github.com/transparency-dev/formats v0.1.1 h1:4bVHJc+KdBgpA1OJD1yjI+g0i5Z1graCppTMH8lWKJI=
|
||||
github.com/transparency-dev/formats v0.1.1/go.mod h1:qtZ8goRuJ8FTBG9c9+Bj0rn2rUG7eG/AUTkr+Aw3jFw=
|
||||
github.com/transparency-dev/merkle v0.0.2 h1:Q9nBoQcZcgPamMkGn7ghV8XiTZ/kRxn1yCG81+twTK4=
|
||||
@@ -1694,8 +1677,6 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
|
||||
go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
|
||||
go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
|
||||
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
|
||||
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
|
||||
go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
|
||||
go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
|
||||
go.opentelemetry.io/contrib/detectors/gcp v1.44.0 h1:NmLfL734pJhM0JKaYd2Y28+nY9dPRWYAAbxhRCrKXPw=
|
||||
@@ -1704,9 +1685,8 @@ go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.
|
||||
go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin v0.71.0/go.mod h1:QzTELfxkj/tFEZSD22OPPwLet5nIPmcdmZPeISk4C8M=
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0 h1:oECp5f+hN7nkwjU/8BxQ/q23bGPb8FIrD839owX222E=
|
||||
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.70.0/go.mod h1:DqEFwLumhzMBDQv9PcWbyoDxHI/4lAk6CM4nJBH39sc=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.69.0 h1:MCcYL7J6Vt/X0kjqbMZkekCmwsurbQRbL69vkiye2lk=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.69.0/go.mod h1:3jnStNwSufK+f5ktjL4EPcwtig4rtd81NS70lqHuXl8=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.70.0 h1:aVgLpGksz0vjoe6OynycqX8daNOAxJx5ZEhJXIXOVIU=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.70.0/go.mod h1:kmJlX6WuTrAH1fOCSbPJFrSnUagB8c3SY3E87It3JD8=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0 h1:3g7B90UzBltIDKq1/5mrTGxTnOFDV0ICOhLoxiZ8jlg=
|
||||
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0/go.mod h1:Ef8SuTh59BT7+ofpDxN9z+yOlc4t2GjLmKDgYNJL/NU=
|
||||
go.opentelemetry.io/contrib/propagators/b3 v1.46.0 h1:OFVqWObn7xLIbOjE/koO0LS9fZJNgAyBD0msA+UQAoc=
|
||||
@@ -1742,8 +1722,6 @@ go.podman.io/common v0.69.1 h1:hTIv8wzHJfHAMMZRocjv1849TiWrf5HDhH0eD74qJqY=
|
||||
go.podman.io/common v0.69.1/go.mod h1:g1iVXP+Xn/8He+96qpJw75pu054FRDQMiDGf2VKKspg=
|
||||
go.podman.io/image/v5 v5.41.1 h1:iPrhIt7/aNfRBMuzoxbMUVpQmR7Q75ahnrzkIC4JWLQ=
|
||||
go.podman.io/image/v5 v5.41.1/go.mod h1:wfgAlfczPK4ZZw/wn/Av2iJfb3z9Vv+RKWgjHNShzZk=
|
||||
go.podman.io/podman/v6 v6.1.0 h1:DUA0db+Equp/pQGilYFtJFHpYcd4gou92rDk6qjufw4=
|
||||
go.podman.io/podman/v6 v6.1.0/go.mod h1:o/RSYBeX7+/wGXnoOqfD4gJ7SpRegwZWmGkVUvpvRFs=
|
||||
go.podman.io/podman/v6 v6.1.1 h1:8FppMaU/Z1jVTiYwz/jNcig+IX0yqPuQvTgBmNZcWoY=
|
||||
go.podman.io/podman/v6 v6.1.1/go.mod h1:OFabOSmLOCcvMOGLFFZRwm/ZU1gSuij+r0AESrnz7ms=
|
||||
go.podman.io/storage v1.64.0 h1:ryHCZO+Zl0ZG7OTHF+Qc4C0zLNuoe9W35zgE7mh2pYw=
|
||||
@@ -2338,8 +2316,6 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD
|
||||
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.83.1 h1:HIO0+BEtBP6soyqvqC8sNUjZ7bTs+0hFQuFF+RAy++Y=
|
||||
google.golang.org/grpc v1.83.1/go.mod h1:kDyl6SKsiHKt0uylY5gtn5cEjkrIOhQOGDgIc4JGwzQ=
|
||||
google.golang.org/grpc v1.83.2 h1:EManeRomTObA0BU7I8vXgg/78uE5MJ9M8B39EX2WscU=
|
||||
google.golang.org/grpc v1.83.2/go.mod h1:YPI1hK3kDked6iHvgX3tR0y+nX/qpMFKhPgFsokw1S8=
|
||||
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
|
||||
|
||||
@@ -39,8 +39,7 @@ import (
|
||||
_ "github.com/distribution/distribution/v3/manifest/schema2"
|
||||
)
|
||||
|
||||
//go:generate mockgen -destination=mocks/clients.go -package=mocks github.com/go-sigma/sigma/pkg/distribution/clients Clients
|
||||
//go:generate mockgen -destination=mocks/clients_factory.go -package=mocks github.com/go-sigma/sigma/pkg/distribution/clients ClientsFactory
|
||||
//go:generate mockgen -destination=clients_mocks.go -package=clients github.com/go-sigma/sigma/pkg/distribution/clients Clients,ClientsFactory
|
||||
|
||||
// Clients is the interface of clients
|
||||
type Clients interface {
|
||||
|
||||
+60
-21
@@ -1,13 +1,13 @@
|
||||
// Code generated by MockGen. DO NOT EDIT.
|
||||
// Source: github.com/go-sigma/sigma/pkg/distribution/clients (interfaces: Clients)
|
||||
// Source: github.com/go-sigma/sigma/pkg/distribution/clients (interfaces: Clients,ClientsFactory)
|
||||
//
|
||||
// Generated by this command:
|
||||
//
|
||||
// mockgen -destination=mocks/clients.go -package=mocks github.com/go-sigma/sigma/pkg/distribution/clients Clients
|
||||
// mockgen -destination=clients_mocks.go -package=clients github.com/go-sigma/sigma/pkg/distribution/clients Clients,ClientsFactory
|
||||
//
|
||||
|
||||
// Package mocks is a generated GoMock package.
|
||||
package mocks
|
||||
// Package clients is a generated GoMock package.
|
||||
package clients
|
||||
|
||||
import (
|
||||
context "context"
|
||||
@@ -16,8 +16,8 @@ import (
|
||||
reflect "reflect"
|
||||
|
||||
distribution "github.com/distribution/distribution/v3"
|
||||
config "github.com/go-sigma/sigma/pkg/config"
|
||||
digest "github.com/opencontainers/go-digest"
|
||||
v1 "github.com/opencontainers/image-spec/specs-go/v1"
|
||||
gomock "go.uber.org/mock/gomock"
|
||||
)
|
||||
|
||||
@@ -82,27 +82,27 @@ func (mr *MockClientsMockRecorder) DoRequest(ctx, method, path, headers any, bod
|
||||
}
|
||||
|
||||
// GetBlob mocks base method.
|
||||
func (m *MockClients) GetBlob(ctx context.Context, repository string, digest digest.Digest) (v1.Descriptor, io.ReadCloser, error) {
|
||||
func (m *MockClients) GetBlob(ctx context.Context, repository string, arg2 digest.Digest) (distribution.Descriptor, io.ReadCloser, error) {
|
||||
m.ctrl.T.Helper()
|
||||
ret := m.ctrl.Call(m, "GetBlob", ctx, repository, digest)
|
||||
ret0, _ := ret[0].(v1.Descriptor)
|
||||
ret := m.ctrl.Call(m, "GetBlob", ctx, repository, arg2)
|
||||
ret0, _ := ret[0].(distribution.Descriptor)
|
||||
ret1, _ := ret[1].(io.ReadCloser)
|
||||
ret2, _ := ret[2].(error)
|
||||
return ret0, ret1, ret2
|
||||
}
|
||||
|
||||
// GetBlob indicates an expected call of GetBlob.
|
||||
func (mr *MockClientsMockRecorder) GetBlob(ctx, repository, digest any) *gomock.Call {
|
||||
func (mr *MockClientsMockRecorder) GetBlob(ctx, repository, arg2 any) *gomock.Call {
|
||||
mr.mock.ctrl.T.Helper()
|
||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlob", reflect.TypeOf((*MockClients)(nil).GetBlob), ctx, repository, digest)
|
||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetBlob", reflect.TypeOf((*MockClients)(nil).GetBlob), ctx, repository, arg2)
|
||||
}
|
||||
|
||||
// GetManifest mocks base method.
|
||||
func (m *MockClients) GetManifest(ctx context.Context, repository, reference string) (distribution.Manifest, v1.Descriptor, error) {
|
||||
func (m *MockClients) GetManifest(ctx context.Context, repository, reference string) (distribution.Manifest, distribution.Descriptor, error) {
|
||||
m.ctrl.T.Helper()
|
||||
ret := m.ctrl.Call(m, "GetManifest", ctx, repository, reference)
|
||||
ret0, _ := ret[0].(distribution.Manifest)
|
||||
ret1, _ := ret[1].(v1.Descriptor)
|
||||
ret1, _ := ret[1].(distribution.Descriptor)
|
||||
ret2, _ := ret[2].(error)
|
||||
return ret0, ret1, ret2
|
||||
}
|
||||
@@ -114,18 +114,18 @@ func (mr *MockClientsMockRecorder) GetManifest(ctx, repository, reference any) *
|
||||
}
|
||||
|
||||
// HeadBlob mocks base method.
|
||||
func (m *MockClients) HeadBlob(ctx context.Context, repository string, digest digest.Digest) (v1.Descriptor, error) {
|
||||
func (m *MockClients) HeadBlob(ctx context.Context, repository string, arg2 digest.Digest) (distribution.Descriptor, error) {
|
||||
m.ctrl.T.Helper()
|
||||
ret := m.ctrl.Call(m, "HeadBlob", ctx, repository, digest)
|
||||
ret0, _ := ret[0].(v1.Descriptor)
|
||||
ret := m.ctrl.Call(m, "HeadBlob", ctx, repository, arg2)
|
||||
ret0, _ := ret[0].(distribution.Descriptor)
|
||||
ret1, _ := ret[1].(error)
|
||||
return ret0, ret1
|
||||
}
|
||||
|
||||
// HeadBlob indicates an expected call of HeadBlob.
|
||||
func (mr *MockClientsMockRecorder) HeadBlob(ctx, repository, digest any) *gomock.Call {
|
||||
func (mr *MockClientsMockRecorder) HeadBlob(ctx, repository, arg2 any) *gomock.Call {
|
||||
mr.mock.ctrl.T.Helper()
|
||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HeadBlob", reflect.TypeOf((*MockClients)(nil).HeadBlob), ctx, repository, digest)
|
||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HeadBlob", reflect.TypeOf((*MockClients)(nil).HeadBlob), ctx, repository, arg2)
|
||||
}
|
||||
|
||||
// HeadManifest mocks base method.
|
||||
@@ -144,15 +144,54 @@ func (mr *MockClientsMockRecorder) HeadManifest(ctx, repository, reference any)
|
||||
}
|
||||
|
||||
// PutBlob mocks base method.
|
||||
func (m *MockClients) PutBlob(ctx context.Context, repository string, digest digest.Digest, content io.Reader) error {
|
||||
func (m *MockClients) PutBlob(ctx context.Context, repository string, arg2 digest.Digest, content io.Reader) error {
|
||||
m.ctrl.T.Helper()
|
||||
ret := m.ctrl.Call(m, "PutBlob", ctx, repository, digest, content)
|
||||
ret := m.ctrl.Call(m, "PutBlob", ctx, repository, arg2, content)
|
||||
ret0, _ := ret[0].(error)
|
||||
return ret0
|
||||
}
|
||||
|
||||
// PutBlob indicates an expected call of PutBlob.
|
||||
func (mr *MockClientsMockRecorder) PutBlob(ctx, repository, digest, content any) *gomock.Call {
|
||||
func (mr *MockClientsMockRecorder) PutBlob(ctx, repository, arg2, content any) *gomock.Call {
|
||||
mr.mock.ctrl.T.Helper()
|
||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PutBlob", reflect.TypeOf((*MockClients)(nil).PutBlob), ctx, repository, digest, content)
|
||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PutBlob", reflect.TypeOf((*MockClients)(nil).PutBlob), ctx, repository, arg2, content)
|
||||
}
|
||||
|
||||
// MockClientsFactory is a mock of ClientsFactory interface.
|
||||
type MockClientsFactory struct {
|
||||
ctrl *gomock.Controller
|
||||
recorder *MockClientsFactoryMockRecorder
|
||||
isgomock struct{}
|
||||
}
|
||||
|
||||
// MockClientsFactoryMockRecorder is the mock recorder for MockClientsFactory.
|
||||
type MockClientsFactoryMockRecorder struct {
|
||||
mock *MockClientsFactory
|
||||
}
|
||||
|
||||
// NewMockClientsFactory creates a new mock instance.
|
||||
func NewMockClientsFactory(ctrl *gomock.Controller) *MockClientsFactory {
|
||||
mock := &MockClientsFactory{ctrl: ctrl}
|
||||
mock.recorder = &MockClientsFactoryMockRecorder{mock}
|
||||
return mock
|
||||
}
|
||||
|
||||
// EXPECT returns an object that allows the caller to indicate expected use.
|
||||
func (m *MockClientsFactory) EXPECT() *MockClientsFactoryMockRecorder {
|
||||
return m.recorder
|
||||
}
|
||||
|
||||
// New mocks base method.
|
||||
func (m *MockClientsFactory) New(arg0 *config.Configuration) (Clients, error) {
|
||||
m.ctrl.T.Helper()
|
||||
ret := m.ctrl.Call(m, "New", arg0)
|
||||
ret0, _ := ret[0].(Clients)
|
||||
ret1, _ := ret[1].(error)
|
||||
return ret0, ret1
|
||||
}
|
||||
|
||||
// New indicates an expected call of New.
|
||||
func (mr *MockClientsFactoryMockRecorder) New(arg0 any) *gomock.Call {
|
||||
mr.mock.ctrl.T.Helper()
|
||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockClientsFactory)(nil).New), arg0)
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
// Code generated by MockGen. DO NOT EDIT.
|
||||
// Source: github.com/go-sigma/sigma/pkg/distribution/clients (interfaces: ClientsFactory)
|
||||
//
|
||||
// Generated by this command:
|
||||
//
|
||||
// mockgen -destination=mocks/clients_factory.go -package=mocks github.com/go-sigma/sigma/pkg/distribution/clients ClientsFactory
|
||||
//
|
||||
|
||||
// Package mocks is a generated GoMock package.
|
||||
package mocks
|
||||
|
||||
import (
|
||||
reflect "reflect"
|
||||
|
||||
"github.com/go-sigma/sigma/pkg/config"
|
||||
clients "github.com/go-sigma/sigma/pkg/distribution/clients"
|
||||
gomock "go.uber.org/mock/gomock"
|
||||
)
|
||||
|
||||
// MockClientsFactory is a mock of ClientsFactory interface.
|
||||
type MockClientsFactory struct {
|
||||
ctrl *gomock.Controller
|
||||
recorder *MockClientsFactoryMockRecorder
|
||||
isgomock struct{}
|
||||
}
|
||||
|
||||
// MockClientsFactoryMockRecorder is the mock recorder for MockClientsFactory.
|
||||
type MockClientsFactoryMockRecorder struct {
|
||||
mock *MockClientsFactory
|
||||
}
|
||||
|
||||
// NewMockClientsFactory creates a new mock instance.
|
||||
func NewMockClientsFactory(ctrl *gomock.Controller) *MockClientsFactory {
|
||||
mock := &MockClientsFactory{ctrl: ctrl}
|
||||
mock.recorder = &MockClientsFactoryMockRecorder{mock}
|
||||
return mock
|
||||
}
|
||||
|
||||
// EXPECT returns an object that allows the caller to indicate expected use.
|
||||
func (m *MockClientsFactory) EXPECT() *MockClientsFactoryMockRecorder {
|
||||
return m.recorder
|
||||
}
|
||||
|
||||
// New mocks base method.
|
||||
func (m *MockClientsFactory) New(config *config.Configuration) (clients.Clients, error) {
|
||||
m.ctrl.T.Helper()
|
||||
ret := m.ctrl.Call(m, "New", config)
|
||||
ret0, _ := ret[0].(clients.Clients)
|
||||
ret1, _ := ret[1].(error)
|
||||
return ret0, ret1
|
||||
}
|
||||
|
||||
// New indicates an expected call of New.
|
||||
func (mr *MockClientsFactoryMockRecorder) New(config any) *gomock.Call {
|
||||
mr.mock.ctrl.T.Helper()
|
||||
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "New", reflect.TypeOf((*MockClientsFactory)(nil).New), config)
|
||||
}
|
||||
@@ -18,7 +18,7 @@ import (
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
)
|
||||
|
||||
//go:generate mockgen -destination=mocks/password.go -package=mocks github.com/go-sigma/sigma/pkg/service/password Service
|
||||
//go:generate mockgen -destination=password_mocks.go -package=password github.com/go-sigma/sigma/pkg/service/password Service
|
||||
|
||||
// Service is an interface for password hashing
|
||||
type Service interface {
|
||||
|
||||
@@ -3,11 +3,11 @@
|
||||
//
|
||||
// Generated by this command:
|
||||
//
|
||||
// mockgen -destination=mocks/password.go -package=mocks github.com/go-sigma/sigma/pkg/service/password Service
|
||||
// mockgen -destination=password_mocks.go -package=password github.com/go-sigma/sigma/pkg/service/password Service
|
||||
//
|
||||
|
||||
// Package mocks is a generated GoMock package.
|
||||
package mocks
|
||||
// Package password is a generated GoMock package.
|
||||
package password
|
||||
|
||||
import (
|
||||
reflect "reflect"
|
||||
@@ -28,7 +28,7 @@ import (
|
||||
"github.com/go-sigma/sigma/pkg/dal/models"
|
||||
repouser "github.com/go-sigma/sigma/pkg/dal/repository/user"
|
||||
"github.com/go-sigma/sigma/pkg/server/errcode"
|
||||
passwordmocks "github.com/go-sigma/sigma/pkg/service/password/mocks"
|
||||
passwordmocks "github.com/go-sigma/sigma/pkg/service/password"
|
||||
"github.com/go-sigma/sigma/pkg/service/token"
|
||||
)
|
||||
|
||||
|
||||
Reference in new issue
Block a user