diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a11eadaa..cbc89540 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -20,11 +20,11 @@ jobs: with: go-version-file: 'go.mod' - name: Install mockgen - run: go install go.uber.org/mock/mockgen@v0.4.0 + run: go install go.uber.org/mock/mockgen@v0.5.2 - name: Install golangci-lint uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0 with: - version: v1.63.4 + version: v1.64.8 - name: Install env-test run: go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest - name: Build diff --git a/Dockerfile b/Dockerfile index 70ba62b4..e570baec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:experimental -FROM registry.suse.com/bci/golang:1.23 as build +FROM registry.suse.com/bci/golang:1.24 as build COPY go.mod go.sum main.go /src/ COPY pkg /src/pkg/ #RUN --mount=type=cache,target=/root/.cache/go-build \ diff --git a/go.mod b/go.mod index 369c2fe3..4abed4b3 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,8 @@ module github.com/rancher/steve -go 1.23.0 +go 1.24.0 -toolchain go1.23.6 +toolchain go1.24.2 replace ( github.com/crewjam/saml => github.com/rancher/saml v0.4.14 @@ -14,47 +14,46 @@ require ( github.com/adrg/xdg v0.5.3 github.com/golang/protobuf v1.5.4 github.com/google/gnostic-models v0.6.9 - github.com/google/go-cmp v0.6.0 + github.com/google/go-cmp v0.7.0 github.com/gorilla/mux v1.8.1 - github.com/gorilla/websocket v1.5.3 + github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 github.com/pborman/uuid v1.2.1 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.20.5 - github.com/rancher/apiserver v0.6.2 - github.com/rancher/dynamiclistener v0.6.2 + github.com/prometheus/client_golang v1.22.0 + github.com/rancher/apiserver v0.6.3 + github.com/rancher/dynamiclistener v0.7.0-rc1 github.com/rancher/kubernetes-provider-detector v0.1.5 - github.com/rancher/lasso v0.2.2 - github.com/rancher/norman v0.6.0 - github.com/rancher/remotedialer v0.4.5-rc.1 - github.com/rancher/wrangler/v3 v3.2.1 + github.com/rancher/lasso v0.2.3-rc1 + github.com/rancher/norman v0.6.1 + github.com/rancher/remotedialer v0.4.5-rc.2 + github.com/rancher/wrangler/v3 v3.2.2-rc.1 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.10.0 github.com/urfave/cli/v2 v2.27.5 go.uber.org/mock v0.5.0 - golang.org/x/sync v0.12.0 - google.golang.org/protobuf v1.35.2 + golang.org/x/sync v0.13.0 + google.golang.org/protobuf v1.36.5 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.32.2 - k8s.io/apiextensions-apiserver v0.32.2 - k8s.io/apimachinery v0.32.2 - k8s.io/apiserver v0.32.2 - k8s.io/client-go v0.32.2 - k8s.io/component-base v0.32.2 + k8s.io/api v0.33.1 + k8s.io/apiextensions-apiserver v0.33.1 + k8s.io/apimachinery v0.33.1 + k8s.io/apiserver v0.33.1 + k8s.io/client-go v0.33.1 + k8s.io/component-base v0.33.1 k8s.io/klog v1.0.0 - k8s.io/kube-aggregator v0.32.1 - k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f - k8s.io/kubernetes v1.32.1 + k8s.io/kube-aggregator v0.33.1 + k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff + k8s.io/kubernetes v1.33.1 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 modernc.org/sqlite v1.36.0 - sigs.k8s.io/controller-runtime v0.19.0 + sigs.k8s.io/controller-runtime v0.21.0 sigs.k8s.io/yaml v1.4.0 ) require ( - cel.dev/expr v0.18.0 // indirect + cel.dev/expr v0.19.1 // indirect github.com/NYTimes/gziphandler v1.1.1 // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect - github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/blang/semver/v4 v4.0.0 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect @@ -66,7 +65,7 @@ require ( github.com/dustin/go-humanize v1.0.1 // indirect github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/evanphx/json-patch v5.9.11+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/evanphx/json-patch/v5 v5.9.11 // indirect github.com/felixge/httpsnoop v1.0.4 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect @@ -77,16 +76,14 @@ require ( github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/btree v1.0.1 // indirect - github.com/google/cel-go v0.22.0 // indirect - github.com/google/gofuzz v1.2.0 // indirect + github.com/google/btree v1.1.3 // indirect + github.com/google/cel-go v0.23.2 // indirect github.com/google/uuid v1.6.0 // indirect github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect - github.com/klauspost/compress v1.17.9 // indirect github.com/kylelemons/godebug v1.1.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -97,7 +94,7 @@ require ( github.com/ncruces/go-strftime v0.1.9 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/common v0.62.0 // indirect github.com/prometheus/procfs v0.15.1 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect @@ -106,42 +103,44 @@ require ( github.com/stoewer/go-strcase v1.3.0 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect - go.etcd.io/etcd/api/v3 v3.5.16 // indirect - go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect - go.etcd.io/etcd/client/v3 v3.5.16 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect - go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect - go.opentelemetry.io/otel/metric v1.28.0 // indirect - go.opentelemetry.io/otel/sdk v1.28.0 // indirect - go.opentelemetry.io/otel/trace v1.28.0 // indirect - go.opentelemetry.io/proto/otlp v1.3.1 // indirect + go.etcd.io/etcd/api/v3 v3.5.21 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect + go.etcd.io/etcd/client/v3 v3.5.21 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect + go.opentelemetry.io/otel v1.33.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect + go.opentelemetry.io/otel/metric v1.33.0 // indirect + go.opentelemetry.io/otel/sdk v1.33.0 // indirect + go.opentelemetry.io/otel/trace v1.33.0 // indirect + go.opentelemetry.io/proto/otlp v1.4.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/crypto v0.36.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/net v0.37.0 // indirect - golang.org/x/oauth2 v0.23.0 // indirect + golang.org/x/net v0.38.0 // indirect + golang.org/x/oauth2 v0.27.0 // indirect golang.org/x/sys v0.31.0 // indirect golang.org/x/term v0.30.0 // indirect - golang.org/x/text v0.23.0 // indirect - golang.org/x/time v0.7.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect - google.golang.org/grpc v1.65.0 // indirect + golang.org/x/text v0.24.0 // indirect + golang.org/x/time v0.9.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect + google.golang.org/grpc v1.68.1 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kms v0.32.2 // indirect + k8s.io/kms v0.33.1 // indirect modernc.org/libc v1.61.13 // indirect modernc.org/mathutil v1.7.1 // indirect modernc.org/memory v1.8.2 // indirect - sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect sigs.k8s.io/cli-utils v0.37.2 // indirect sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect + sigs.k8s.io/randfill v1.0.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect ) diff --git a/go.sum b/go.sum index 176ae1fd..d32c1608 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cel.dev/expr v0.18.0 h1:CJ6drgk+Hf96lkLikr4rFf19WrU0BOWEihyZnI2TAzo= -cel.dev/expr v0.18.0/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= +cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4= +cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -20,8 +20,6 @@ github.com/adrg/xdg v0.5.3 h1:xRnxJXne7+oWDatRhR1JLnvuccuIeCoBu2rtuLqQB78= github.com/adrg/xdg v0.5.3/go.mod h1:nlTsY+NNiCBGCK2tpm09vRqfVzrc2fLmXGpBLF0zlTQ= github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 h1:DklsrG3dyBCFEj5IhUbnKptjxatkF07cF2ak3yi77so= -github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= @@ -53,8 +51,8 @@ github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRr github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.9.11+incompatible h1:ixHHqfcGvxhWkniF1tWxBHA0yb4Z+d1UQi45df52xW8= github.com/evanphx/json-patch v5.9.11+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= -github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU= +github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM= github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -89,8 +87,8 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= -github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= +github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= +github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= @@ -104,21 +102,19 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= -github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.22.0 h1:b3FJZxpiv1vTMo2/5RDUqAHPxkT8mmMfJIrq1llbf7g= -github.com/google/cel-go v0.22.0/go.mod h1:BuznPXXfQDpXKWQ9sPW3TzlAJN5zzFe+i9tIs0yC4s8= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/cel-go v0.23.2 h1:UdEe3CvQh3Nv+E/j9r1Y//WO0K0cSyD7/y0bzyLIMI4= +github.com/google/cel-go v0.23.2/go.mod h1:52Pb6QsDbC5kvgxvZhiL9QX1oZEkcUF/ZqaPx1J5Wwo= github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw= github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= -github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= @@ -133,8 +129,8 @@ github.com/googleapis/gnostic v0.1.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTV github.com/gophercloud/gophercloud v0.1.0/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= -github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= -github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 h1:JeSE6pjso5THxAzdVpqr6/geYxZytqFMBCOtn/ujyeo= +github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674/go.mod h1:r4w70xmWCQKmi1ONH4KIaBptdivuRPyosB9RmPlGEwA= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= @@ -142,8 +138,8 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92Bcuy github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 h1:TmHmbvxPmaegwhDubVz0lICL0J5Ka2vwTzhoePEXsGE= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0/go.mod h1:qztMSjm835F2bXf+5HKAPIS5qsmQDqZna/PgVt4rWtI= 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/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= @@ -162,8 +158,8 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= -github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= @@ -196,12 +192,12 @@ github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.11.0 h1:JAKSXpt1YjtLA7YpPiqO9ss6sNXEsPfSGdwN0UHqzrw= github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM= -github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= +github.com/onsi/ginkgo/v2 v2.22.0 h1:Yed107/8DjTr0lKCNt7Dn8yQ6ybuDRQoMGrNFKzMfHg= +github.com/onsi/ginkgo/v2 v2.22.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= -github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= -github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= +github.com/onsi/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw= +github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= @@ -210,32 +206,32 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= -github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q= +github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0= github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io= +github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/rancher/apiserver v0.6.2 h1:b+viUWxOLBiSTTvYyTvqY9fRpg9qmJNMIrwms4r0TI0= -github.com/rancher/apiserver v0.6.2/go.mod h1:Tc4+kkh5mO7M1sZYaqlunx4S/YVcz9AapvbScS3hQRg= -github.com/rancher/dynamiclistener v0.6.2 h1:F0SEJhvO2aFe0eTvKGlQoy5x7HtwK8oJbyITVfBSb90= -github.com/rancher/dynamiclistener v0.6.2/go.mod h1:ncmVR7qR8kR1o6xNkTcVS2mZ9WtlljimBilIlNjdyzc= +github.com/rancher/apiserver v0.6.3 h1:O77xSHtDNNq8j9+FjyoMoJNaNomnA/doYK9ON8bDeEA= +github.com/rancher/apiserver v0.6.3/go.mod h1:hCNwZwGitxLDIFrhkN+8smoRXKYOJ9zqOCwIAX+sHcQ= +github.com/rancher/dynamiclistener v0.7.0-rc1 h1:7IDfKnS/14XvpkiP64++y9CBy525UDuOWfm49hOZ6+k= +github.com/rancher/dynamiclistener v0.7.0-rc1/go.mod h1:Q2YA42xp7Xc69JiSlJ8GpvLvze261T0iQ/TP4RdMCYk= github.com/rancher/kubernetes-provider-detector v0.1.5 h1:hWRAsWuJOemzGjz/XrbTlM7QmfO4OedvFE3QwXiH60I= github.com/rancher/kubernetes-provider-detector v0.1.5/go.mod h1:ypuJS7kP7rUiAn330xG46mj+Nhvym05GM8NqMVekpH0= -github.com/rancher/lasso v0.2.2 h1:oKP5d4+eSupwHftLMTWo6QS1tYYZ5XK+ZjP+VNhwmk8= -github.com/rancher/lasso v0.2.2/go.mod h1:KSV3jBXfdXqdCuMm2uC8kKB9q/wuDYb3h0eHZoRjShM= -github.com/rancher/norman v0.6.0 h1:8CyY9cVcw0L+YYZRGvXHPMENefLaDkmi6vpscrVjXew= -github.com/rancher/norman v0.6.0/go.mod h1:CQ0/1CoEqbeJXvOXuRQvsmiBd7QIgxZG5IvQFOPAHOg= -github.com/rancher/remotedialer v0.4.5-rc.1 h1:LwGrOqt6hrKjf9Er5LBEKP6xk21RFF7PO2d0+E+mavk= -github.com/rancher/remotedialer v0.4.5-rc.1/go.mod h1:x31ZR9714VzudfHVke40+WN5wDSDckxjRGr1bWgpgc0= -github.com/rancher/wrangler/v3 v3.2.1 h1:V51PnoGb8bZ5jJdxFlqKQApzWdSp4sEy5OPGuEGqVbI= -github.com/rancher/wrangler/v3 v3.2.1/go.mod h1:RV8kkv5br5HaxXWamIbr95pOjvVeoC5CeBldcdw5Fv0= +github.com/rancher/lasso v0.2.3-rc1 h1:dRerAaAiziQKSVasSQe3Av2aNGokjidzZD/bLLLIQT4= +github.com/rancher/lasso v0.2.3-rc1/go.mod h1:L8ct0T/HAYTWLKWPBQCZvluqmr72Yl5YOewjgRRvnMk= +github.com/rancher/norman v0.6.1 h1:JVIxkWZcbxtrcSK4WIwsmyB07TzTvoqqf/R0fZB7ylk= +github.com/rancher/norman v0.6.1/go.mod h1:jRcnEruyY6olqtImy+q+zw0/iXX7YqLF4/K4kh5hR40= +github.com/rancher/remotedialer v0.4.5-rc.2 h1:2X6ks0zpUrsaInXW+LpovwT2JZDBLWq/qP+MCqjokSA= +github.com/rancher/remotedialer v0.4.5-rc.2/go.mod h1:fp0TLRV//NaHnKP3EPYK+hKanAwuKVE0ZraLNrkbPlE= +github.com/rancher/wrangler/v3 v3.2.2-rc.1 h1:UoReGk+6sZD9uVoCpwdFWrznhVs4jKDsZ+fNNMJ0EQE= +github.com/rancher/wrangler/v3 v3.2.2-rc.1/go.mod h1:G+gawqOKIo7i1jtgPKvzU3RzA+3OCaAsYVxq03Iya20= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= @@ -253,6 +249,8 @@ github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8w github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -275,39 +273,41 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= -go.etcd.io/etcd/api/v3 v3.5.16 h1:WvmyJVbjWqK4R1E+B12RRHz3bRGy9XVfh++MgbN+6n0= -go.etcd.io/etcd/api/v3 v3.5.16/go.mod h1:1P4SlIP/VwkDmGo3OlOD7faPeP8KDIFhqvciH5EfN28= -go.etcd.io/etcd/client/pkg/v3 v3.5.16 h1:ZgY48uH6UvB+/7R9Yf4x574uCO3jIx0TRDyetSfId3Q= -go.etcd.io/etcd/client/pkg/v3 v3.5.16/go.mod h1:V8acl8pcEK0Y2g19YlOV9m9ssUe6MgiDSobSoaBAM0E= -go.etcd.io/etcd/client/v2 v2.305.16 h1:kQrn9o5czVNaukf2A2At43cE9ZtWauOtf9vRZuiKXow= -go.etcd.io/etcd/client/v2 v2.305.16/go.mod h1:h9YxWCzcdvZENbfzBTFCnoNumr2ax3F19sKMqHFmXHE= -go.etcd.io/etcd/client/v3 v3.5.16 h1:sSmVYOAHeC9doqi0gv7v86oY/BTld0SEFGaxsU9eRhE= -go.etcd.io/etcd/client/v3 v3.5.16/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50= -go.etcd.io/etcd/pkg/v3 v3.5.16 h1:cnavs5WSPWeK4TYwPYfmcr3Joz9BH+TZ6qoUtz6/+mc= -go.etcd.io/etcd/pkg/v3 v3.5.16/go.mod h1:+lutCZHG5MBBFI/U4eYT5yL7sJfnexsoM20Y0t2uNuY= -go.etcd.io/etcd/raft/v3 v3.5.16 h1:zBXA3ZUpYs1AwiLGPafYAKKl/CORn/uaxYDwlNwndAk= -go.etcd.io/etcd/raft/v3 v3.5.16/go.mod h1:P4UP14AxofMJ/54boWilabqqWoW9eLodl6I5GdGzazI= -go.etcd.io/etcd/server/v3 v3.5.16 h1:d0/SAdJ3vVsZvF8IFVb1k8zqMZ+heGcNfft71ul9GWE= -go.etcd.io/etcd/server/v3 v3.5.16/go.mod h1:ynhyZZpdDp1Gq49jkUg5mfkDWZwXnn3eIqCqtJnrD/s= +go.etcd.io/etcd/api/v3 v3.5.21 h1:A6O2/JDb3tvHhiIz3xf9nJ7REHvtEFJJ3veW3FbCnS8= +go.etcd.io/etcd/api/v3 v3.5.21/go.mod h1:c3aH5wcvXv/9dqIw2Y810LDXJfhSYdHQ0vxmP3CCHVY= +go.etcd.io/etcd/client/pkg/v3 v3.5.21 h1:lPBu71Y7osQmzlflM9OfeIV2JlmpBjqBNlLtcoBqUTc= +go.etcd.io/etcd/client/pkg/v3 v3.5.21/go.mod h1:BgqT/IXPjK9NkeSDjbzwsHySX3yIle2+ndz28nVsjUs= +go.etcd.io/etcd/client/v2 v2.305.21 h1:eLiFfexc2mE+pTLz9WwnoEsX5JTTpLCYVivKkmVXIRA= +go.etcd.io/etcd/client/v2 v2.305.21/go.mod h1:OKkn4hlYNf43hpjEM3Ke3aRdUkhSl8xjKjSf8eCq2J8= +go.etcd.io/etcd/client/v3 v3.5.21 h1:T6b1Ow6fNjOLOtM0xSoKNQt1ASPCLWrF9XMHcH9pEyY= +go.etcd.io/etcd/client/v3 v3.5.21/go.mod h1:mFYy67IOqmbRf/kRUvsHixzo3iG+1OF2W2+jVIQRAnU= +go.etcd.io/etcd/pkg/v3 v3.5.21 h1:jUItxeKyrDuVuWhdh0HtjUANwyuzcb7/FAeUfABmQsk= +go.etcd.io/etcd/pkg/v3 v3.5.21/go.mod h1:wpZx8Egv1g4y+N7JAsqi2zoUiBIUWznLjqJbylDjWgU= +go.etcd.io/etcd/raft/v3 v3.5.21 h1:dOmE0mT55dIUsX77TKBLq+RgyumsQuYeiRQnW/ylugk= +go.etcd.io/etcd/raft/v3 v3.5.21/go.mod h1:fmcuY5R2SNkklU4+fKVBQi2biVp5vafMrWUEj4TJ4Cs= +go.etcd.io/etcd/server/v3 v3.5.21 h1:9w0/k12majtgarGmlMVuhwXRI2ob3/d1Ik3X5TKo0yU= +go.etcd.io/etcd/server/v3 v3.5.21/go.mod h1:G1mOzdwuzKT1VRL7SqRchli/qcFrtLBTAQ4lV20sXXo= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 h1:9G6E0TXzGFVfTnawRzrPl83iHOAV7L8NJiR8RSGYV1g= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0/go.mod h1:azvtTADFQJA8mX80jIH/akaE7h+dbm/sVuaHqN13w74= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 h1:4K4tsIXefpVJtvA/8srF4V4y0akAoPHkIslgAkjixJA= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0/go.mod h1:jjdQuTGVsXV4vSs+CJ2qYDeDPf9yIJV23qlIzBm73Vg= -go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= -go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 h1:3Q/xZUyC1BBkualc9ROb4G8qkH90LXEIICcs5zv1OYY= -go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0/go.mod h1:s75jGIWA9OfCMzF0xr+ZgfrB5FEbbV7UuYo32ahUiFI= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA= -go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ= -go.opentelemetry.io/otel/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= -go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= -go.opentelemetry.io/otel/sdk v1.28.0 h1:b9d7hIry8yZsgtbmM0DKyPWMMUMlK9NEKuIG4aBqWyE= -go.opentelemetry.io/otel/sdk v1.28.0/go.mod h1:oYj7ClPUA7Iw3m+r7GeEjz0qckQRJK2B8zjcZEfu7Pg= -go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= -go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= -go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0= -go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0 h1:PS8wXpbyaDJQ2VDHHncMe9Vct0Zn1fEjpsjrLxGJoSc= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.58.0/go.mod h1:HDBUsEjOuRC0EzKZ1bSaRGZWUBAzo+MhAcUUORSr4D0= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 h1:yd02MEjBdJkG3uabWP9apV+OuWRIXGDuJEUJbOHmCFU= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0/go.mod h1:umTcuxiv1n/s/S6/c2AT/g2CQ7u5C59sHDNmfSwgz7Q= +go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw= +go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 h1:Vh5HayB/0HHfOQA7Ctx69E/Y/DcQSMPpKANYVMQ7fBA= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0/go.mod h1:cpgtDBaqD/6ok/UG0jT15/uKjAY8mRA53diogHBg3UI= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0/go.mod h1:57gTHJSE5S1tqg+EKsLPlTWhpHMsWlVmer+LA926XiA= +go.opentelemetry.io/otel/metric v1.33.0 h1:r+JOocAyeRVXD8lZpjdQjzMadVZp2M4WmQ+5WtEnklQ= +go.opentelemetry.io/otel/metric v1.33.0/go.mod h1:L9+Fyctbp6HFTddIxClbQkjtubW6O9QS3Ann/M82u6M= +go.opentelemetry.io/otel/sdk v1.33.0 h1:iax7M131HuAm9QkZotNHEfstof92xM+N8sr3uHXc2IM= +go.opentelemetry.io/otel/sdk v1.33.0/go.mod h1:A1Q5oi7/9XaMlIWzPSxLRWOI8nG3FnzHJNbiENQuihM= +go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s= +go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck= +go.opentelemetry.io/proto/otlp v1.4.0 h1:TA9WRvW6zMwP+Ssb6fLoUIuirti1gGbP28GcKG1jgeg= +go.opentelemetry.io/proto/otlp v1.4.0/go.mod h1:PPBWZIP98o2ElSqI35IHfu7hIhSwvc5N38Jw8pXuGFY= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= @@ -345,13 +345,13 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c= -golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= -golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M= +golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -359,8 +359,8 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= -golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= +golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610= +golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -380,12 +380,12 @@ 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= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= -golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= +golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= +golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= -golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= +golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -412,15 +412,15 @@ google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRn google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ= google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80/go.mod h1:cc8bqMqtv9gMOr0zHg2Vzff5ULhhL2IXP4sbcn32Dro= -google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 h1:YcyjlL1PRr2Q17/I0dPk2JmYS5CDXfcdb2Z3YRioEbw= -google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:OCdP9MfskevB/rbYvHTsXTtKC+3bHWajPdoKgjcYkfo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 h1:2035KHhUv+EpyB+hWgJnaWKJOdX1E95w2S8Rr4uWKTs= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU= +google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 h1:CkkIfIt50+lT6NHAVoRYEyAvQGFM7xEwXUUywFvEb3Q= +google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576/go.mod h1:1R3kvZ1dtP3+4p4d3G8uJ8rFk/fWlScl38vanWACI08= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 h1:8ZmaLZE4XWrtU3MyClkYqqtl6Oegr3235h7jxsDyqCY= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= -google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= -google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= -google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/grpc v1.68.1 h1:oI5oTa11+ng8r8XMMN7jAOmWfPZWbYpCFaMUTACxkM0= +google.golang.org/grpc v1.68.1/go.mod h1:+q1XYFJjShcqn0QZHvCyeR4CXPA+llXIeUIfIe00waw= +google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= +google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= @@ -444,20 +444,20 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/api v0.18.0/go.mod h1:q2HRQkfDzHMBZL9l/y9rH63PkQl4vae0xRT+8prbrK8= -k8s.io/api v0.32.2 h1:bZrMLEkgizC24G9eViHGOPbW+aRo9duEISRIJKfdJuw= -k8s.io/api v0.32.2/go.mod h1:hKlhk4x1sJyYnHENsrdCWw31FEmCijNGPJO5WzHiJ6Y= -k8s.io/apiextensions-apiserver v0.32.2 h1:2YMk285jWMk2188V2AERy5yDwBYrjgWYggscghPCvV4= -k8s.io/apiextensions-apiserver v0.32.2/go.mod h1:GPwf8sph7YlJT3H6aKUWtd0E+oyShk/YHWQHf/OOgCA= +k8s.io/api v0.33.1 h1:tA6Cf3bHnLIrUK4IqEgb2v++/GYUtqiu9sRVk3iBXyw= +k8s.io/api v0.33.1/go.mod h1:87esjTn9DRSRTD4fWMXamiXxJhpOIREjWOSjsW1kEHw= +k8s.io/apiextensions-apiserver v0.33.1 h1:N7ccbSlRN6I2QBcXevB73PixX2dQNIW0ZRuguEE91zI= +k8s.io/apiextensions-apiserver v0.33.1/go.mod h1:uNQ52z1A1Gu75QSa+pFK5bcXc4hq7lpOXbweZgi4dqA= k8s.io/apimachinery v0.18.0/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= -k8s.io/apimachinery v0.32.2 h1:yoQBR9ZGkA6Rgmhbp/yuT9/g+4lxtsGYwW6dR6BDPLQ= -k8s.io/apimachinery v0.32.2/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/apiserver v0.32.2 h1:WzyxAu4mvLkQxwD9hGa4ZfExo3yZZaYzoYvvVDlM6vw= -k8s.io/apiserver v0.32.2/go.mod h1:PEwREHiHNU2oFdte7BjzA1ZyjWjuckORLIK/wLV5goM= +k8s.io/apimachinery v0.33.1 h1:mzqXWV8tW9Rw4VeW9rEkqvnxj59k1ezDUl20tFK/oM4= +k8s.io/apimachinery v0.33.1/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= +k8s.io/apiserver v0.33.1 h1:yLgLUPDVC6tHbNcw5uE9mo1T6ELhJj7B0geifra3Qdo= +k8s.io/apiserver v0.33.1/go.mod h1:VMbE4ArWYLO01omz+k8hFjAdYfc3GVAYPrhP2tTKccs= k8s.io/client-go v0.18.0/go.mod h1:uQSYDYs4WhVZ9i6AIoEZuwUggLVEF64HOD37boKAtF8= -k8s.io/client-go v0.32.2 h1:4dYCD4Nz+9RApM2b/3BtVvBHw54QjMFUl1OLcJG5yOA= -k8s.io/client-go v0.32.2/go.mod h1:fpZ4oJXclZ3r2nDOv+Ux3XcJutfrwjKTCHz2H3sww94= -k8s.io/component-base v0.32.2 h1:1aUL5Vdmu7qNo4ZsE+569PV5zFatM9hl+lb3dEea2zU= -k8s.io/component-base v0.32.2/go.mod h1:PXJ61Vx9Lg+P5mS8TLd7bCIr+eMJRQTyXe8KvkrvJq0= +k8s.io/client-go v0.33.1 h1:ZZV/Ks2g92cyxWkRRnfUDsnhNn28eFpt26aGc8KbXF4= +k8s.io/client-go v0.33.1/go.mod h1:JAsUrl1ArO7uRVFWfcj6kOomSlCv+JpvIsp6usAGefA= +k8s.io/component-base v0.33.1 h1:EoJ0xA+wr77T+G8p6T3l4efT2oNwbqBVKR71E0tBIaI= +k8s.io/component-base v0.33.1/go.mod h1:guT/w/6piyPfTgq7gfvgetyXMIh10zuXA6cRRm3rDuY= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -465,15 +465,15 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/kms v0.32.2 h1:7Ff23ht7W40gTcDwUC8G5WjX5W/nxD8WxbNhIYYNZCI= -k8s.io/kms v0.32.2/go.mod h1:Bk2evz/Yvk0oVrvm4MvZbgq8BD34Ksxs2SRHn4/UiOM= -k8s.io/kube-aggregator v0.32.1 h1:cztPyIHbo6tgrhYHDqmdmvxUufJKuxgAC/vog7yeWek= -k8s.io/kube-aggregator v0.32.1/go.mod h1:sXjL5T8FO/rlBzTbBhahw9V5Nnr1UtzZHKTj9WxQCOU= +k8s.io/kms v0.33.1 h1:jJKrFhsbVofpyLF+G8k+drwOAF9CMQpxilHa5Uilb8Q= +k8s.io/kms v0.33.1/go.mod h1:C1I8mjFFBNzfUZXYt9FZVJ8MJl7ynFbGgZFbBzkBJ3E= +k8s.io/kube-aggregator v0.33.1 h1:PigQUqAvd6Y4hBjQAqhKz3lEJC2VHLL4bSOEuS06a40= +k8s.io/kube-aggregator v0.33.1/go.mod h1:16/wlU5Lj7hNJSv7JSu5FLvxyrgiJVLCHzfVoECAsuI= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= -k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= -k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4= -k8s.io/kubernetes v1.32.1 h1:46YPpIBCT9dkmeglstZ2Gg4LGaAdro1/3IQ+1AfbF1s= -k8s.io/kubernetes v1.32.1/go.mod h1:tiIKO63GcdPRBHW2WiUFm3C0eoLczl3f7qi56Dm1W8I= +k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4= +k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= +k8s.io/kubernetes v1.33.1 h1:86+VVY/f11taZdpEZrNciLw1MIQhu6BFXf/OMFn5EUg= +k8s.io/kubernetes v1.33.1/go.mod h1:2nWuPk0seE4+6sd0x60wQ6rYEXcV7SoeMbU0YbFm/5k= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro= k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= @@ -501,18 +501,21 @@ modernc.org/strutil v1.2.1 h1:UneZBkQA+DX2Rp35KcM69cSsNES9ly8mQWD71HKlOA0= modernc.org/strutil v1.2.1/go.mod h1:EHkiggD70koQxjVdSBM3JKM7k6L0FbGE5eymy9i3B9A= modernc.org/token v1.1.0 h1:Xl7Ap9dKaEs5kLoOQeQmPWevfnk/DM5qcLcYlA8ys6Y= modernc.org/token v1.1.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= sigs.k8s.io/cli-utils v0.37.2 h1:GOfKw5RV2HDQZDJlru5KkfLO1tbxqMoyn1IYUxqBpNg= sigs.k8s.io/cli-utils v0.37.2/go.mod h1:V+IZZr4UoGj7gMJXklWBg6t5xbdThFBcpj4MrZuCYco= -sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= -sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= +sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8= +sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo= +sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= +sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= +sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= -sigs.k8s.io/structured-merge-diff/v4 v4.4.3 h1:sCP7Vv3xx/CWIuTPVN38lUPx0uw0lcLfzaiDa8Ja01A= -sigs.k8s.io/structured-merge-diff/v4 v4.4.3/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= +sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc= +sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= diff --git a/pkg/accesscontrol/fake/AccessSetLookup.go b/pkg/accesscontrol/fake/AccessSetLookup.go index 2b7cd10f..3a15e532 100644 --- a/pkg/accesscontrol/fake/AccessSetLookup.go +++ b/pkg/accesscontrol/fake/AccessSetLookup.go @@ -21,6 +21,7 @@ import ( type MockAccessSetLookup struct { ctrl *gomock.Controller recorder *MockAccessSetLookupMockRecorder + isgomock struct{} } // MockAccessSetLookupMockRecorder is the mock recorder for MockAccessSetLookup. @@ -55,13 +56,13 @@ func (mr *MockAccessSetLookupMockRecorder) AccessFor(arg0 any) *gomock.Call { } // PurgeUserData mocks base method. -func (m *MockAccessSetLookup) PurgeUserData(arg0 string) { +func (m *MockAccessSetLookup) PurgeUserData(id string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "PurgeUserData", arg0) + m.ctrl.Call(m, "PurgeUserData", id) } // PurgeUserData indicates an expected call of PurgeUserData. -func (mr *MockAccessSetLookupMockRecorder) PurgeUserData(arg0 any) *gomock.Call { +func (mr *MockAccessSetLookupMockRecorder) PurgeUserData(id any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PurgeUserData", reflect.TypeOf((*MockAccessSetLookup)(nil).PurgeUserData), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PurgeUserData", reflect.TypeOf((*MockAccessSetLookup)(nil).PurgeUserData), id) } diff --git a/pkg/ext/apiserver.go b/pkg/ext/apiserver.go index 30114ddd..12d7f1a5 100644 --- a/pkg/ext/apiserver.go +++ b/pkg/ext/apiserver.go @@ -23,7 +23,8 @@ import ( genericapiserver "k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server/dynamiccertificates" genericoptions "k8s.io/apiserver/pkg/server/options" - "k8s.io/component-base/version" + "k8s.io/apiserver/pkg/util/compatibility" + basecompatibility "k8s.io/component-base/compatibility" openapicommon "k8s.io/kube-openapi/pkg/common" "k8s.io/kube-openapi/pkg/validation/spec" ) @@ -74,7 +75,7 @@ type ExtensionAPIServerOptions struct { // // If nil, the default version is the version of the Kubernetes Go library // compiled in the final binary. - EffectiveVersion version.EffectiveVersion + EffectiveVersion basecompatibility.EffectiveVersion SNICerts []dynamiccertificates.SNICertKeyContentProvider } @@ -166,7 +167,7 @@ func NewExtensionAPIServer(scheme *runtime.Scheme, codecs serializer.CodecFactor // The default kube effective version ends up being the version of the // library. (The value is hardcoded but it is kept up-to-date via some // automation) - config.EffectiveVersion = version.DefaultKubeEffectiveVersion() + config.EffectiveVersion = compatibility.DefaultBuildEffectiveVersion() if opts.EffectiveVersion != nil { config.EffectiveVersion = opts.EffectiveVersion } diff --git a/pkg/schema/fake/factory.go b/pkg/schema/fake/factory.go index 5344e858..c11caa01 100644 --- a/pkg/schema/fake/factory.go +++ b/pkg/schema/fake/factory.go @@ -24,6 +24,7 @@ import ( type MockFactory struct { ctrl *gomock.Controller recorder *MockFactoryMockRecorder + isgomock struct{} } // MockFactoryMockRecorder is the mock recorder for MockFactory. @@ -44,59 +45,59 @@ func (m *MockFactory) EXPECT() *MockFactoryMockRecorder { } // AddTemplate mocks base method. -func (m *MockFactory) AddTemplate(arg0 ...schema.Template) { +func (m *MockFactory) AddTemplate(template ...schema.Template) { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range template { varargs = append(varargs, a) } m.ctrl.Call(m, "AddTemplate", varargs...) } // AddTemplate indicates an expected call of AddTemplate. -func (mr *MockFactoryMockRecorder) AddTemplate(arg0 ...any) *gomock.Call { +func (mr *MockFactoryMockRecorder) AddTemplate(template ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddTemplate", reflect.TypeOf((*MockFactory)(nil).AddTemplate), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddTemplate", reflect.TypeOf((*MockFactory)(nil).AddTemplate), template...) } // ByGVK mocks base method. -func (m *MockFactory) ByGVK(arg0 schema0.GroupVersionKind) string { +func (m *MockFactory) ByGVK(gvr schema0.GroupVersionKind) string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ByGVK", arg0) + ret := m.ctrl.Call(m, "ByGVK", gvr) ret0, _ := ret[0].(string) return ret0 } // ByGVK indicates an expected call of ByGVK. -func (mr *MockFactoryMockRecorder) ByGVK(arg0 any) *gomock.Call { +func (mr *MockFactoryMockRecorder) ByGVK(gvr any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ByGVK", reflect.TypeOf((*MockFactory)(nil).ByGVK), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ByGVK", reflect.TypeOf((*MockFactory)(nil).ByGVK), gvr) } // ByGVR mocks base method. -func (m *MockFactory) ByGVR(arg0 schema0.GroupVersionResource) string { +func (m *MockFactory) ByGVR(gvr schema0.GroupVersionResource) string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ByGVR", arg0) + ret := m.ctrl.Call(m, "ByGVR", gvr) ret0, _ := ret[0].(string) return ret0 } // ByGVR indicates an expected call of ByGVR. -func (mr *MockFactoryMockRecorder) ByGVR(arg0 any) *gomock.Call { +func (mr *MockFactoryMockRecorder) ByGVR(gvr any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ByGVR", reflect.TypeOf((*MockFactory)(nil).ByGVR), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ByGVR", reflect.TypeOf((*MockFactory)(nil).ByGVR), gvr) } // OnChange mocks base method. -func (m *MockFactory) OnChange(arg0 context.Context, arg1 func()) { +func (m *MockFactory) OnChange(ctx context.Context, cb func()) { m.ctrl.T.Helper() - m.ctrl.Call(m, "OnChange", arg0, arg1) + m.ctrl.Call(m, "OnChange", ctx, cb) } // OnChange indicates an expected call of OnChange. -func (mr *MockFactoryMockRecorder) OnChange(arg0, arg1 any) *gomock.Call { +func (mr *MockFactoryMockRecorder) OnChange(ctx, cb any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChange", reflect.TypeOf((*MockFactory)(nil).OnChange), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnChange", reflect.TypeOf((*MockFactory)(nil).OnChange), ctx, cb) } // Schemas mocks base method. diff --git a/pkg/sqlcache/db/db_mocks_test.go b/pkg/sqlcache/db/db_mocks_test.go index a7559615..3913ee4d 100644 --- a/pkg/sqlcache/db/db_mocks_test.go +++ b/pkg/sqlcache/db/db_mocks_test.go @@ -21,6 +21,7 @@ import ( type MockRows struct { ctrl *gomock.Controller recorder *MockRowsMockRecorder + isgomock struct{} } // MockRowsMockRecorder is the mock recorder for MockRows. @@ -83,10 +84,10 @@ func (mr *MockRowsMockRecorder) Next() *gomock.Call { } // Scan mocks base method. -func (m *MockRows) Scan(arg0 ...any) error { +func (m *MockRows) Scan(dest ...any) error { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range dest { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Scan", varargs...) @@ -95,15 +96,16 @@ func (m *MockRows) Scan(arg0 ...any) error { } // Scan indicates an expected call of Scan. -func (mr *MockRowsMockRecorder) Scan(arg0 ...any) *gomock.Call { +func (mr *MockRowsMockRecorder) Scan(dest ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Scan", reflect.TypeOf((*MockRows)(nil).Scan), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Scan", reflect.TypeOf((*MockRows)(nil).Scan), dest...) } // MockConnection is a mock of Connection interface. type MockConnection struct { ctrl *gomock.Controller recorder *MockConnectionMockRecorder + isgomock struct{} } // MockConnectionMockRecorder is the mock recorder for MockConnection. @@ -124,18 +126,18 @@ func (m *MockConnection) EXPECT() *MockConnectionMockRecorder { } // BeginTx mocks base method. -func (m *MockConnection) BeginTx(arg0 context.Context, arg1 *sql.TxOptions) (*sql.Tx, error) { +func (m *MockConnection) BeginTx(ctx context.Context, opts *sql.TxOptions) (*sql.Tx, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BeginTx", arg0, arg1) + ret := m.ctrl.Call(m, "BeginTx", ctx, opts) ret0, _ := ret[0].(*sql.Tx) ret1, _ := ret[1].(error) return ret0, ret1 } // BeginTx indicates an expected call of BeginTx. -func (mr *MockConnectionMockRecorder) BeginTx(arg0, arg1 any) *gomock.Call { +func (mr *MockConnectionMockRecorder) BeginTx(ctx, opts any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeginTx", reflect.TypeOf((*MockConnection)(nil).BeginTx), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeginTx", reflect.TypeOf((*MockConnection)(nil).BeginTx), ctx, opts) } // Close mocks base method. @@ -153,10 +155,10 @@ func (mr *MockConnectionMockRecorder) Close() *gomock.Call { } // Exec mocks base method. -func (m *MockConnection) Exec(arg0 string, arg1 ...any) (sql.Result, error) { +func (m *MockConnection) Exec(query string, args ...any) (sql.Result, error) { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{query} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Exec", varargs...) @@ -166,31 +168,32 @@ func (m *MockConnection) Exec(arg0 string, arg1 ...any) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockConnectionMockRecorder) Exec(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockConnectionMockRecorder) Exec(query any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{query}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockConnection)(nil).Exec), varargs...) } // Prepare mocks base method. -func (m *MockConnection) Prepare(arg0 string) (*sql.Stmt, error) { +func (m *MockConnection) Prepare(query string) (*sql.Stmt, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Prepare", arg0) + ret := m.ctrl.Call(m, "Prepare", query) ret0, _ := ret[0].(*sql.Stmt) ret1, _ := ret[1].(error) return ret0, ret1 } // Prepare indicates an expected call of Prepare. -func (mr *MockConnectionMockRecorder) Prepare(arg0 any) *gomock.Call { +func (mr *MockConnectionMockRecorder) Prepare(query any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Prepare", reflect.TypeOf((*MockConnection)(nil).Prepare), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Prepare", reflect.TypeOf((*MockConnection)(nil).Prepare), query) } // MockEncryptor is a mock of Encryptor interface. type MockEncryptor struct { ctrl *gomock.Controller recorder *MockEncryptorMockRecorder + isgomock struct{} } // MockEncryptorMockRecorder is the mock recorder for MockEncryptor. @@ -231,6 +234,7 @@ func (mr *MockEncryptorMockRecorder) Encrypt(arg0 any) *gomock.Call { type MockDecryptor struct { ctrl *gomock.Controller recorder *MockDecryptorMockRecorder + isgomock struct{} } // MockDecryptorMockRecorder is the mock recorder for MockDecryptor. diff --git a/pkg/sqlcache/db/transaction_mocks_test.go b/pkg/sqlcache/db/transaction_mocks_test.go index c431ca47..952b8370 100644 --- a/pkg/sqlcache/db/transaction_mocks_test.go +++ b/pkg/sqlcache/db/transaction_mocks_test.go @@ -22,6 +22,7 @@ import ( type MockClient struct { ctrl *gomock.Controller recorder *MockClientMockRecorder + isgomock struct{} } // MockClientMockRecorder is the mock recorder for MockClient. @@ -42,10 +43,10 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder { } // Exec mocks base method. -func (m *MockClient) Exec(arg0 string, arg1 ...any) (sql.Result, error) { +func (m *MockClient) Exec(query string, args ...any) (sql.Result, error) { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{query} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Exec", varargs...) @@ -55,30 +56,31 @@ func (m *MockClient) Exec(arg0 string, arg1 ...any) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockClientMockRecorder) Exec(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockClientMockRecorder) Exec(query any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{query}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockClient)(nil).Exec), varargs...) } // Stmt mocks base method. -func (m *MockClient) Stmt(arg0 *sql.Stmt) transaction.Stmt { +func (m *MockClient) Stmt(stmt *sql.Stmt) transaction.Stmt { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Stmt", arg0) + ret := m.ctrl.Call(m, "Stmt", stmt) ret0, _ := ret[0].(transaction.Stmt) return ret0 } // Stmt indicates an expected call of Stmt. -func (mr *MockClientMockRecorder) Stmt(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) Stmt(stmt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stmt", reflect.TypeOf((*MockClient)(nil).Stmt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stmt", reflect.TypeOf((*MockClient)(nil).Stmt), stmt) } // MockStmt is a mock of Stmt interface. type MockStmt struct { ctrl *gomock.Controller recorder *MockStmtMockRecorder + isgomock struct{} } // MockStmtMockRecorder is the mock recorder for MockStmt. @@ -99,10 +101,10 @@ func (m *MockStmt) EXPECT() *MockStmtMockRecorder { } // Exec mocks base method. -func (m *MockStmt) Exec(arg0 ...any) (sql.Result, error) { +func (m *MockStmt) Exec(args ...any) (sql.Result, error) { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Exec", varargs...) @@ -112,16 +114,16 @@ func (m *MockStmt) Exec(arg0 ...any) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockStmtMockRecorder) Exec(arg0 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) Exec(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockStmt)(nil).Exec), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockStmt)(nil).Exec), args...) } // Query mocks base method. -func (m *MockStmt) Query(arg0 ...any) (*sql.Rows, error) { +func (m *MockStmt) Query(args ...any) (*sql.Rows, error) { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Query", varargs...) @@ -131,16 +133,16 @@ func (m *MockStmt) Query(arg0 ...any) (*sql.Rows, error) { } // Query indicates an expected call of Query. -func (mr *MockStmtMockRecorder) Query(arg0 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) Query(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockStmt)(nil).Query), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockStmt)(nil).Query), args...) } // QueryContext mocks base method. -func (m *MockStmt) QueryContext(arg0 context.Context, arg1 ...any) (*sql.Rows, error) { +func (m *MockStmt) QueryContext(ctx context.Context, args ...any) (*sql.Rows, error) { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{ctx} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryContext", varargs...) @@ -150,17 +152,17 @@ func (m *MockStmt) QueryContext(arg0 context.Context, arg1 ...any) (*sql.Rows, e } // QueryContext indicates an expected call of QueryContext. -func (mr *MockStmtMockRecorder) QueryContext(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) QueryContext(ctx any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{ctx}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryContext", reflect.TypeOf((*MockStmt)(nil).QueryContext), varargs...) } // QueryRowContext mocks base method. -func (m *MockStmt) QueryRowContext(arg0 context.Context, arg1 ...any) *sql.Row { +func (m *MockStmt) QueryRowContext(ctx context.Context, args ...any) *sql.Row { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{ctx} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryRowContext", varargs...) @@ -169,8 +171,8 @@ func (m *MockStmt) QueryRowContext(arg0 context.Context, arg1 ...any) *sql.Row { } // QueryRowContext indicates an expected call of QueryRowContext. -func (mr *MockStmtMockRecorder) QueryRowContext(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) QueryRowContext(ctx any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{ctx}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryRowContext", reflect.TypeOf((*MockStmt)(nil).QueryRowContext), varargs...) } diff --git a/pkg/sqlcache/informer/db_mocks_test.go b/pkg/sqlcache/informer/db_mocks_test.go index cf089c82..172f5ee5 100644 --- a/pkg/sqlcache/informer/db_mocks_test.go +++ b/pkg/sqlcache/informer/db_mocks_test.go @@ -23,6 +23,7 @@ import ( type MockRows struct { ctrl *gomock.Controller recorder *MockRowsMockRecorder + isgomock struct{} } // MockRowsMockRecorder is the mock recorder for MockRows. @@ -85,10 +86,10 @@ func (mr *MockRowsMockRecorder) Next() *gomock.Call { } // Scan mocks base method. -func (m *MockRows) Scan(arg0 ...any) error { +func (m *MockRows) Scan(dest ...any) error { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range dest { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Scan", varargs...) @@ -97,15 +98,16 @@ func (m *MockRows) Scan(arg0 ...any) error { } // Scan indicates an expected call of Scan. -func (mr *MockRowsMockRecorder) Scan(arg0 ...any) *gomock.Call { +func (mr *MockRowsMockRecorder) Scan(dest ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Scan", reflect.TypeOf((*MockRows)(nil).Scan), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Scan", reflect.TypeOf((*MockRows)(nil).Scan), dest...) } // MockClient is a mock of Client interface. type MockClient struct { ctrl *gomock.Controller recorder *MockClientMockRecorder + isgomock struct{} } // MockClientMockRecorder is the mock recorder for MockClient. @@ -126,53 +128,53 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder { } // CloseStmt mocks base method. -func (m *MockClient) CloseStmt(arg0 db.Closable) error { +func (m *MockClient) CloseStmt(closable db.Closable) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CloseStmt", arg0) + ret := m.ctrl.Call(m, "CloseStmt", closable) ret0, _ := ret[0].(error) return ret0 } // CloseStmt indicates an expected call of CloseStmt. -func (mr *MockClientMockRecorder) CloseStmt(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) CloseStmt(closable any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseStmt", reflect.TypeOf((*MockClient)(nil).CloseStmt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseStmt", reflect.TypeOf((*MockClient)(nil).CloseStmt), closable) } // NewConnection mocks base method. -func (m *MockClient) NewConnection(arg0 bool) (string, error) { +func (m *MockClient) NewConnection(isTemp bool) (string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NewConnection", arg0) + ret := m.ctrl.Call(m, "NewConnection", isTemp) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) return ret0, ret1 } // NewConnection indicates an expected call of NewConnection. -func (mr *MockClientMockRecorder) NewConnection(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) NewConnection(isTemp any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewConnection", reflect.TypeOf((*MockClient)(nil).NewConnection), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewConnection", reflect.TypeOf((*MockClient)(nil).NewConnection), isTemp) } // Prepare mocks base method. -func (m *MockClient) Prepare(arg0 string) *sql.Stmt { +func (m *MockClient) Prepare(stmt string) *sql.Stmt { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Prepare", arg0) + ret := m.ctrl.Call(m, "Prepare", stmt) ret0, _ := ret[0].(*sql.Stmt) return ret0 } // Prepare indicates an expected call of Prepare. -func (mr *MockClientMockRecorder) Prepare(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) Prepare(stmt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Prepare", reflect.TypeOf((*MockClient)(nil).Prepare), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Prepare", reflect.TypeOf((*MockClient)(nil).Prepare), stmt) } // QueryForRows mocks base method. -func (m *MockClient) QueryForRows(arg0 context.Context, arg1 transaction.Stmt, arg2 ...any) (*sql.Rows, error) { +func (m *MockClient) QueryForRows(ctx context.Context, stmt transaction.Stmt, params ...any) (*sql.Rows, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, stmt} + for _, a := range params { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryForRows", varargs...) @@ -182,81 +184,81 @@ func (m *MockClient) QueryForRows(arg0 context.Context, arg1 transaction.Stmt, a } // QueryForRows indicates an expected call of QueryForRows. -func (mr *MockClientMockRecorder) QueryForRows(arg0, arg1 any, arg2 ...any) *gomock.Call { +func (mr *MockClientMockRecorder) QueryForRows(ctx, stmt any, params ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1}, arg2...) + varargs := append([]any{ctx, stmt}, params...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryForRows", reflect.TypeOf((*MockClient)(nil).QueryForRows), varargs...) } // ReadInt mocks base method. -func (m *MockClient) ReadInt(arg0 db.Rows) (int, error) { +func (m *MockClient) ReadInt(rows db.Rows) (int, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadInt", arg0) + ret := m.ctrl.Call(m, "ReadInt", rows) ret0, _ := ret[0].(int) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadInt indicates an expected call of ReadInt. -func (mr *MockClientMockRecorder) ReadInt(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) ReadInt(rows any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadInt", reflect.TypeOf((*MockClient)(nil).ReadInt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadInt", reflect.TypeOf((*MockClient)(nil).ReadInt), rows) } // ReadObjects mocks base method. -func (m *MockClient) ReadObjects(arg0 db.Rows, arg1 reflect.Type, arg2 bool) ([]any, error) { +func (m *MockClient) ReadObjects(rows db.Rows, typ reflect.Type, shouldDecrypt bool) ([]any, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadObjects", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "ReadObjects", rows, typ, shouldDecrypt) ret0, _ := ret[0].([]any) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadObjects indicates an expected call of ReadObjects. -func (mr *MockClientMockRecorder) ReadObjects(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockClientMockRecorder) ReadObjects(rows, typ, shouldDecrypt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadObjects", reflect.TypeOf((*MockClient)(nil).ReadObjects), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadObjects", reflect.TypeOf((*MockClient)(nil).ReadObjects), rows, typ, shouldDecrypt) } // ReadStrings mocks base method. -func (m *MockClient) ReadStrings(arg0 db.Rows) ([]string, error) { +func (m *MockClient) ReadStrings(rows db.Rows) ([]string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadStrings", arg0) + ret := m.ctrl.Call(m, "ReadStrings", rows) ret0, _ := ret[0].([]string) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadStrings indicates an expected call of ReadStrings. -func (mr *MockClientMockRecorder) ReadStrings(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) ReadStrings(rows any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadStrings", reflect.TypeOf((*MockClient)(nil).ReadStrings), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadStrings", reflect.TypeOf((*MockClient)(nil).ReadStrings), rows) } // Upsert mocks base method. -func (m *MockClient) Upsert(arg0 transaction.Client, arg1 *sql.Stmt, arg2 string, arg3 any, arg4 bool) error { +func (m *MockClient) Upsert(tx transaction.Client, stmt *sql.Stmt, key string, obj any, shouldEncrypt bool) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Upsert", arg0, arg1, arg2, arg3, arg4) + ret := m.ctrl.Call(m, "Upsert", tx, stmt, key, obj, shouldEncrypt) ret0, _ := ret[0].(error) return ret0 } // Upsert indicates an expected call of Upsert. -func (mr *MockClientMockRecorder) Upsert(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call { +func (mr *MockClientMockRecorder) Upsert(tx, stmt, key, obj, shouldEncrypt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Upsert", reflect.TypeOf((*MockClient)(nil).Upsert), arg0, arg1, arg2, arg3, arg4) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Upsert", reflect.TypeOf((*MockClient)(nil).Upsert), tx, stmt, key, obj, shouldEncrypt) } // WithTransaction mocks base method. -func (m *MockClient) WithTransaction(arg0 context.Context, arg1 bool, arg2 db.WithTransactionFunction) error { +func (m *MockClient) WithTransaction(ctx context.Context, forWriting bool, f db.WithTransactionFunction) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "WithTransaction", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "WithTransaction", ctx, forWriting, f) ret0, _ := ret[0].(error) return ret0 } // WithTransaction indicates an expected call of WithTransaction. -func (mr *MockClientMockRecorder) WithTransaction(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockClientMockRecorder) WithTransaction(ctx, forWriting, f any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithTransaction", reflect.TypeOf((*MockClient)(nil).WithTransaction), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithTransaction", reflect.TypeOf((*MockClient)(nil).WithTransaction), ctx, forWriting, f) } diff --git a/pkg/sqlcache/informer/dynamic_mocks_test.go b/pkg/sqlcache/informer/dynamic_mocks_test.go index 07e169c1..19ba10e5 100644 --- a/pkg/sqlcache/informer/dynamic_mocks_test.go +++ b/pkg/sqlcache/informer/dynamic_mocks_test.go @@ -24,6 +24,7 @@ import ( type MockResourceInterface struct { ctrl *gomock.Controller recorder *MockResourceInterfaceMockRecorder + isgomock struct{} } // MockResourceInterfaceMockRecorder is the mock recorder for MockResourceInterface. @@ -44,10 +45,10 @@ func (m *MockResourceInterface) EXPECT() *MockResourceInterfaceMockRecorder { } // Apply mocks base method. -func (m *MockResourceInterface) Apply(arg0 context.Context, arg1 string, arg2 *unstructured.Unstructured, arg3 v1.ApplyOptions, arg4 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Apply(ctx context.Context, name string, obj *unstructured.Unstructured, options v1.ApplyOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3} - for _, a := range arg4 { + varargs := []any{ctx, name, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Apply", varargs...) @@ -57,32 +58,32 @@ func (m *MockResourceInterface) Apply(arg0 context.Context, arg1 string, arg2 *u } // Apply indicates an expected call of Apply. -func (mr *MockResourceInterfaceMockRecorder) Apply(arg0, arg1, arg2, arg3 any, arg4 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Apply(ctx, name, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]any{ctx, name, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Apply", reflect.TypeOf((*MockResourceInterface)(nil).Apply), varargs...) } // ApplyStatus mocks base method. -func (m *MockResourceInterface) ApplyStatus(arg0 context.Context, arg1 string, arg2 *unstructured.Unstructured, arg3 v1.ApplyOptions) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) ApplyStatus(ctx context.Context, name string, obj *unstructured.Unstructured, options v1.ApplyOptions) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ApplyStatus", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "ApplyStatus", ctx, name, obj, options) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].(error) return ret0, ret1 } // ApplyStatus indicates an expected call of ApplyStatus. -func (mr *MockResourceInterfaceMockRecorder) ApplyStatus(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) ApplyStatus(ctx, name, obj, options any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplyStatus", reflect.TypeOf((*MockResourceInterface)(nil).ApplyStatus), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplyStatus", reflect.TypeOf((*MockResourceInterface)(nil).ApplyStatus), ctx, name, obj, options) } // Create mocks base method. -func (m *MockResourceInterface) Create(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.CreateOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Create(ctx context.Context, obj *unstructured.Unstructured, options v1.CreateOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Create", varargs...) @@ -92,17 +93,17 @@ func (m *MockResourceInterface) Create(arg0 context.Context, arg1 *unstructured. } // Create indicates an expected call of Create. -func (mr *MockResourceInterfaceMockRecorder) Create(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Create(ctx, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockResourceInterface)(nil).Create), varargs...) } // Delete mocks base method. -func (m *MockResourceInterface) Delete(arg0 context.Context, arg1 string, arg2 v1.DeleteOptions, arg3 ...string) error { +func (m *MockResourceInterface) Delete(ctx context.Context, name string, options v1.DeleteOptions, subresources ...string) error { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, name, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Delete", varargs...) @@ -111,31 +112,31 @@ func (m *MockResourceInterface) Delete(arg0 context.Context, arg1 string, arg2 v } // Delete indicates an expected call of Delete. -func (mr *MockResourceInterfaceMockRecorder) Delete(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Delete(ctx, name, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, name, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockResourceInterface)(nil).Delete), varargs...) } // DeleteCollection mocks base method. -func (m *MockResourceInterface) DeleteCollection(arg0 context.Context, arg1 v1.DeleteOptions, arg2 v1.ListOptions) error { +func (m *MockResourceInterface) DeleteCollection(ctx context.Context, options v1.DeleteOptions, listOptions v1.ListOptions) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteCollection", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "DeleteCollection", ctx, options, listOptions) ret0, _ := ret[0].(error) return ret0 } // DeleteCollection indicates an expected call of DeleteCollection. -func (mr *MockResourceInterfaceMockRecorder) DeleteCollection(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) DeleteCollection(ctx, options, listOptions any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCollection", reflect.TypeOf((*MockResourceInterface)(nil).DeleteCollection), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCollection", reflect.TypeOf((*MockResourceInterface)(nil).DeleteCollection), ctx, options, listOptions) } // Get mocks base method. -func (m *MockResourceInterface) Get(arg0 context.Context, arg1 string, arg2 v1.GetOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Get(ctx context.Context, name string, options v1.GetOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, name, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Get", varargs...) @@ -145,32 +146,32 @@ func (m *MockResourceInterface) Get(arg0 context.Context, arg1 string, arg2 v1.G } // Get indicates an expected call of Get. -func (mr *MockResourceInterfaceMockRecorder) Get(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Get(ctx, name, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, name, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockResourceInterface)(nil).Get), varargs...) } // List mocks base method. -func (m *MockResourceInterface) List(arg0 context.Context, arg1 v1.ListOptions) (*unstructured.UnstructuredList, error) { +func (m *MockResourceInterface) List(ctx context.Context, opts v1.ListOptions) (*unstructured.UnstructuredList, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "List", arg0, arg1) + ret := m.ctrl.Call(m, "List", ctx, opts) ret0, _ := ret[0].(*unstructured.UnstructuredList) ret1, _ := ret[1].(error) return ret0, ret1 } // List indicates an expected call of List. -func (mr *MockResourceInterfaceMockRecorder) List(arg0, arg1 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) List(ctx, opts any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockResourceInterface)(nil).List), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockResourceInterface)(nil).List), ctx, opts) } // Patch mocks base method. -func (m *MockResourceInterface) Patch(arg0 context.Context, arg1 string, arg2 types.PatchType, arg3 []byte, arg4 v1.PatchOptions, arg5 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, options v1.PatchOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3, arg4} - for _, a := range arg5 { + varargs := []any{ctx, name, pt, data, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Patch", varargs...) @@ -180,17 +181,17 @@ func (m *MockResourceInterface) Patch(arg0 context.Context, arg1 string, arg2 ty } // Patch indicates an expected call of Patch. -func (mr *MockResourceInterfaceMockRecorder) Patch(arg0, arg1, arg2, arg3, arg4 any, arg5 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Patch(ctx, name, pt, data, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3, arg4}, arg5...) + varargs := append([]any{ctx, name, pt, data, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Patch", reflect.TypeOf((*MockResourceInterface)(nil).Patch), varargs...) } // Update mocks base method. -func (m *MockResourceInterface) Update(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.UpdateOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Update(ctx context.Context, obj *unstructured.Unstructured, options v1.UpdateOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Update", varargs...) @@ -200,38 +201,38 @@ func (m *MockResourceInterface) Update(arg0 context.Context, arg1 *unstructured. } // Update indicates an expected call of Update. -func (mr *MockResourceInterfaceMockRecorder) Update(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Update(ctx, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockResourceInterface)(nil).Update), varargs...) } // UpdateStatus mocks base method. -func (m *MockResourceInterface) UpdateStatus(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.UpdateOptions) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) UpdateStatus(ctx context.Context, obj *unstructured.Unstructured, options v1.UpdateOptions) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdateStatus", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "UpdateStatus", ctx, obj, options) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].(error) return ret0, ret1 } // UpdateStatus indicates an expected call of UpdateStatus. -func (mr *MockResourceInterfaceMockRecorder) UpdateStatus(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) UpdateStatus(ctx, obj, options any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateStatus", reflect.TypeOf((*MockResourceInterface)(nil).UpdateStatus), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateStatus", reflect.TypeOf((*MockResourceInterface)(nil).UpdateStatus), ctx, obj, options) } // Watch mocks base method. -func (m *MockResourceInterface) Watch(arg0 context.Context, arg1 v1.ListOptions) (watch.Interface, error) { +func (m *MockResourceInterface) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Watch", arg0, arg1) + ret := m.ctrl.Call(m, "Watch", ctx, opts) ret0, _ := ret[0].(watch.Interface) ret1, _ := ret[1].(error) return ret0, ret1 } // Watch indicates an expected call of Watch. -func (mr *MockResourceInterfaceMockRecorder) Watch(arg0, arg1 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Watch(ctx, opts any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockResourceInterface)(nil).Watch), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockResourceInterface)(nil).Watch), ctx, opts) } diff --git a/pkg/sqlcache/informer/factory/db_mocks_test.go b/pkg/sqlcache/informer/factory/db_mocks_test.go index e6905f15..396396c1 100644 --- a/pkg/sqlcache/informer/factory/db_mocks_test.go +++ b/pkg/sqlcache/informer/factory/db_mocks_test.go @@ -23,6 +23,7 @@ import ( type MockClient struct { ctrl *gomock.Controller recorder *MockClientMockRecorder + isgomock struct{} } // MockClientMockRecorder is the mock recorder for MockClient. @@ -43,53 +44,53 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder { } // CloseStmt mocks base method. -func (m *MockClient) CloseStmt(arg0 db.Closable) error { +func (m *MockClient) CloseStmt(closable db.Closable) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CloseStmt", arg0) + ret := m.ctrl.Call(m, "CloseStmt", closable) ret0, _ := ret[0].(error) return ret0 } // CloseStmt indicates an expected call of CloseStmt. -func (mr *MockClientMockRecorder) CloseStmt(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) CloseStmt(closable any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseStmt", reflect.TypeOf((*MockClient)(nil).CloseStmt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseStmt", reflect.TypeOf((*MockClient)(nil).CloseStmt), closable) } // NewConnection mocks base method. -func (m *MockClient) NewConnection(arg0 bool) (string, error) { +func (m *MockClient) NewConnection(isTemp bool) (string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NewConnection", arg0) + ret := m.ctrl.Call(m, "NewConnection", isTemp) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) return ret0, ret1 } // NewConnection indicates an expected call of NewConnection. -func (mr *MockClientMockRecorder) NewConnection(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) NewConnection(isTemp any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewConnection", reflect.TypeOf((*MockClient)(nil).NewConnection), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewConnection", reflect.TypeOf((*MockClient)(nil).NewConnection), isTemp) } // Prepare mocks base method. -func (m *MockClient) Prepare(arg0 string) *sql.Stmt { +func (m *MockClient) Prepare(stmt string) *sql.Stmt { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Prepare", arg0) + ret := m.ctrl.Call(m, "Prepare", stmt) ret0, _ := ret[0].(*sql.Stmt) return ret0 } // Prepare indicates an expected call of Prepare. -func (mr *MockClientMockRecorder) Prepare(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) Prepare(stmt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Prepare", reflect.TypeOf((*MockClient)(nil).Prepare), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Prepare", reflect.TypeOf((*MockClient)(nil).Prepare), stmt) } // QueryForRows mocks base method. -func (m *MockClient) QueryForRows(arg0 context.Context, arg1 transaction.Stmt, arg2 ...any) (*sql.Rows, error) { +func (m *MockClient) QueryForRows(ctx context.Context, stmt transaction.Stmt, params ...any) (*sql.Rows, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, stmt} + for _, a := range params { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryForRows", varargs...) @@ -99,81 +100,81 @@ func (m *MockClient) QueryForRows(arg0 context.Context, arg1 transaction.Stmt, a } // QueryForRows indicates an expected call of QueryForRows. -func (mr *MockClientMockRecorder) QueryForRows(arg0, arg1 any, arg2 ...any) *gomock.Call { +func (mr *MockClientMockRecorder) QueryForRows(ctx, stmt any, params ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1}, arg2...) + varargs := append([]any{ctx, stmt}, params...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryForRows", reflect.TypeOf((*MockClient)(nil).QueryForRows), varargs...) } // ReadInt mocks base method. -func (m *MockClient) ReadInt(arg0 db.Rows) (int, error) { +func (m *MockClient) ReadInt(rows db.Rows) (int, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadInt", arg0) + ret := m.ctrl.Call(m, "ReadInt", rows) ret0, _ := ret[0].(int) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadInt indicates an expected call of ReadInt. -func (mr *MockClientMockRecorder) ReadInt(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) ReadInt(rows any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadInt", reflect.TypeOf((*MockClient)(nil).ReadInt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadInt", reflect.TypeOf((*MockClient)(nil).ReadInt), rows) } // ReadObjects mocks base method. -func (m *MockClient) ReadObjects(arg0 db.Rows, arg1 reflect.Type, arg2 bool) ([]any, error) { +func (m *MockClient) ReadObjects(rows db.Rows, typ reflect.Type, shouldDecrypt bool) ([]any, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadObjects", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "ReadObjects", rows, typ, shouldDecrypt) ret0, _ := ret[0].([]any) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadObjects indicates an expected call of ReadObjects. -func (mr *MockClientMockRecorder) ReadObjects(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockClientMockRecorder) ReadObjects(rows, typ, shouldDecrypt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadObjects", reflect.TypeOf((*MockClient)(nil).ReadObjects), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadObjects", reflect.TypeOf((*MockClient)(nil).ReadObjects), rows, typ, shouldDecrypt) } // ReadStrings mocks base method. -func (m *MockClient) ReadStrings(arg0 db.Rows) ([]string, error) { +func (m *MockClient) ReadStrings(rows db.Rows) ([]string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadStrings", arg0) + ret := m.ctrl.Call(m, "ReadStrings", rows) ret0, _ := ret[0].([]string) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadStrings indicates an expected call of ReadStrings. -func (mr *MockClientMockRecorder) ReadStrings(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) ReadStrings(rows any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadStrings", reflect.TypeOf((*MockClient)(nil).ReadStrings), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadStrings", reflect.TypeOf((*MockClient)(nil).ReadStrings), rows) } // Upsert mocks base method. -func (m *MockClient) Upsert(arg0 transaction.Client, arg1 *sql.Stmt, arg2 string, arg3 any, arg4 bool) error { +func (m *MockClient) Upsert(tx transaction.Client, stmt *sql.Stmt, key string, obj any, shouldEncrypt bool) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Upsert", arg0, arg1, arg2, arg3, arg4) + ret := m.ctrl.Call(m, "Upsert", tx, stmt, key, obj, shouldEncrypt) ret0, _ := ret[0].(error) return ret0 } // Upsert indicates an expected call of Upsert. -func (mr *MockClientMockRecorder) Upsert(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call { +func (mr *MockClientMockRecorder) Upsert(tx, stmt, key, obj, shouldEncrypt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Upsert", reflect.TypeOf((*MockClient)(nil).Upsert), arg0, arg1, arg2, arg3, arg4) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Upsert", reflect.TypeOf((*MockClient)(nil).Upsert), tx, stmt, key, obj, shouldEncrypt) } // WithTransaction mocks base method. -func (m *MockClient) WithTransaction(arg0 context.Context, arg1 bool, arg2 db.WithTransactionFunction) error { +func (m *MockClient) WithTransaction(ctx context.Context, forWriting bool, f db.WithTransactionFunction) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "WithTransaction", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "WithTransaction", ctx, forWriting, f) ret0, _ := ret[0].(error) return ret0 } // WithTransaction indicates an expected call of WithTransaction. -func (mr *MockClientMockRecorder) WithTransaction(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockClientMockRecorder) WithTransaction(ctx, forWriting, f any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithTransaction", reflect.TypeOf((*MockClient)(nil).WithTransaction), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithTransaction", reflect.TypeOf((*MockClient)(nil).WithTransaction), ctx, forWriting, f) } diff --git a/pkg/sqlcache/informer/factory/dynamic_mocks_test.go b/pkg/sqlcache/informer/factory/dynamic_mocks_test.go index 29e2c0fd..bfaff173 100644 --- a/pkg/sqlcache/informer/factory/dynamic_mocks_test.go +++ b/pkg/sqlcache/informer/factory/dynamic_mocks_test.go @@ -24,6 +24,7 @@ import ( type MockResourceInterface struct { ctrl *gomock.Controller recorder *MockResourceInterfaceMockRecorder + isgomock struct{} } // MockResourceInterfaceMockRecorder is the mock recorder for MockResourceInterface. @@ -44,10 +45,10 @@ func (m *MockResourceInterface) EXPECT() *MockResourceInterfaceMockRecorder { } // Apply mocks base method. -func (m *MockResourceInterface) Apply(arg0 context.Context, arg1 string, arg2 *unstructured.Unstructured, arg3 v1.ApplyOptions, arg4 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Apply(ctx context.Context, name string, obj *unstructured.Unstructured, options v1.ApplyOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3} - for _, a := range arg4 { + varargs := []any{ctx, name, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Apply", varargs...) @@ -57,32 +58,32 @@ func (m *MockResourceInterface) Apply(arg0 context.Context, arg1 string, arg2 *u } // Apply indicates an expected call of Apply. -func (mr *MockResourceInterfaceMockRecorder) Apply(arg0, arg1, arg2, arg3 any, arg4 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Apply(ctx, name, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]any{ctx, name, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Apply", reflect.TypeOf((*MockResourceInterface)(nil).Apply), varargs...) } // ApplyStatus mocks base method. -func (m *MockResourceInterface) ApplyStatus(arg0 context.Context, arg1 string, arg2 *unstructured.Unstructured, arg3 v1.ApplyOptions) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) ApplyStatus(ctx context.Context, name string, obj *unstructured.Unstructured, options v1.ApplyOptions) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ApplyStatus", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "ApplyStatus", ctx, name, obj, options) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].(error) return ret0, ret1 } // ApplyStatus indicates an expected call of ApplyStatus. -func (mr *MockResourceInterfaceMockRecorder) ApplyStatus(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) ApplyStatus(ctx, name, obj, options any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplyStatus", reflect.TypeOf((*MockResourceInterface)(nil).ApplyStatus), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplyStatus", reflect.TypeOf((*MockResourceInterface)(nil).ApplyStatus), ctx, name, obj, options) } // Create mocks base method. -func (m *MockResourceInterface) Create(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.CreateOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Create(ctx context.Context, obj *unstructured.Unstructured, options v1.CreateOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Create", varargs...) @@ -92,17 +93,17 @@ func (m *MockResourceInterface) Create(arg0 context.Context, arg1 *unstructured. } // Create indicates an expected call of Create. -func (mr *MockResourceInterfaceMockRecorder) Create(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Create(ctx, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockResourceInterface)(nil).Create), varargs...) } // Delete mocks base method. -func (m *MockResourceInterface) Delete(arg0 context.Context, arg1 string, arg2 v1.DeleteOptions, arg3 ...string) error { +func (m *MockResourceInterface) Delete(ctx context.Context, name string, options v1.DeleteOptions, subresources ...string) error { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, name, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Delete", varargs...) @@ -111,31 +112,31 @@ func (m *MockResourceInterface) Delete(arg0 context.Context, arg1 string, arg2 v } // Delete indicates an expected call of Delete. -func (mr *MockResourceInterfaceMockRecorder) Delete(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Delete(ctx, name, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, name, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockResourceInterface)(nil).Delete), varargs...) } // DeleteCollection mocks base method. -func (m *MockResourceInterface) DeleteCollection(arg0 context.Context, arg1 v1.DeleteOptions, arg2 v1.ListOptions) error { +func (m *MockResourceInterface) DeleteCollection(ctx context.Context, options v1.DeleteOptions, listOptions v1.ListOptions) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteCollection", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "DeleteCollection", ctx, options, listOptions) ret0, _ := ret[0].(error) return ret0 } // DeleteCollection indicates an expected call of DeleteCollection. -func (mr *MockResourceInterfaceMockRecorder) DeleteCollection(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) DeleteCollection(ctx, options, listOptions any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCollection", reflect.TypeOf((*MockResourceInterface)(nil).DeleteCollection), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCollection", reflect.TypeOf((*MockResourceInterface)(nil).DeleteCollection), ctx, options, listOptions) } // Get mocks base method. -func (m *MockResourceInterface) Get(arg0 context.Context, arg1 string, arg2 v1.GetOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Get(ctx context.Context, name string, options v1.GetOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, name, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Get", varargs...) @@ -145,32 +146,32 @@ func (m *MockResourceInterface) Get(arg0 context.Context, arg1 string, arg2 v1.G } // Get indicates an expected call of Get. -func (mr *MockResourceInterfaceMockRecorder) Get(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Get(ctx, name, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, name, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockResourceInterface)(nil).Get), varargs...) } // List mocks base method. -func (m *MockResourceInterface) List(arg0 context.Context, arg1 v1.ListOptions) (*unstructured.UnstructuredList, error) { +func (m *MockResourceInterface) List(ctx context.Context, opts v1.ListOptions) (*unstructured.UnstructuredList, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "List", arg0, arg1) + ret := m.ctrl.Call(m, "List", ctx, opts) ret0, _ := ret[0].(*unstructured.UnstructuredList) ret1, _ := ret[1].(error) return ret0, ret1 } // List indicates an expected call of List. -func (mr *MockResourceInterfaceMockRecorder) List(arg0, arg1 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) List(ctx, opts any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockResourceInterface)(nil).List), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockResourceInterface)(nil).List), ctx, opts) } // Patch mocks base method. -func (m *MockResourceInterface) Patch(arg0 context.Context, arg1 string, arg2 types.PatchType, arg3 []byte, arg4 v1.PatchOptions, arg5 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, options v1.PatchOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3, arg4} - for _, a := range arg5 { + varargs := []any{ctx, name, pt, data, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Patch", varargs...) @@ -180,17 +181,17 @@ func (m *MockResourceInterface) Patch(arg0 context.Context, arg1 string, arg2 ty } // Patch indicates an expected call of Patch. -func (mr *MockResourceInterfaceMockRecorder) Patch(arg0, arg1, arg2, arg3, arg4 any, arg5 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Patch(ctx, name, pt, data, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3, arg4}, arg5...) + varargs := append([]any{ctx, name, pt, data, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Patch", reflect.TypeOf((*MockResourceInterface)(nil).Patch), varargs...) } // Update mocks base method. -func (m *MockResourceInterface) Update(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.UpdateOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Update(ctx context.Context, obj *unstructured.Unstructured, options v1.UpdateOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Update", varargs...) @@ -200,38 +201,38 @@ func (m *MockResourceInterface) Update(arg0 context.Context, arg1 *unstructured. } // Update indicates an expected call of Update. -func (mr *MockResourceInterfaceMockRecorder) Update(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Update(ctx, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockResourceInterface)(nil).Update), varargs...) } // UpdateStatus mocks base method. -func (m *MockResourceInterface) UpdateStatus(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.UpdateOptions) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) UpdateStatus(ctx context.Context, obj *unstructured.Unstructured, options v1.UpdateOptions) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdateStatus", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "UpdateStatus", ctx, obj, options) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].(error) return ret0, ret1 } // UpdateStatus indicates an expected call of UpdateStatus. -func (mr *MockResourceInterfaceMockRecorder) UpdateStatus(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) UpdateStatus(ctx, obj, options any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateStatus", reflect.TypeOf((*MockResourceInterface)(nil).UpdateStatus), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateStatus", reflect.TypeOf((*MockResourceInterface)(nil).UpdateStatus), ctx, obj, options) } // Watch mocks base method. -func (m *MockResourceInterface) Watch(arg0 context.Context, arg1 v1.ListOptions) (watch.Interface, error) { +func (m *MockResourceInterface) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Watch", arg0, arg1) + ret := m.ctrl.Call(m, "Watch", ctx, opts) ret0, _ := ret[0].(watch.Interface) ret1, _ := ret[1].(error) return ret0, ret1 } // Watch indicates an expected call of Watch. -func (mr *MockResourceInterfaceMockRecorder) Watch(arg0, arg1 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Watch(ctx, opts any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockResourceInterface)(nil).Watch), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockResourceInterface)(nil).Watch), ctx, opts) } diff --git a/pkg/sqlcache/informer/factory/informer_factory.go b/pkg/sqlcache/informer/factory/informer_factory.go index f855d6ea..a1fb6b69 100644 --- a/pkg/sqlcache/informer/factory/informer_factory.go +++ b/pkg/sqlcache/informer/factory/informer_factory.go @@ -155,7 +155,7 @@ func (f *CacheFactory) CacheFor(ctx context.Context, fields [][]string, transfor // expected, continue without logging return } - cache.DefaultWatchErrorHandler(r, err) + cache.DefaultWatchErrorHandler(ctx, r, err) }) if err != nil { return Cache{}, err diff --git a/pkg/sqlcache/informer/factory/informer_factory_test.go b/pkg/sqlcache/informer/factory/informer_factory_test.go index f63aec15..f9f5f153 100644 --- a/pkg/sqlcache/informer/factory/informer_factory_test.go +++ b/pkg/sqlcache/informer/factory/informer_factory_test.go @@ -16,10 +16,10 @@ import ( "k8s.io/client-go/tools/cache" ) -//go:generate mockgen --build_flags=--mod=mod -package factory -destination ./db_mocks_test.go github.com/rancher/steve/pkg/sqlcache/db Client -//go:generate mockgen --build_flags=--mod=mod -package factory -destination ./transaction_mocks_tests.go -mock_names Client=MockTXClient github.com/rancher/steve/pkg/sqlcache/db/transaction Client -//go:generate mockgen --build_flags=--mod=mod -package factory -destination ./dynamic_mocks_test.go k8s.io/client-go/dynamic ResourceInterface -//go:generate mockgen --build_flags=--mod=mod -package factory -destination ./k8s_cache_mocks_test.go k8s.io/client-go/tools/cache SharedIndexInformer +//go:generate go run go.uber.org/mock/mockgen@latest --build_flags=--mod=mod -package factory -destination ./db_mocks_test.go github.com/rancher/steve/pkg/sqlcache/db Client +//go:generate go run go.uber.org/mock/mockgen@latest --build_flags=--mod=mod -package factory -destination ./transaction_mocks_tests.go -mock_names Client=MockTXClient github.com/rancher/steve/pkg/sqlcache/db/transaction Client +//go:generate go run go.uber.org/mock/mockgen@latest --build_flags=--mod=mod -package factory -destination ./dynamic_mocks_test.go k8s.io/client-go/dynamic ResourceInterface +//go:generate go run go.uber.org/mock/mockgen@latest --build_flags=--mod=mod -package factory -destination ./k8s_cache_mocks_test.go k8s.io/client-go/tools/cache SharedIndexInformer func TestNewCacheFactory(t *testing.T) { type testCase struct { @@ -485,4 +485,4 @@ func TestCacheFor(t *testing.T) { for _, test := range tests { t.Run(test.description, func(t *testing.T) { test.test(t) }) } -} +} \ No newline at end of file diff --git a/pkg/sqlcache/informer/factory/k8s_cache_mocks_test.go b/pkg/sqlcache/informer/factory/k8s_cache_mocks_test.go index b9c4dc35..966c1599 100644 --- a/pkg/sqlcache/informer/factory/k8s_cache_mocks_test.go +++ b/pkg/sqlcache/informer/factory/k8s_cache_mocks_test.go @@ -10,6 +10,7 @@ package factory import ( + context "context" reflect "reflect" time "time" @@ -21,6 +22,7 @@ import ( type MockSharedIndexInformer struct { ctrl *gomock.Controller recorder *MockSharedIndexInformerMockRecorder + isgomock struct{} } // MockSharedIndexInformerMockRecorder is the mock recorder for MockSharedIndexInformer. @@ -41,47 +43,62 @@ func (m *MockSharedIndexInformer) EXPECT() *MockSharedIndexInformerMockRecorder } // AddEventHandler mocks base method. -func (m *MockSharedIndexInformer) AddEventHandler(arg0 cache.ResourceEventHandler) (cache.ResourceEventHandlerRegistration, error) { +func (m *MockSharedIndexInformer) AddEventHandler(handler cache.ResourceEventHandler) (cache.ResourceEventHandlerRegistration, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AddEventHandler", arg0) + ret := m.ctrl.Call(m, "AddEventHandler", handler) ret0, _ := ret[0].(cache.ResourceEventHandlerRegistration) ret1, _ := ret[1].(error) return ret0, ret1 } // AddEventHandler indicates an expected call of AddEventHandler. -func (mr *MockSharedIndexInformerMockRecorder) AddEventHandler(arg0 any) *gomock.Call { +func (mr *MockSharedIndexInformerMockRecorder) AddEventHandler(handler any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddEventHandler", reflect.TypeOf((*MockSharedIndexInformer)(nil).AddEventHandler), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddEventHandler", reflect.TypeOf((*MockSharedIndexInformer)(nil).AddEventHandler), handler) +} + +// AddEventHandlerWithOptions mocks base method. +func (m *MockSharedIndexInformer) AddEventHandlerWithOptions(handler cache.ResourceEventHandler, options cache.HandlerOptions) (cache.ResourceEventHandlerRegistration, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "AddEventHandlerWithOptions", handler, options) + ret0, _ := ret[0].(cache.ResourceEventHandlerRegistration) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// AddEventHandlerWithOptions indicates an expected call of AddEventHandlerWithOptions. +func (mr *MockSharedIndexInformerMockRecorder) AddEventHandlerWithOptions(handler, options any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddEventHandlerWithOptions", reflect.TypeOf((*MockSharedIndexInformer)(nil).AddEventHandlerWithOptions), handler, options) } // AddEventHandlerWithResyncPeriod mocks base method. -func (m *MockSharedIndexInformer) AddEventHandlerWithResyncPeriod(arg0 cache.ResourceEventHandler, arg1 time.Duration) (cache.ResourceEventHandlerRegistration, error) { +func (m *MockSharedIndexInformer) AddEventHandlerWithResyncPeriod(handler cache.ResourceEventHandler, resyncPeriod time.Duration) (cache.ResourceEventHandlerRegistration, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AddEventHandlerWithResyncPeriod", arg0, arg1) + ret := m.ctrl.Call(m, "AddEventHandlerWithResyncPeriod", handler, resyncPeriod) ret0, _ := ret[0].(cache.ResourceEventHandlerRegistration) ret1, _ := ret[1].(error) return ret0, ret1 } // AddEventHandlerWithResyncPeriod indicates an expected call of AddEventHandlerWithResyncPeriod. -func (mr *MockSharedIndexInformerMockRecorder) AddEventHandlerWithResyncPeriod(arg0, arg1 any) *gomock.Call { +func (mr *MockSharedIndexInformerMockRecorder) AddEventHandlerWithResyncPeriod(handler, resyncPeriod any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddEventHandlerWithResyncPeriod", reflect.TypeOf((*MockSharedIndexInformer)(nil).AddEventHandlerWithResyncPeriod), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddEventHandlerWithResyncPeriod", reflect.TypeOf((*MockSharedIndexInformer)(nil).AddEventHandlerWithResyncPeriod), handler, resyncPeriod) } // AddIndexers mocks base method. -func (m *MockSharedIndexInformer) AddIndexers(arg0 cache.Indexers) error { +func (m *MockSharedIndexInformer) AddIndexers(indexers cache.Indexers) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AddIndexers", arg0) + ret := m.ctrl.Call(m, "AddIndexers", indexers) ret0, _ := ret[0].(error) return ret0 } // AddIndexers indicates an expected call of AddIndexers. -func (mr *MockSharedIndexInformerMockRecorder) AddIndexers(arg0 any) *gomock.Call { +func (mr *MockSharedIndexInformerMockRecorder) AddIndexers(indexers any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddIndexers", reflect.TypeOf((*MockSharedIndexInformer)(nil).AddIndexers), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddIndexers", reflect.TypeOf((*MockSharedIndexInformer)(nil).AddIndexers), indexers) } // GetController mocks base method. @@ -169,55 +186,81 @@ func (mr *MockSharedIndexInformerMockRecorder) LastSyncResourceVersion() *gomock } // RemoveEventHandler mocks base method. -func (m *MockSharedIndexInformer) RemoveEventHandler(arg0 cache.ResourceEventHandlerRegistration) error { +func (m *MockSharedIndexInformer) RemoveEventHandler(handle cache.ResourceEventHandlerRegistration) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RemoveEventHandler", arg0) + ret := m.ctrl.Call(m, "RemoveEventHandler", handle) ret0, _ := ret[0].(error) return ret0 } // RemoveEventHandler indicates an expected call of RemoveEventHandler. -func (mr *MockSharedIndexInformerMockRecorder) RemoveEventHandler(arg0 any) *gomock.Call { +func (mr *MockSharedIndexInformerMockRecorder) RemoveEventHandler(handle any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveEventHandler", reflect.TypeOf((*MockSharedIndexInformer)(nil).RemoveEventHandler), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RemoveEventHandler", reflect.TypeOf((*MockSharedIndexInformer)(nil).RemoveEventHandler), handle) } // Run mocks base method. -func (m *MockSharedIndexInformer) Run(arg0 <-chan struct{}) { +func (m *MockSharedIndexInformer) Run(stopCh <-chan struct{}) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Run", arg0) + m.ctrl.Call(m, "Run", stopCh) } // Run indicates an expected call of Run. -func (mr *MockSharedIndexInformerMockRecorder) Run(arg0 any) *gomock.Call { +func (mr *MockSharedIndexInformerMockRecorder) Run(stopCh any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockSharedIndexInformer)(nil).Run), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Run", reflect.TypeOf((*MockSharedIndexInformer)(nil).Run), stopCh) +} + +// RunWithContext mocks base method. +func (m *MockSharedIndexInformer) RunWithContext(ctx context.Context) { + m.ctrl.T.Helper() + m.ctrl.Call(m, "RunWithContext", ctx) +} + +// RunWithContext indicates an expected call of RunWithContext. +func (mr *MockSharedIndexInformerMockRecorder) RunWithContext(ctx any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RunWithContext", reflect.TypeOf((*MockSharedIndexInformer)(nil).RunWithContext), ctx) } // SetTransform mocks base method. -func (m *MockSharedIndexInformer) SetTransform(arg0 cache.TransformFunc) error { +func (m *MockSharedIndexInformer) SetTransform(handler cache.TransformFunc) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetTransform", arg0) + ret := m.ctrl.Call(m, "SetTransform", handler) ret0, _ := ret[0].(error) return ret0 } // SetTransform indicates an expected call of SetTransform. -func (mr *MockSharedIndexInformerMockRecorder) SetTransform(arg0 any) *gomock.Call { +func (mr *MockSharedIndexInformerMockRecorder) SetTransform(handler any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTransform", reflect.TypeOf((*MockSharedIndexInformer)(nil).SetTransform), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTransform", reflect.TypeOf((*MockSharedIndexInformer)(nil).SetTransform), handler) } // SetWatchErrorHandler mocks base method. -func (m *MockSharedIndexInformer) SetWatchErrorHandler(arg0 cache.WatchErrorHandler) error { +func (m *MockSharedIndexInformer) SetWatchErrorHandler(handler cache.WatchErrorHandler) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetWatchErrorHandler", arg0) + ret := m.ctrl.Call(m, "SetWatchErrorHandler", handler) ret0, _ := ret[0].(error) return ret0 } // SetWatchErrorHandler indicates an expected call of SetWatchErrorHandler. -func (mr *MockSharedIndexInformerMockRecorder) SetWatchErrorHandler(arg0 any) *gomock.Call { +func (mr *MockSharedIndexInformerMockRecorder) SetWatchErrorHandler(handler any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetWatchErrorHandler", reflect.TypeOf((*MockSharedIndexInformer)(nil).SetWatchErrorHandler), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetWatchErrorHandler", reflect.TypeOf((*MockSharedIndexInformer)(nil).SetWatchErrorHandler), handler) +} + +// SetWatchErrorHandlerWithContext mocks base method. +func (m *MockSharedIndexInformer) SetWatchErrorHandlerWithContext(handler cache.WatchErrorHandlerWithContext) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "SetWatchErrorHandlerWithContext", handler) + ret0, _ := ret[0].(error) + return ret0 +} + +// SetWatchErrorHandlerWithContext indicates an expected call of SetWatchErrorHandlerWithContext. +func (mr *MockSharedIndexInformerMockRecorder) SetWatchErrorHandlerWithContext(handler any) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetWatchErrorHandlerWithContext", reflect.TypeOf((*MockSharedIndexInformer)(nil).SetWatchErrorHandlerWithContext), handler) } diff --git a/pkg/sqlcache/informer/factory/transaction_mocks_tests.go b/pkg/sqlcache/informer/factory/transaction_mocks_tests.go index 9a2b677b..3526f47a 100644 --- a/pkg/sqlcache/informer/factory/transaction_mocks_tests.go +++ b/pkg/sqlcache/informer/factory/transaction_mocks_tests.go @@ -21,6 +21,7 @@ import ( type MockTXClient struct { ctrl *gomock.Controller recorder *MockTXClientMockRecorder + isgomock struct{} } // MockTXClientMockRecorder is the mock recorder for MockTXClient. @@ -41,10 +42,10 @@ func (m *MockTXClient) EXPECT() *MockTXClientMockRecorder { } // Exec mocks base method. -func (m *MockTXClient) Exec(arg0 string, arg1 ...any) (sql.Result, error) { +func (m *MockTXClient) Exec(query string, args ...any) (sql.Result, error) { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{query} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Exec", varargs...) @@ -54,22 +55,22 @@ func (m *MockTXClient) Exec(arg0 string, arg1 ...any) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockTXClientMockRecorder) Exec(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockTXClientMockRecorder) Exec(query any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{query}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockTXClient)(nil).Exec), varargs...) } // Stmt mocks base method. -func (m *MockTXClient) Stmt(arg0 *sql.Stmt) transaction.Stmt { +func (m *MockTXClient) Stmt(stmt *sql.Stmt) transaction.Stmt { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Stmt", arg0) + ret := m.ctrl.Call(m, "Stmt", stmt) ret0, _ := ret[0].(transaction.Stmt) return ret0 } // Stmt indicates an expected call of Stmt. -func (mr *MockTXClientMockRecorder) Stmt(arg0 any) *gomock.Call { +func (mr *MockTXClientMockRecorder) Stmt(stmt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stmt", reflect.TypeOf((*MockTXClient)(nil).Stmt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stmt", reflect.TypeOf((*MockTXClient)(nil).Stmt), stmt) } diff --git a/pkg/sqlcache/informer/informer_mocks_test.go b/pkg/sqlcache/informer/informer_mocks_test.go index 38c23627..610f279c 100644 --- a/pkg/sqlcache/informer/informer_mocks_test.go +++ b/pkg/sqlcache/informer/informer_mocks_test.go @@ -24,6 +24,7 @@ import ( type MockByOptionsLister struct { ctrl *gomock.Controller recorder *MockByOptionsListerMockRecorder + isgomock struct{} } // MockByOptionsListerMockRecorder is the mock recorder for MockByOptionsLister. @@ -44,9 +45,9 @@ func (m *MockByOptionsLister) EXPECT() *MockByOptionsListerMockRecorder { } // ListByOptions mocks base method. -func (m *MockByOptionsLister) ListByOptions(arg0 context.Context, arg1 *sqltypes.ListOptions, arg2 []partition.Partition, arg3 string) (*unstructured.UnstructuredList, int, string, error) { +func (m *MockByOptionsLister) ListByOptions(ctx context.Context, lo *sqltypes.ListOptions, partitions []partition.Partition, namespace string) (*unstructured.UnstructuredList, int, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ListByOptions", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "ListByOptions", ctx, lo, partitions, namespace) ret0, _ := ret[0].(*unstructured.UnstructuredList) ret1, _ := ret[1].(int) ret2, _ := ret[2].(string) @@ -55,21 +56,21 @@ func (m *MockByOptionsLister) ListByOptions(arg0 context.Context, arg1 *sqltypes } // ListByOptions indicates an expected call of ListByOptions. -func (mr *MockByOptionsListerMockRecorder) ListByOptions(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockByOptionsListerMockRecorder) ListByOptions(ctx, lo, partitions, namespace any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListByOptions", reflect.TypeOf((*MockByOptionsLister)(nil).ListByOptions), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListByOptions", reflect.TypeOf((*MockByOptionsLister)(nil).ListByOptions), ctx, lo, partitions, namespace) } // Watch mocks base method. -func (m *MockByOptionsLister) Watch(arg0 context.Context, arg1 WatchOptions, arg2 chan<- watch.Event) error { +func (m *MockByOptionsLister) Watch(ctx context.Context, options WatchOptions, eventsCh chan<- watch.Event) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Watch", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "Watch", ctx, options, eventsCh) ret0, _ := ret[0].(error) return ret0 } // Watch indicates an expected call of Watch. -func (mr *MockByOptionsListerMockRecorder) Watch(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockByOptionsListerMockRecorder) Watch(ctx, options, eventsCh any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockByOptionsLister)(nil).Watch), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockByOptionsLister)(nil).Watch), ctx, options, eventsCh) } diff --git a/pkg/sqlcache/informer/informer_test.go b/pkg/sqlcache/informer/informer_test.go index abc8bf6d..8d455052 100644 --- a/pkg/sqlcache/informer/informer_test.go +++ b/pkg/sqlcache/informer/informer_test.go @@ -413,3 +413,16 @@ func (m *mockInformer) SetTransform(handler cache.TransformFunc) error { m.transformFunc = handler return m.setTranformErr } +func (m *mockInformer) RunWithContext(ctx context.Context) {} + +func (m *mockInformer) SetWatchErrorHandlerWithContext(handler cache.WatchErrorHandlerWithContext) error { + + return nil + +} + +func (m *mockInformer) AddEventHandlerWithOptions(handler cache.ResourceEventHandler, options cache.HandlerOptions) (cache.ResourceEventHandlerRegistration, error) { + + return nil, nil + +} diff --git a/pkg/sqlcache/informer/sql_mocks_test.go b/pkg/sqlcache/informer/sql_mocks_test.go index 450281e9..df43b201 100644 --- a/pkg/sqlcache/informer/sql_mocks_test.go +++ b/pkg/sqlcache/informer/sql_mocks_test.go @@ -23,6 +23,7 @@ import ( type MockStore struct { ctrl *gomock.Controller recorder *MockStoreMockRecorder + isgomock struct{} } // MockStoreMockRecorder is the mock recorder for MockStore. @@ -43,51 +44,51 @@ func (m *MockStore) EXPECT() *MockStoreMockRecorder { } // Add mocks base method. -func (m *MockStore) Add(arg0 any) error { +func (m *MockStore) Add(obj any) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Add", arg0) + ret := m.ctrl.Call(m, "Add", obj) ret0, _ := ret[0].(error) return ret0 } // Add indicates an expected call of Add. -func (mr *MockStoreMockRecorder) Add(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) Add(obj any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockStore)(nil).Add), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Add", reflect.TypeOf((*MockStore)(nil).Add), obj) } // CloseStmt mocks base method. -func (m *MockStore) CloseStmt(arg0 db.Closable) error { +func (m *MockStore) CloseStmt(closable db.Closable) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CloseStmt", arg0) + ret := m.ctrl.Call(m, "CloseStmt", closable) ret0, _ := ret[0].(error) return ret0 } // CloseStmt indicates an expected call of CloseStmt. -func (mr *MockStoreMockRecorder) CloseStmt(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) CloseStmt(closable any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseStmt", reflect.TypeOf((*MockStore)(nil).CloseStmt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseStmt", reflect.TypeOf((*MockStore)(nil).CloseStmt), closable) } // Delete mocks base method. -func (m *MockStore) Delete(arg0 any) error { +func (m *MockStore) Delete(obj any) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Delete", arg0) + ret := m.ctrl.Call(m, "Delete", obj) ret0, _ := ret[0].(error) return ret0 } // Delete indicates an expected call of Delete. -func (mr *MockStoreMockRecorder) Delete(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) Delete(obj any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockStore)(nil).Delete), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockStore)(nil).Delete), obj) } // Get mocks base method. -func (m *MockStore) Get(arg0 any) (any, bool, error) { +func (m *MockStore) Get(obj any) (any, bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Get", arg0) + ret := m.ctrl.Call(m, "Get", obj) ret0, _ := ret[0].(any) ret1, _ := ret[1].(bool) ret2, _ := ret[2].(error) @@ -95,15 +96,15 @@ func (m *MockStore) Get(arg0 any) (any, bool, error) { } // Get indicates an expected call of Get. -func (mr *MockStoreMockRecorder) Get(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) Get(obj any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockStore)(nil).Get), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockStore)(nil).Get), obj) } // GetByKey mocks base method. -func (m *MockStore) GetByKey(arg0 string) (any, bool, error) { +func (m *MockStore) GetByKey(key string) (any, bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetByKey", arg0) + ret := m.ctrl.Call(m, "GetByKey", key) ret0, _ := ret[0].(any) ret1, _ := ret[1].(bool) ret2, _ := ret[2].(error) @@ -111,9 +112,9 @@ func (m *MockStore) GetByKey(arg0 string) (any, bool, error) { } // GetByKey indicates an expected call of GetByKey. -func (mr *MockStoreMockRecorder) GetByKey(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) GetByKey(key any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetByKey", reflect.TypeOf((*MockStore)(nil).GetByKey), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetByKey", reflect.TypeOf((*MockStore)(nil).GetByKey), key) } // GetName mocks base method. @@ -187,39 +188,39 @@ func (mr *MockStoreMockRecorder) ListKeys() *gomock.Call { } // NewConnection mocks base method. -func (m *MockStore) NewConnection(arg0 bool) (string, error) { +func (m *MockStore) NewConnection(isTemp bool) (string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NewConnection", arg0) + ret := m.ctrl.Call(m, "NewConnection", isTemp) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) return ret0, ret1 } // NewConnection indicates an expected call of NewConnection. -func (mr *MockStoreMockRecorder) NewConnection(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) NewConnection(isTemp any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewConnection", reflect.TypeOf((*MockStore)(nil).NewConnection), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewConnection", reflect.TypeOf((*MockStore)(nil).NewConnection), isTemp) } // Prepare mocks base method. -func (m *MockStore) Prepare(arg0 string) *sql.Stmt { +func (m *MockStore) Prepare(stmt string) *sql.Stmt { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Prepare", arg0) + ret := m.ctrl.Call(m, "Prepare", stmt) ret0, _ := ret[0].(*sql.Stmt) return ret0 } // Prepare indicates an expected call of Prepare. -func (mr *MockStoreMockRecorder) Prepare(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) Prepare(stmt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Prepare", reflect.TypeOf((*MockStore)(nil).Prepare), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Prepare", reflect.TypeOf((*MockStore)(nil).Prepare), stmt) } // QueryForRows mocks base method. -func (m *MockStore) QueryForRows(arg0 context.Context, arg1 transaction.Stmt, arg2 ...any) (*sql.Rows, error) { +func (m *MockStore) QueryForRows(ctx context.Context, stmt transaction.Stmt, params ...any) (*sql.Rows, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, stmt} + for _, a := range params { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryForRows", varargs...) @@ -229,103 +230,103 @@ func (m *MockStore) QueryForRows(arg0 context.Context, arg1 transaction.Stmt, ar } // QueryForRows indicates an expected call of QueryForRows. -func (mr *MockStoreMockRecorder) QueryForRows(arg0, arg1 any, arg2 ...any) *gomock.Call { +func (mr *MockStoreMockRecorder) QueryForRows(ctx, stmt any, params ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1}, arg2...) + varargs := append([]any{ctx, stmt}, params...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryForRows", reflect.TypeOf((*MockStore)(nil).QueryForRows), varargs...) } // ReadInt mocks base method. -func (m *MockStore) ReadInt(arg0 db.Rows) (int, error) { +func (m *MockStore) ReadInt(rows db.Rows) (int, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadInt", arg0) + ret := m.ctrl.Call(m, "ReadInt", rows) ret0, _ := ret[0].(int) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadInt indicates an expected call of ReadInt. -func (mr *MockStoreMockRecorder) ReadInt(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) ReadInt(rows any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadInt", reflect.TypeOf((*MockStore)(nil).ReadInt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadInt", reflect.TypeOf((*MockStore)(nil).ReadInt), rows) } // ReadObjects mocks base method. -func (m *MockStore) ReadObjects(arg0 db.Rows, arg1 reflect.Type, arg2 bool) ([]any, error) { +func (m *MockStore) ReadObjects(rows db.Rows, typ reflect.Type, shouldDecrypt bool) ([]any, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadObjects", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "ReadObjects", rows, typ, shouldDecrypt) ret0, _ := ret[0].([]any) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadObjects indicates an expected call of ReadObjects. -func (mr *MockStoreMockRecorder) ReadObjects(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockStoreMockRecorder) ReadObjects(rows, typ, shouldDecrypt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadObjects", reflect.TypeOf((*MockStore)(nil).ReadObjects), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadObjects", reflect.TypeOf((*MockStore)(nil).ReadObjects), rows, typ, shouldDecrypt) } // ReadStrings mocks base method. -func (m *MockStore) ReadStrings(arg0 db.Rows) ([]string, error) { +func (m *MockStore) ReadStrings(rows db.Rows) ([]string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadStrings", arg0) + ret := m.ctrl.Call(m, "ReadStrings", rows) ret0, _ := ret[0].([]string) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadStrings indicates an expected call of ReadStrings. -func (mr *MockStoreMockRecorder) ReadStrings(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) ReadStrings(rows any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadStrings", reflect.TypeOf((*MockStore)(nil).ReadStrings), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadStrings", reflect.TypeOf((*MockStore)(nil).ReadStrings), rows) } // RegisterAfterAdd mocks base method. -func (m *MockStore) RegisterAfterAdd(arg0 func(string, any, transaction.Client) error) { +func (m *MockStore) RegisterAfterAdd(f func(string, any, transaction.Client) error) { m.ctrl.T.Helper() - m.ctrl.Call(m, "RegisterAfterAdd", arg0) + m.ctrl.Call(m, "RegisterAfterAdd", f) } // RegisterAfterAdd indicates an expected call of RegisterAfterAdd. -func (mr *MockStoreMockRecorder) RegisterAfterAdd(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) RegisterAfterAdd(f any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterAfterAdd", reflect.TypeOf((*MockStore)(nil).RegisterAfterAdd), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterAfterAdd", reflect.TypeOf((*MockStore)(nil).RegisterAfterAdd), f) } // RegisterAfterDelete mocks base method. -func (m *MockStore) RegisterAfterDelete(arg0 func(string, any, transaction.Client) error) { +func (m *MockStore) RegisterAfterDelete(f func(string, any, transaction.Client) error) { m.ctrl.T.Helper() - m.ctrl.Call(m, "RegisterAfterDelete", arg0) + m.ctrl.Call(m, "RegisterAfterDelete", f) } // RegisterAfterDelete indicates an expected call of RegisterAfterDelete. -func (mr *MockStoreMockRecorder) RegisterAfterDelete(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) RegisterAfterDelete(f any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterAfterDelete", reflect.TypeOf((*MockStore)(nil).RegisterAfterDelete), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterAfterDelete", reflect.TypeOf((*MockStore)(nil).RegisterAfterDelete), f) } // RegisterAfterDeleteAll mocks base method. -func (m *MockStore) RegisterAfterDeleteAll(arg0 func(transaction.Client) error) { +func (m *MockStore) RegisterAfterDeleteAll(f func(transaction.Client) error) { m.ctrl.T.Helper() - m.ctrl.Call(m, "RegisterAfterDeleteAll", arg0) + m.ctrl.Call(m, "RegisterAfterDeleteAll", f) } // RegisterAfterDeleteAll indicates an expected call of RegisterAfterDeleteAll. -func (mr *MockStoreMockRecorder) RegisterAfterDeleteAll(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) RegisterAfterDeleteAll(f any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterAfterDeleteAll", reflect.TypeOf((*MockStore)(nil).RegisterAfterDeleteAll), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterAfterDeleteAll", reflect.TypeOf((*MockStore)(nil).RegisterAfterDeleteAll), f) } // RegisterAfterUpdate mocks base method. -func (m *MockStore) RegisterAfterUpdate(arg0 func(string, any, transaction.Client) error) { +func (m *MockStore) RegisterAfterUpdate(f func(string, any, transaction.Client) error) { m.ctrl.T.Helper() - m.ctrl.Call(m, "RegisterAfterUpdate", arg0) + m.ctrl.Call(m, "RegisterAfterUpdate", f) } // RegisterAfterUpdate indicates an expected call of RegisterAfterUpdate. -func (mr *MockStoreMockRecorder) RegisterAfterUpdate(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) RegisterAfterUpdate(f any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterAfterUpdate", reflect.TypeOf((*MockStore)(nil).RegisterAfterUpdate), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RegisterAfterUpdate", reflect.TypeOf((*MockStore)(nil).RegisterAfterUpdate), f) } // Replace mocks base method. @@ -357,43 +358,43 @@ func (mr *MockStoreMockRecorder) Resync() *gomock.Call { } // Update mocks base method. -func (m *MockStore) Update(arg0 any) error { +func (m *MockStore) Update(obj any) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Update", arg0) + ret := m.ctrl.Call(m, "Update", obj) ret0, _ := ret[0].(error) return ret0 } // Update indicates an expected call of Update. -func (mr *MockStoreMockRecorder) Update(arg0 any) *gomock.Call { +func (mr *MockStoreMockRecorder) Update(obj any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockStore)(nil).Update), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockStore)(nil).Update), obj) } // Upsert mocks base method. -func (m *MockStore) Upsert(arg0 transaction.Client, arg1 *sql.Stmt, arg2 string, arg3 any, arg4 bool) error { +func (m *MockStore) Upsert(tx transaction.Client, stmt *sql.Stmt, key string, obj any, shouldEncrypt bool) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Upsert", arg0, arg1, arg2, arg3, arg4) + ret := m.ctrl.Call(m, "Upsert", tx, stmt, key, obj, shouldEncrypt) ret0, _ := ret[0].(error) return ret0 } // Upsert indicates an expected call of Upsert. -func (mr *MockStoreMockRecorder) Upsert(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call { +func (mr *MockStoreMockRecorder) Upsert(tx, stmt, key, obj, shouldEncrypt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Upsert", reflect.TypeOf((*MockStore)(nil).Upsert), arg0, arg1, arg2, arg3, arg4) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Upsert", reflect.TypeOf((*MockStore)(nil).Upsert), tx, stmt, key, obj, shouldEncrypt) } // WithTransaction mocks base method. -func (m *MockStore) WithTransaction(arg0 context.Context, arg1 bool, arg2 db.WithTransactionFunction) error { +func (m *MockStore) WithTransaction(ctx context.Context, forWriting bool, f db.WithTransactionFunction) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "WithTransaction", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "WithTransaction", ctx, forWriting, f) ret0, _ := ret[0].(error) return ret0 } // WithTransaction indicates an expected call of WithTransaction. -func (mr *MockStoreMockRecorder) WithTransaction(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockStoreMockRecorder) WithTransaction(ctx, forWriting, f any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithTransaction", reflect.TypeOf((*MockStore)(nil).WithTransaction), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithTransaction", reflect.TypeOf((*MockStore)(nil).WithTransaction), ctx, forWriting, f) } diff --git a/pkg/sqlcache/informer/transaction_mocks_test.go b/pkg/sqlcache/informer/transaction_mocks_test.go index 4a86c446..f44b32cf 100644 --- a/pkg/sqlcache/informer/transaction_mocks_test.go +++ b/pkg/sqlcache/informer/transaction_mocks_test.go @@ -22,6 +22,7 @@ import ( type MockStmt struct { ctrl *gomock.Controller recorder *MockStmtMockRecorder + isgomock struct{} } // MockStmtMockRecorder is the mock recorder for MockStmt. @@ -42,10 +43,10 @@ func (m *MockStmt) EXPECT() *MockStmtMockRecorder { } // Exec mocks base method. -func (m *MockStmt) Exec(arg0 ...any) (sql.Result, error) { +func (m *MockStmt) Exec(args ...any) (sql.Result, error) { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Exec", varargs...) @@ -55,16 +56,16 @@ func (m *MockStmt) Exec(arg0 ...any) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockStmtMockRecorder) Exec(arg0 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) Exec(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockStmt)(nil).Exec), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockStmt)(nil).Exec), args...) } // Query mocks base method. -func (m *MockStmt) Query(arg0 ...any) (*sql.Rows, error) { +func (m *MockStmt) Query(args ...any) (*sql.Rows, error) { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Query", varargs...) @@ -74,16 +75,16 @@ func (m *MockStmt) Query(arg0 ...any) (*sql.Rows, error) { } // Query indicates an expected call of Query. -func (mr *MockStmtMockRecorder) Query(arg0 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) Query(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockStmt)(nil).Query), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockStmt)(nil).Query), args...) } // QueryContext mocks base method. -func (m *MockStmt) QueryContext(arg0 context.Context, arg1 ...any) (*sql.Rows, error) { +func (m *MockStmt) QueryContext(ctx context.Context, args ...any) (*sql.Rows, error) { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{ctx} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryContext", varargs...) @@ -93,17 +94,17 @@ func (m *MockStmt) QueryContext(arg0 context.Context, arg1 ...any) (*sql.Rows, e } // QueryContext indicates an expected call of QueryContext. -func (mr *MockStmtMockRecorder) QueryContext(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) QueryContext(ctx any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{ctx}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryContext", reflect.TypeOf((*MockStmt)(nil).QueryContext), varargs...) } // QueryRowContext mocks base method. -func (m *MockStmt) QueryRowContext(arg0 context.Context, arg1 ...any) *sql.Row { +func (m *MockStmt) QueryRowContext(ctx context.Context, args ...any) *sql.Row { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{ctx} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryRowContext", varargs...) @@ -112,9 +113,9 @@ func (m *MockStmt) QueryRowContext(arg0 context.Context, arg1 ...any) *sql.Row { } // QueryRowContext indicates an expected call of QueryRowContext. -func (mr *MockStmtMockRecorder) QueryRowContext(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) QueryRowContext(ctx any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{ctx}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryRowContext", reflect.TypeOf((*MockStmt)(nil).QueryRowContext), varargs...) } @@ -122,6 +123,7 @@ func (mr *MockStmtMockRecorder) QueryRowContext(arg0 any, arg1 ...any) *gomock.C type MockTXClient struct { ctrl *gomock.Controller recorder *MockTXClientMockRecorder + isgomock struct{} } // MockTXClientMockRecorder is the mock recorder for MockTXClient. @@ -142,10 +144,10 @@ func (m *MockTXClient) EXPECT() *MockTXClientMockRecorder { } // Exec mocks base method. -func (m *MockTXClient) Exec(arg0 string, arg1 ...any) (sql.Result, error) { +func (m *MockTXClient) Exec(query string, args ...any) (sql.Result, error) { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{query} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Exec", varargs...) @@ -155,22 +157,22 @@ func (m *MockTXClient) Exec(arg0 string, arg1 ...any) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockTXClientMockRecorder) Exec(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockTXClientMockRecorder) Exec(query any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{query}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockTXClient)(nil).Exec), varargs...) } // Stmt mocks base method. -func (m *MockTXClient) Stmt(arg0 *sql.Stmt) transaction.Stmt { +func (m *MockTXClient) Stmt(stmt *sql.Stmt) transaction.Stmt { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Stmt", arg0) + ret := m.ctrl.Call(m, "Stmt", stmt) ret0, _ := ret[0].(transaction.Stmt) return ret0 } // Stmt indicates an expected call of Stmt. -func (mr *MockTXClientMockRecorder) Stmt(arg0 any) *gomock.Call { +func (mr *MockTXClientMockRecorder) Stmt(stmt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stmt", reflect.TypeOf((*MockTXClient)(nil).Stmt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stmt", reflect.TypeOf((*MockTXClient)(nil).Stmt), stmt) } diff --git a/pkg/sqlcache/store/db_mocks_test.go b/pkg/sqlcache/store/db_mocks_test.go index 326100bb..f76331a9 100644 --- a/pkg/sqlcache/store/db_mocks_test.go +++ b/pkg/sqlcache/store/db_mocks_test.go @@ -23,6 +23,7 @@ import ( type MockRows struct { ctrl *gomock.Controller recorder *MockRowsMockRecorder + isgomock struct{} } // MockRowsMockRecorder is the mock recorder for MockRows. @@ -85,10 +86,10 @@ func (mr *MockRowsMockRecorder) Next() *gomock.Call { } // Scan mocks base method. -func (m *MockRows) Scan(arg0 ...any) error { +func (m *MockRows) Scan(dest ...any) error { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range dest { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Scan", varargs...) @@ -97,15 +98,16 @@ func (m *MockRows) Scan(arg0 ...any) error { } // Scan indicates an expected call of Scan. -func (mr *MockRowsMockRecorder) Scan(arg0 ...any) *gomock.Call { +func (mr *MockRowsMockRecorder) Scan(dest ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Scan", reflect.TypeOf((*MockRows)(nil).Scan), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Scan", reflect.TypeOf((*MockRows)(nil).Scan), dest...) } // MockClient is a mock of Client interface. type MockClient struct { ctrl *gomock.Controller recorder *MockClientMockRecorder + isgomock struct{} } // MockClientMockRecorder is the mock recorder for MockClient. @@ -126,53 +128,53 @@ func (m *MockClient) EXPECT() *MockClientMockRecorder { } // CloseStmt mocks base method. -func (m *MockClient) CloseStmt(arg0 db.Closable) error { +func (m *MockClient) CloseStmt(closable db.Closable) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CloseStmt", arg0) + ret := m.ctrl.Call(m, "CloseStmt", closable) ret0, _ := ret[0].(error) return ret0 } // CloseStmt indicates an expected call of CloseStmt. -func (mr *MockClientMockRecorder) CloseStmt(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) CloseStmt(closable any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseStmt", reflect.TypeOf((*MockClient)(nil).CloseStmt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CloseStmt", reflect.TypeOf((*MockClient)(nil).CloseStmt), closable) } // NewConnection mocks base method. -func (m *MockClient) NewConnection(arg0 bool) (string, error) { +func (m *MockClient) NewConnection(isTemp bool) (string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "NewConnection", arg0) + ret := m.ctrl.Call(m, "NewConnection", isTemp) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) return ret0, ret1 } // NewConnection indicates an expected call of NewConnection. -func (mr *MockClientMockRecorder) NewConnection(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) NewConnection(isTemp any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewConnection", reflect.TypeOf((*MockClient)(nil).NewConnection), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "NewConnection", reflect.TypeOf((*MockClient)(nil).NewConnection), isTemp) } // Prepare mocks base method. -func (m *MockClient) Prepare(arg0 string) *sql.Stmt { +func (m *MockClient) Prepare(stmt string) *sql.Stmt { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Prepare", arg0) + ret := m.ctrl.Call(m, "Prepare", stmt) ret0, _ := ret[0].(*sql.Stmt) return ret0 } // Prepare indicates an expected call of Prepare. -func (mr *MockClientMockRecorder) Prepare(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) Prepare(stmt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Prepare", reflect.TypeOf((*MockClient)(nil).Prepare), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Prepare", reflect.TypeOf((*MockClient)(nil).Prepare), stmt) } // QueryForRows mocks base method. -func (m *MockClient) QueryForRows(arg0 context.Context, arg1 transaction.Stmt, arg2 ...any) (*sql.Rows, error) { +func (m *MockClient) QueryForRows(ctx context.Context, stmt transaction.Stmt, params ...any) (*sql.Rows, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1} - for _, a := range arg2 { + varargs := []any{ctx, stmt} + for _, a := range params { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryForRows", varargs...) @@ -182,81 +184,81 @@ func (m *MockClient) QueryForRows(arg0 context.Context, arg1 transaction.Stmt, a } // QueryForRows indicates an expected call of QueryForRows. -func (mr *MockClientMockRecorder) QueryForRows(arg0, arg1 any, arg2 ...any) *gomock.Call { +func (mr *MockClientMockRecorder) QueryForRows(ctx, stmt any, params ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1}, arg2...) + varargs := append([]any{ctx, stmt}, params...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryForRows", reflect.TypeOf((*MockClient)(nil).QueryForRows), varargs...) } // ReadInt mocks base method. -func (m *MockClient) ReadInt(arg0 db.Rows) (int, error) { +func (m *MockClient) ReadInt(rows db.Rows) (int, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadInt", arg0) + ret := m.ctrl.Call(m, "ReadInt", rows) ret0, _ := ret[0].(int) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadInt indicates an expected call of ReadInt. -func (mr *MockClientMockRecorder) ReadInt(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) ReadInt(rows any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadInt", reflect.TypeOf((*MockClient)(nil).ReadInt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadInt", reflect.TypeOf((*MockClient)(nil).ReadInt), rows) } // ReadObjects mocks base method. -func (m *MockClient) ReadObjects(arg0 db.Rows, arg1 reflect.Type, arg2 bool) ([]any, error) { +func (m *MockClient) ReadObjects(rows db.Rows, typ reflect.Type, shouldDecrypt bool) ([]any, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadObjects", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "ReadObjects", rows, typ, shouldDecrypt) ret0, _ := ret[0].([]any) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadObjects indicates an expected call of ReadObjects. -func (mr *MockClientMockRecorder) ReadObjects(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockClientMockRecorder) ReadObjects(rows, typ, shouldDecrypt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadObjects", reflect.TypeOf((*MockClient)(nil).ReadObjects), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadObjects", reflect.TypeOf((*MockClient)(nil).ReadObjects), rows, typ, shouldDecrypt) } // ReadStrings mocks base method. -func (m *MockClient) ReadStrings(arg0 db.Rows) ([]string, error) { +func (m *MockClient) ReadStrings(rows db.Rows) ([]string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ReadStrings", arg0) + ret := m.ctrl.Call(m, "ReadStrings", rows) ret0, _ := ret[0].([]string) ret1, _ := ret[1].(error) return ret0, ret1 } // ReadStrings indicates an expected call of ReadStrings. -func (mr *MockClientMockRecorder) ReadStrings(arg0 any) *gomock.Call { +func (mr *MockClientMockRecorder) ReadStrings(rows any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadStrings", reflect.TypeOf((*MockClient)(nil).ReadStrings), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ReadStrings", reflect.TypeOf((*MockClient)(nil).ReadStrings), rows) } // Upsert mocks base method. -func (m *MockClient) Upsert(arg0 transaction.Client, arg1 *sql.Stmt, arg2 string, arg3 any, arg4 bool) error { +func (m *MockClient) Upsert(tx transaction.Client, stmt *sql.Stmt, key string, obj any, shouldEncrypt bool) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Upsert", arg0, arg1, arg2, arg3, arg4) + ret := m.ctrl.Call(m, "Upsert", tx, stmt, key, obj, shouldEncrypt) ret0, _ := ret[0].(error) return ret0 } // Upsert indicates an expected call of Upsert. -func (mr *MockClientMockRecorder) Upsert(arg0, arg1, arg2, arg3, arg4 any) *gomock.Call { +func (mr *MockClientMockRecorder) Upsert(tx, stmt, key, obj, shouldEncrypt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Upsert", reflect.TypeOf((*MockClient)(nil).Upsert), arg0, arg1, arg2, arg3, arg4) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Upsert", reflect.TypeOf((*MockClient)(nil).Upsert), tx, stmt, key, obj, shouldEncrypt) } // WithTransaction mocks base method. -func (m *MockClient) WithTransaction(arg0 context.Context, arg1 bool, arg2 db.WithTransactionFunction) error { +func (m *MockClient) WithTransaction(ctx context.Context, forWriting bool, f db.WithTransactionFunction) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "WithTransaction", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "WithTransaction", ctx, forWriting, f) ret0, _ := ret[0].(error) return ret0 } // WithTransaction indicates an expected call of WithTransaction. -func (mr *MockClientMockRecorder) WithTransaction(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockClientMockRecorder) WithTransaction(ctx, forWriting, f any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithTransaction", reflect.TypeOf((*MockClient)(nil).WithTransaction), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WithTransaction", reflect.TypeOf((*MockClient)(nil).WithTransaction), ctx, forWriting, f) } diff --git a/pkg/sqlcache/store/transaction_mocks_test.go b/pkg/sqlcache/store/transaction_mocks_test.go index bd2fff44..33a7f8d7 100644 --- a/pkg/sqlcache/store/transaction_mocks_test.go +++ b/pkg/sqlcache/store/transaction_mocks_test.go @@ -22,6 +22,7 @@ import ( type MockStmt struct { ctrl *gomock.Controller recorder *MockStmtMockRecorder + isgomock struct{} } // MockStmtMockRecorder is the mock recorder for MockStmt. @@ -42,10 +43,10 @@ func (m *MockStmt) EXPECT() *MockStmtMockRecorder { } // Exec mocks base method. -func (m *MockStmt) Exec(arg0 ...any) (sql.Result, error) { +func (m *MockStmt) Exec(args ...any) (sql.Result, error) { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Exec", varargs...) @@ -55,16 +56,16 @@ func (m *MockStmt) Exec(arg0 ...any) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockStmtMockRecorder) Exec(arg0 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) Exec(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockStmt)(nil).Exec), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockStmt)(nil).Exec), args...) } // Query mocks base method. -func (m *MockStmt) Query(arg0 ...any) (*sql.Rows, error) { +func (m *MockStmt) Query(args ...any) (*sql.Rows, error) { m.ctrl.T.Helper() varargs := []any{} - for _, a := range arg0 { + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Query", varargs...) @@ -74,16 +75,16 @@ func (m *MockStmt) Query(arg0 ...any) (*sql.Rows, error) { } // Query indicates an expected call of Query. -func (mr *MockStmtMockRecorder) Query(arg0 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) Query(args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockStmt)(nil).Query), arg0...) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Query", reflect.TypeOf((*MockStmt)(nil).Query), args...) } // QueryContext mocks base method. -func (m *MockStmt) QueryContext(arg0 context.Context, arg1 ...any) (*sql.Rows, error) { +func (m *MockStmt) QueryContext(ctx context.Context, args ...any) (*sql.Rows, error) { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{ctx} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryContext", varargs...) @@ -93,17 +94,17 @@ func (m *MockStmt) QueryContext(arg0 context.Context, arg1 ...any) (*sql.Rows, e } // QueryContext indicates an expected call of QueryContext. -func (mr *MockStmtMockRecorder) QueryContext(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) QueryContext(ctx any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{ctx}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryContext", reflect.TypeOf((*MockStmt)(nil).QueryContext), varargs...) } // QueryRowContext mocks base method. -func (m *MockStmt) QueryRowContext(arg0 context.Context, arg1 ...any) *sql.Row { +func (m *MockStmt) QueryRowContext(ctx context.Context, args ...any) *sql.Row { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{ctx} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "QueryRowContext", varargs...) @@ -112,9 +113,9 @@ func (m *MockStmt) QueryRowContext(arg0 context.Context, arg1 ...any) *sql.Row { } // QueryRowContext indicates an expected call of QueryRowContext. -func (mr *MockStmtMockRecorder) QueryRowContext(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockStmtMockRecorder) QueryRowContext(ctx any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{ctx}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "QueryRowContext", reflect.TypeOf((*MockStmt)(nil).QueryRowContext), varargs...) } @@ -122,6 +123,7 @@ func (mr *MockStmtMockRecorder) QueryRowContext(arg0 any, arg1 ...any) *gomock.C type MockTXClient struct { ctrl *gomock.Controller recorder *MockTXClientMockRecorder + isgomock struct{} } // MockTXClientMockRecorder is the mock recorder for MockTXClient. @@ -142,10 +144,10 @@ func (m *MockTXClient) EXPECT() *MockTXClientMockRecorder { } // Exec mocks base method. -func (m *MockTXClient) Exec(arg0 string, arg1 ...any) (sql.Result, error) { +func (m *MockTXClient) Exec(query string, args ...any) (sql.Result, error) { m.ctrl.T.Helper() - varargs := []any{arg0} - for _, a := range arg1 { + varargs := []any{query} + for _, a := range args { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Exec", varargs...) @@ -155,22 +157,22 @@ func (m *MockTXClient) Exec(arg0 string, arg1 ...any) (sql.Result, error) { } // Exec indicates an expected call of Exec. -func (mr *MockTXClientMockRecorder) Exec(arg0 any, arg1 ...any) *gomock.Call { +func (mr *MockTXClientMockRecorder) Exec(query any, args ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0}, arg1...) + varargs := append([]any{query}, args...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Exec", reflect.TypeOf((*MockTXClient)(nil).Exec), varargs...) } // Stmt mocks base method. -func (m *MockTXClient) Stmt(arg0 *sql.Stmt) transaction.Stmt { +func (m *MockTXClient) Stmt(stmt *sql.Stmt) transaction.Stmt { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Stmt", arg0) + ret := m.ctrl.Call(m, "Stmt", stmt) ret0, _ := ret[0].(transaction.Stmt) return ret0 } // Stmt indicates an expected call of Stmt. -func (mr *MockTXClientMockRecorder) Stmt(arg0 any) *gomock.Call { +func (mr *MockTXClientMockRecorder) Stmt(stmt any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stmt", reflect.TypeOf((*MockTXClient)(nil).Stmt), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Stmt", reflect.TypeOf((*MockTXClient)(nil).Stmt), stmt) } diff --git a/pkg/stores/sqlpartition/listprocessor/proxy_mocks_test.go b/pkg/stores/sqlpartition/listprocessor/proxy_mocks_test.go index 22c057be..dabb87f4 100644 --- a/pkg/stores/sqlpartition/listprocessor/proxy_mocks_test.go +++ b/pkg/stores/sqlpartition/listprocessor/proxy_mocks_test.go @@ -23,6 +23,7 @@ import ( type MockCache struct { ctrl *gomock.Controller recorder *MockCacheMockRecorder + isgomock struct{} } // MockCacheMockRecorder is the mock recorder for MockCache. @@ -43,9 +44,9 @@ func (m *MockCache) EXPECT() *MockCacheMockRecorder { } // ListByOptions mocks base method. -func (m *MockCache) ListByOptions(arg0 context.Context, arg1 *sqltypes.ListOptions, arg2 []partition.Partition, arg3 string) (*unstructured.UnstructuredList, int, string, error) { +func (m *MockCache) ListByOptions(ctx context.Context, lo *sqltypes.ListOptions, partitions []partition.Partition, namespace string) (*unstructured.UnstructuredList, int, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ListByOptions", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "ListByOptions", ctx, lo, partitions, namespace) ret0, _ := ret[0].(*unstructured.UnstructuredList) ret1, _ := ret[1].(int) ret2, _ := ret[2].(string) @@ -54,7 +55,7 @@ func (m *MockCache) ListByOptions(arg0 context.Context, arg1 *sqltypes.ListOptio } // ListByOptions indicates an expected call of ListByOptions. -func (mr *MockCacheMockRecorder) ListByOptions(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockCacheMockRecorder) ListByOptions(ctx, lo, partitions, namespace any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListByOptions", reflect.TypeOf((*MockCache)(nil).ListByOptions), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListByOptions", reflect.TypeOf((*MockCache)(nil).ListByOptions), ctx, lo, partitions, namespace) } diff --git a/pkg/stores/sqlpartition/partition_mocks_test.go b/pkg/stores/sqlpartition/partition_mocks_test.go index ac8c9b33..abe95ec7 100644 --- a/pkg/stores/sqlpartition/partition_mocks_test.go +++ b/pkg/stores/sqlpartition/partition_mocks_test.go @@ -23,6 +23,7 @@ import ( type MockPartitioner struct { ctrl *gomock.Controller recorder *MockPartitionerMockRecorder + isgomock struct{} } // MockPartitionerMockRecorder is the mock recorder for MockPartitioner. @@ -43,18 +44,18 @@ func (m *MockPartitioner) EXPECT() *MockPartitionerMockRecorder { } // All mocks base method. -func (m *MockPartitioner) All(arg0 *types.APIRequest, arg1 *types.APISchema, arg2, arg3 string) ([]partition.Partition, error) { +func (m *MockPartitioner) All(apiOp *types.APIRequest, schema *types.APISchema, verb, id string) ([]partition.Partition, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "All", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "All", apiOp, schema, verb, id) ret0, _ := ret[0].([]partition.Partition) ret1, _ := ret[1].(error) return ret0, ret1 } // All indicates an expected call of All. -func (mr *MockPartitionerMockRecorder) All(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockPartitionerMockRecorder) All(apiOp, schema, verb, id any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "All", reflect.TypeOf((*MockPartitioner)(nil).All), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "All", reflect.TypeOf((*MockPartitioner)(nil).All), apiOp, schema, verb, id) } // Store mocks base method. @@ -75,6 +76,7 @@ func (mr *MockPartitionerMockRecorder) Store() *gomock.Call { type MockUnstructuredStore struct { ctrl *gomock.Controller recorder *MockUnstructuredStoreMockRecorder + isgomock struct{} } // MockUnstructuredStoreMockRecorder is the mock recorder for MockUnstructuredStore. @@ -95,9 +97,9 @@ func (m *MockUnstructuredStore) EXPECT() *MockUnstructuredStoreMockRecorder { } // ByID mocks base method. -func (m *MockUnstructuredStore) ByID(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 string) (*unstructured.Unstructured, []types.Warning, error) { +func (m *MockUnstructuredStore) ByID(apiOp *types.APIRequest, schema *types.APISchema, id string) (*unstructured.Unstructured, []types.Warning, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ByID", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "ByID", apiOp, schema, id) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].([]types.Warning) ret2, _ := ret[2].(error) @@ -105,15 +107,15 @@ func (m *MockUnstructuredStore) ByID(arg0 *types.APIRequest, arg1 *types.APISche } // ByID indicates an expected call of ByID. -func (mr *MockUnstructuredStoreMockRecorder) ByID(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockUnstructuredStoreMockRecorder) ByID(apiOp, schema, id any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ByID", reflect.TypeOf((*MockUnstructuredStore)(nil).ByID), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ByID", reflect.TypeOf((*MockUnstructuredStore)(nil).ByID), apiOp, schema, id) } // Create mocks base method. -func (m *MockUnstructuredStore) Create(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 types.APIObject) (*unstructured.Unstructured, []types.Warning, error) { +func (m *MockUnstructuredStore) Create(apiOp *types.APIRequest, schema *types.APISchema, data types.APIObject) (*unstructured.Unstructured, []types.Warning, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Create", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "Create", apiOp, schema, data) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].([]types.Warning) ret2, _ := ret[2].(error) @@ -121,15 +123,15 @@ func (m *MockUnstructuredStore) Create(arg0 *types.APIRequest, arg1 *types.APISc } // Create indicates an expected call of Create. -func (mr *MockUnstructuredStoreMockRecorder) Create(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockUnstructuredStoreMockRecorder) Create(apiOp, schema, data any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockUnstructuredStore)(nil).Create), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockUnstructuredStore)(nil).Create), apiOp, schema, data) } // Delete mocks base method. -func (m *MockUnstructuredStore) Delete(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 string) (*unstructured.Unstructured, []types.Warning, error) { +func (m *MockUnstructuredStore) Delete(apiOp *types.APIRequest, schema *types.APISchema, id string) (*unstructured.Unstructured, []types.Warning, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Delete", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "Delete", apiOp, schema, id) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].([]types.Warning) ret2, _ := ret[2].(error) @@ -137,15 +139,15 @@ func (m *MockUnstructuredStore) Delete(arg0 *types.APIRequest, arg1 *types.APISc } // Delete indicates an expected call of Delete. -func (mr *MockUnstructuredStoreMockRecorder) Delete(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockUnstructuredStoreMockRecorder) Delete(apiOp, schema, id any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockUnstructuredStore)(nil).Delete), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockUnstructuredStore)(nil).Delete), apiOp, schema, id) } // ListByPartitions mocks base method. -func (m *MockUnstructuredStore) ListByPartitions(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 []partition.Partition) (*unstructured.UnstructuredList, int, string, error) { +func (m *MockUnstructuredStore) ListByPartitions(apiOp *types.APIRequest, schema *types.APISchema, partitions []partition.Partition) (*unstructured.UnstructuredList, int, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ListByPartitions", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "ListByPartitions", apiOp, schema, partitions) ret0, _ := ret[0].(*unstructured.UnstructuredList) ret1, _ := ret[1].(int) ret2, _ := ret[2].(string) @@ -154,15 +156,15 @@ func (m *MockUnstructuredStore) ListByPartitions(arg0 *types.APIRequest, arg1 *t } // ListByPartitions indicates an expected call of ListByPartitions. -func (mr *MockUnstructuredStoreMockRecorder) ListByPartitions(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockUnstructuredStoreMockRecorder) ListByPartitions(apiOp, schema, partitions any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListByPartitions", reflect.TypeOf((*MockUnstructuredStore)(nil).ListByPartitions), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListByPartitions", reflect.TypeOf((*MockUnstructuredStore)(nil).ListByPartitions), apiOp, schema, partitions) } // Update mocks base method. -func (m *MockUnstructuredStore) Update(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 types.APIObject, arg3 string) (*unstructured.Unstructured, []types.Warning, error) { +func (m *MockUnstructuredStore) Update(apiOp *types.APIRequest, schema *types.APISchema, data types.APIObject, id string) (*unstructured.Unstructured, []types.Warning, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Update", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "Update", apiOp, schema, data, id) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].([]types.Warning) ret2, _ := ret[2].(error) @@ -170,22 +172,22 @@ func (m *MockUnstructuredStore) Update(arg0 *types.APIRequest, arg1 *types.APISc } // Update indicates an expected call of Update. -func (mr *MockUnstructuredStoreMockRecorder) Update(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockUnstructuredStoreMockRecorder) Update(apiOp, schema, data, id any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockUnstructuredStore)(nil).Update), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockUnstructuredStore)(nil).Update), apiOp, schema, data, id) } // WatchByPartitions mocks base method. -func (m *MockUnstructuredStore) WatchByPartitions(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 types.WatchRequest, arg3 []partition.Partition) (chan watch.Event, error) { +func (m *MockUnstructuredStore) WatchByPartitions(apiOp *types.APIRequest, schema *types.APISchema, wr types.WatchRequest, partitions []partition.Partition) (chan watch.Event, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "WatchByPartitions", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "WatchByPartitions", apiOp, schema, wr, partitions) ret0, _ := ret[0].(chan watch.Event) ret1, _ := ret[1].(error) return ret0, ret1 } // WatchByPartitions indicates an expected call of WatchByPartitions. -func (mr *MockUnstructuredStoreMockRecorder) WatchByPartitions(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockUnstructuredStoreMockRecorder) WatchByPartitions(apiOp, schema, wr, partitions any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WatchByPartitions", reflect.TypeOf((*MockUnstructuredStore)(nil).WatchByPartitions), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WatchByPartitions", reflect.TypeOf((*MockUnstructuredStore)(nil).WatchByPartitions), apiOp, schema, wr, partitions) } diff --git a/pkg/stores/sqlproxy/dynamic_mocks_test.go b/pkg/stores/sqlproxy/dynamic_mocks_test.go index f47e47ec..74e24d00 100644 --- a/pkg/stores/sqlproxy/dynamic_mocks_test.go +++ b/pkg/stores/sqlproxy/dynamic_mocks_test.go @@ -24,6 +24,7 @@ import ( type MockResourceInterface struct { ctrl *gomock.Controller recorder *MockResourceInterfaceMockRecorder + isgomock struct{} } // MockResourceInterfaceMockRecorder is the mock recorder for MockResourceInterface. @@ -44,10 +45,10 @@ func (m *MockResourceInterface) EXPECT() *MockResourceInterfaceMockRecorder { } // Apply mocks base method. -func (m *MockResourceInterface) Apply(arg0 context.Context, arg1 string, arg2 *unstructured.Unstructured, arg3 v1.ApplyOptions, arg4 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Apply(ctx context.Context, name string, obj *unstructured.Unstructured, options v1.ApplyOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3} - for _, a := range arg4 { + varargs := []any{ctx, name, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Apply", varargs...) @@ -57,32 +58,32 @@ func (m *MockResourceInterface) Apply(arg0 context.Context, arg1 string, arg2 *u } // Apply indicates an expected call of Apply. -func (mr *MockResourceInterfaceMockRecorder) Apply(arg0, arg1, arg2, arg3 any, arg4 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Apply(ctx, name, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]any{ctx, name, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Apply", reflect.TypeOf((*MockResourceInterface)(nil).Apply), varargs...) } // ApplyStatus mocks base method. -func (m *MockResourceInterface) ApplyStatus(arg0 context.Context, arg1 string, arg2 *unstructured.Unstructured, arg3 v1.ApplyOptions) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) ApplyStatus(ctx context.Context, name string, obj *unstructured.Unstructured, options v1.ApplyOptions) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ApplyStatus", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "ApplyStatus", ctx, name, obj, options) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].(error) return ret0, ret1 } // ApplyStatus indicates an expected call of ApplyStatus. -func (mr *MockResourceInterfaceMockRecorder) ApplyStatus(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) ApplyStatus(ctx, name, obj, options any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplyStatus", reflect.TypeOf((*MockResourceInterface)(nil).ApplyStatus), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplyStatus", reflect.TypeOf((*MockResourceInterface)(nil).ApplyStatus), ctx, name, obj, options) } // Create mocks base method. -func (m *MockResourceInterface) Create(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.CreateOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Create(ctx context.Context, obj *unstructured.Unstructured, options v1.CreateOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Create", varargs...) @@ -92,17 +93,17 @@ func (m *MockResourceInterface) Create(arg0 context.Context, arg1 *unstructured. } // Create indicates an expected call of Create. -func (mr *MockResourceInterfaceMockRecorder) Create(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Create(ctx, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockResourceInterface)(nil).Create), varargs...) } // Delete mocks base method. -func (m *MockResourceInterface) Delete(arg0 context.Context, arg1 string, arg2 v1.DeleteOptions, arg3 ...string) error { +func (m *MockResourceInterface) Delete(ctx context.Context, name string, options v1.DeleteOptions, subresources ...string) error { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, name, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Delete", varargs...) @@ -111,31 +112,31 @@ func (m *MockResourceInterface) Delete(arg0 context.Context, arg1 string, arg2 v } // Delete indicates an expected call of Delete. -func (mr *MockResourceInterfaceMockRecorder) Delete(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Delete(ctx, name, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, name, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockResourceInterface)(nil).Delete), varargs...) } // DeleteCollection mocks base method. -func (m *MockResourceInterface) DeleteCollection(arg0 context.Context, arg1 v1.DeleteOptions, arg2 v1.ListOptions) error { +func (m *MockResourceInterface) DeleteCollection(ctx context.Context, options v1.DeleteOptions, listOptions v1.ListOptions) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteCollection", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "DeleteCollection", ctx, options, listOptions) ret0, _ := ret[0].(error) return ret0 } // DeleteCollection indicates an expected call of DeleteCollection. -func (mr *MockResourceInterfaceMockRecorder) DeleteCollection(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) DeleteCollection(ctx, options, listOptions any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCollection", reflect.TypeOf((*MockResourceInterface)(nil).DeleteCollection), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCollection", reflect.TypeOf((*MockResourceInterface)(nil).DeleteCollection), ctx, options, listOptions) } // Get mocks base method. -func (m *MockResourceInterface) Get(arg0 context.Context, arg1 string, arg2 v1.GetOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Get(ctx context.Context, name string, options v1.GetOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, name, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Get", varargs...) @@ -145,32 +146,32 @@ func (m *MockResourceInterface) Get(arg0 context.Context, arg1 string, arg2 v1.G } // Get indicates an expected call of Get. -func (mr *MockResourceInterfaceMockRecorder) Get(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Get(ctx, name, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, name, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockResourceInterface)(nil).Get), varargs...) } // List mocks base method. -func (m *MockResourceInterface) List(arg0 context.Context, arg1 v1.ListOptions) (*unstructured.UnstructuredList, error) { +func (m *MockResourceInterface) List(ctx context.Context, opts v1.ListOptions) (*unstructured.UnstructuredList, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "List", arg0, arg1) + ret := m.ctrl.Call(m, "List", ctx, opts) ret0, _ := ret[0].(*unstructured.UnstructuredList) ret1, _ := ret[1].(error) return ret0, ret1 } // List indicates an expected call of List. -func (mr *MockResourceInterfaceMockRecorder) List(arg0, arg1 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) List(ctx, opts any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockResourceInterface)(nil).List), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockResourceInterface)(nil).List), ctx, opts) } // Patch mocks base method. -func (m *MockResourceInterface) Patch(arg0 context.Context, arg1 string, arg2 types.PatchType, arg3 []byte, arg4 v1.PatchOptions, arg5 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, options v1.PatchOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3, arg4} - for _, a := range arg5 { + varargs := []any{ctx, name, pt, data, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Patch", varargs...) @@ -180,17 +181,17 @@ func (m *MockResourceInterface) Patch(arg0 context.Context, arg1 string, arg2 ty } // Patch indicates an expected call of Patch. -func (mr *MockResourceInterfaceMockRecorder) Patch(arg0, arg1, arg2, arg3, arg4 any, arg5 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Patch(ctx, name, pt, data, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3, arg4}, arg5...) + varargs := append([]any{ctx, name, pt, data, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Patch", reflect.TypeOf((*MockResourceInterface)(nil).Patch), varargs...) } // Update mocks base method. -func (m *MockResourceInterface) Update(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.UpdateOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Update(ctx context.Context, obj *unstructured.Unstructured, options v1.UpdateOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Update", varargs...) @@ -200,38 +201,38 @@ func (m *MockResourceInterface) Update(arg0 context.Context, arg1 *unstructured. } // Update indicates an expected call of Update. -func (mr *MockResourceInterfaceMockRecorder) Update(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Update(ctx, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockResourceInterface)(nil).Update), varargs...) } // UpdateStatus mocks base method. -func (m *MockResourceInterface) UpdateStatus(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.UpdateOptions) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) UpdateStatus(ctx context.Context, obj *unstructured.Unstructured, options v1.UpdateOptions) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdateStatus", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "UpdateStatus", ctx, obj, options) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].(error) return ret0, ret1 } // UpdateStatus indicates an expected call of UpdateStatus. -func (mr *MockResourceInterfaceMockRecorder) UpdateStatus(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) UpdateStatus(ctx, obj, options any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateStatus", reflect.TypeOf((*MockResourceInterface)(nil).UpdateStatus), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateStatus", reflect.TypeOf((*MockResourceInterface)(nil).UpdateStatus), ctx, obj, options) } // Watch mocks base method. -func (m *MockResourceInterface) Watch(arg0 context.Context, arg1 v1.ListOptions) (watch.Interface, error) { +func (m *MockResourceInterface) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Watch", arg0, arg1) + ret := m.ctrl.Call(m, "Watch", ctx, opts) ret0, _ := ret[0].(watch.Interface) ret1, _ := ret[1].(error) return ret0, ret1 } // Watch indicates an expected call of Watch. -func (mr *MockResourceInterfaceMockRecorder) Watch(arg0, arg1 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Watch(ctx, opts any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockResourceInterface)(nil).Watch), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockResourceInterface)(nil).Watch), ctx, opts) } diff --git a/pkg/stores/sqlproxy/proxy_mocks_test.go b/pkg/stores/sqlproxy/proxy_mocks_test.go index 909e8a05..b0279a9e 100644 --- a/pkg/stores/sqlproxy/proxy_mocks_test.go +++ b/pkg/stores/sqlproxy/proxy_mocks_test.go @@ -32,6 +32,7 @@ import ( type MockCache struct { ctrl *gomock.Controller recorder *MockCacheMockRecorder + isgomock struct{} } // MockCacheMockRecorder is the mock recorder for MockCache. @@ -52,9 +53,9 @@ func (m *MockCache) EXPECT() *MockCacheMockRecorder { } // ListByOptions mocks base method. -func (m *MockCache) ListByOptions(arg0 context.Context, arg1 *sqltypes.ListOptions, arg2 []partition.Partition, arg3 string) (*unstructured.UnstructuredList, int, string, error) { +func (m *MockCache) ListByOptions(ctx context.Context, lo *sqltypes.ListOptions, partitions []partition.Partition, namespace string) (*unstructured.UnstructuredList, int, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ListByOptions", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "ListByOptions", ctx, lo, partitions, namespace) ret0, _ := ret[0].(*unstructured.UnstructuredList) ret1, _ := ret[1].(int) ret2, _ := ret[2].(string) @@ -63,15 +64,16 @@ func (m *MockCache) ListByOptions(arg0 context.Context, arg1 *sqltypes.ListOptio } // ListByOptions indicates an expected call of ListByOptions. -func (mr *MockCacheMockRecorder) ListByOptions(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockCacheMockRecorder) ListByOptions(ctx, lo, partitions, namespace any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListByOptions", reflect.TypeOf((*MockCache)(nil).ListByOptions), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListByOptions", reflect.TypeOf((*MockCache)(nil).ListByOptions), ctx, lo, partitions, namespace) } // MockClientGetter is a mock of ClientGetter interface. type MockClientGetter struct { ctrl *gomock.Controller recorder *MockClientGetterMockRecorder + isgomock struct{} } // MockClientGetterMockRecorder is the mock recorder for MockClientGetter. @@ -92,18 +94,18 @@ func (m *MockClientGetter) EXPECT() *MockClientGetterMockRecorder { } // AdminClient mocks base method. -func (m *MockClientGetter) AdminClient(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 string, arg3 rest.WarningHandler) (dynamic.ResourceInterface, error) { +func (m *MockClientGetter) AdminClient(ctx *types.APIRequest, arg1 *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AdminClient", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "AdminClient", ctx, arg1, namespace, warningHandler) ret0, _ := ret[0].(dynamic.ResourceInterface) ret1, _ := ret[1].(error) return ret0, ret1 } // AdminClient indicates an expected call of AdminClient. -func (mr *MockClientGetterMockRecorder) AdminClient(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockClientGetterMockRecorder) AdminClient(ctx, arg1, namespace, warningHandler any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AdminClient", reflect.TypeOf((*MockClientGetter)(nil).AdminClient), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AdminClient", reflect.TypeOf((*MockClientGetter)(nil).AdminClient), ctx, arg1, namespace, warningHandler) } // AdminK8sInterface mocks base method. @@ -122,33 +124,33 @@ func (mr *MockClientGetterMockRecorder) AdminK8sInterface() *gomock.Call { } // Client mocks base method. -func (m *MockClientGetter) Client(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 string, arg3 rest.WarningHandler) (dynamic.ResourceInterface, error) { +func (m *MockClientGetter) Client(ctx *types.APIRequest, arg1 *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Client", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "Client", ctx, arg1, namespace, warningHandler) ret0, _ := ret[0].(dynamic.ResourceInterface) ret1, _ := ret[1].(error) return ret0, ret1 } // Client indicates an expected call of Client. -func (mr *MockClientGetterMockRecorder) Client(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockClientGetterMockRecorder) Client(ctx, arg1, namespace, warningHandler any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Client", reflect.TypeOf((*MockClientGetter)(nil).Client), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Client", reflect.TypeOf((*MockClientGetter)(nil).Client), ctx, arg1, namespace, warningHandler) } // DynamicClient mocks base method. -func (m *MockClientGetter) DynamicClient(arg0 *types.APIRequest, arg1 rest.WarningHandler) (dynamic.Interface, error) { +func (m *MockClientGetter) DynamicClient(ctx *types.APIRequest, warningHandler rest.WarningHandler) (dynamic.Interface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DynamicClient", arg0, arg1) + ret := m.ctrl.Call(m, "DynamicClient", ctx, warningHandler) ret0, _ := ret[0].(dynamic.Interface) ret1, _ := ret[1].(error) return ret0, ret1 } // DynamicClient indicates an expected call of DynamicClient. -func (mr *MockClientGetterMockRecorder) DynamicClient(arg0, arg1 any) *gomock.Call { +func (mr *MockClientGetterMockRecorder) DynamicClient(ctx, warningHandler any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DynamicClient", reflect.TypeOf((*MockClientGetter)(nil).DynamicClient), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DynamicClient", reflect.TypeOf((*MockClientGetter)(nil).DynamicClient), ctx, warningHandler) } // IsImpersonating mocks base method. @@ -166,84 +168,85 @@ func (mr *MockClientGetterMockRecorder) IsImpersonating() *gomock.Call { } // K8sInterface mocks base method. -func (m *MockClientGetter) K8sInterface(arg0 *types.APIRequest) (kubernetes.Interface, error) { +func (m *MockClientGetter) K8sInterface(ctx *types.APIRequest) (kubernetes.Interface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "K8sInterface", arg0) + ret := m.ctrl.Call(m, "K8sInterface", ctx) ret0, _ := ret[0].(kubernetes.Interface) ret1, _ := ret[1].(error) return ret0, ret1 } // K8sInterface indicates an expected call of K8sInterface. -func (mr *MockClientGetterMockRecorder) K8sInterface(arg0 any) *gomock.Call { +func (mr *MockClientGetterMockRecorder) K8sInterface(ctx any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "K8sInterface", reflect.TypeOf((*MockClientGetter)(nil).K8sInterface), arg0) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "K8sInterface", reflect.TypeOf((*MockClientGetter)(nil).K8sInterface), ctx) } // TableAdminClient mocks base method. -func (m *MockClientGetter) TableAdminClient(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 string, arg3 rest.WarningHandler) (dynamic.ResourceInterface, error) { +func (m *MockClientGetter) TableAdminClient(ctx *types.APIRequest, arg1 *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "TableAdminClient", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "TableAdminClient", ctx, arg1, namespace, warningHandler) ret0, _ := ret[0].(dynamic.ResourceInterface) ret1, _ := ret[1].(error) return ret0, ret1 } // TableAdminClient indicates an expected call of TableAdminClient. -func (mr *MockClientGetterMockRecorder) TableAdminClient(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockClientGetterMockRecorder) TableAdminClient(ctx, arg1, namespace, warningHandler any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableAdminClient", reflect.TypeOf((*MockClientGetter)(nil).TableAdminClient), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableAdminClient", reflect.TypeOf((*MockClientGetter)(nil).TableAdminClient), ctx, arg1, namespace, warningHandler) } // TableAdminClientForWatch mocks base method. -func (m *MockClientGetter) TableAdminClientForWatch(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 string, arg3 rest.WarningHandler) (dynamic.ResourceInterface, error) { +func (m *MockClientGetter) TableAdminClientForWatch(ctx *types.APIRequest, arg1 *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "TableAdminClientForWatch", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "TableAdminClientForWatch", ctx, arg1, namespace, warningHandler) ret0, _ := ret[0].(dynamic.ResourceInterface) ret1, _ := ret[1].(error) return ret0, ret1 } // TableAdminClientForWatch indicates an expected call of TableAdminClientForWatch. -func (mr *MockClientGetterMockRecorder) TableAdminClientForWatch(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockClientGetterMockRecorder) TableAdminClientForWatch(ctx, arg1, namespace, warningHandler any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableAdminClientForWatch", reflect.TypeOf((*MockClientGetter)(nil).TableAdminClientForWatch), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableAdminClientForWatch", reflect.TypeOf((*MockClientGetter)(nil).TableAdminClientForWatch), ctx, arg1, namespace, warningHandler) } // TableClient mocks base method. -func (m *MockClientGetter) TableClient(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 string, arg3 rest.WarningHandler) (dynamic.ResourceInterface, error) { +func (m *MockClientGetter) TableClient(ctx *types.APIRequest, arg1 *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "TableClient", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "TableClient", ctx, arg1, namespace, warningHandler) ret0, _ := ret[0].(dynamic.ResourceInterface) ret1, _ := ret[1].(error) return ret0, ret1 } // TableClient indicates an expected call of TableClient. -func (mr *MockClientGetterMockRecorder) TableClient(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockClientGetterMockRecorder) TableClient(ctx, arg1, namespace, warningHandler any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableClient", reflect.TypeOf((*MockClientGetter)(nil).TableClient), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableClient", reflect.TypeOf((*MockClientGetter)(nil).TableClient), ctx, arg1, namespace, warningHandler) } // TableClientForWatch mocks base method. -func (m *MockClientGetter) TableClientForWatch(arg0 *types.APIRequest, arg1 *types.APISchema, arg2 string, arg3 rest.WarningHandler) (dynamic.ResourceInterface, error) { +func (m *MockClientGetter) TableClientForWatch(ctx *types.APIRequest, arg1 *types.APISchema, namespace string, warningHandler rest.WarningHandler) (dynamic.ResourceInterface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "TableClientForWatch", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "TableClientForWatch", ctx, arg1, namespace, warningHandler) ret0, _ := ret[0].(dynamic.ResourceInterface) ret1, _ := ret[1].(error) return ret0, ret1 } // TableClientForWatch indicates an expected call of TableClientForWatch. -func (mr *MockClientGetterMockRecorder) TableClientForWatch(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockClientGetterMockRecorder) TableClientForWatch(ctx, arg1, namespace, warningHandler any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableClientForWatch", reflect.TypeOf((*MockClientGetter)(nil).TableClientForWatch), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TableClientForWatch", reflect.TypeOf((*MockClientGetter)(nil).TableClientForWatch), ctx, arg1, namespace, warningHandler) } // MockCacheFactory is a mock of CacheFactory interface. type MockCacheFactory struct { ctrl *gomock.Controller recorder *MockCacheFactoryMockRecorder + isgomock struct{} } // MockCacheFactoryMockRecorder is the mock recorder for MockCacheFactory. @@ -264,18 +267,18 @@ func (m *MockCacheFactory) EXPECT() *MockCacheFactoryMockRecorder { } // CacheFor mocks base method. -func (m *MockCacheFactory) CacheFor(arg0 context.Context, arg1 [][]string, arg2 cache.TransformFunc, arg3 dynamic.ResourceInterface, arg4 schema.GroupVersionKind, arg5, arg6 bool) (factory.Cache, error) { +func (m *MockCacheFactory) CacheFor(ctx context.Context, fields [][]string, transform cache.TransformFunc, client dynamic.ResourceInterface, gvk schema.GroupVersionKind, namespaced, watchable bool) (factory.Cache, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CacheFor", arg0, arg1, arg2, arg3, arg4, arg5, arg6) + ret := m.ctrl.Call(m, "CacheFor", ctx, fields, transform, client, gvk, namespaced, watchable) ret0, _ := ret[0].(factory.Cache) ret1, _ := ret[1].(error) return ret0, ret1 } // CacheFor indicates an expected call of CacheFor. -func (mr *MockCacheFactoryMockRecorder) CacheFor(arg0, arg1, arg2, arg3, arg4, arg5, arg6 any) *gomock.Call { +func (mr *MockCacheFactoryMockRecorder) CacheFor(ctx, fields, transform, client, gvk, namespaced, watchable any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CacheFor", reflect.TypeOf((*MockCacheFactory)(nil).CacheFor), arg0, arg1, arg2, arg3, arg4, arg5, arg6) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CacheFor", reflect.TypeOf((*MockCacheFactory)(nil).CacheFor), ctx, fields, transform, client, gvk, namespaced, watchable) } // Reset mocks base method. @@ -296,6 +299,7 @@ func (mr *MockCacheFactoryMockRecorder) Reset() *gomock.Call { type MockSchemaColumnSetter struct { ctrl *gomock.Controller recorder *MockSchemaColumnSetterMockRecorder + isgomock struct{} } // MockSchemaColumnSetterMockRecorder is the mock recorder for MockSchemaColumnSetter. @@ -316,23 +320,24 @@ func (m *MockSchemaColumnSetter) EXPECT() *MockSchemaColumnSetterMockRecorder { } // SetColumns mocks base method. -func (m *MockSchemaColumnSetter) SetColumns(arg0 context.Context, arg1 *types.APISchema) error { +func (m *MockSchemaColumnSetter) SetColumns(ctx context.Context, arg1 *types.APISchema) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetColumns", arg0, arg1) + ret := m.ctrl.Call(m, "SetColumns", ctx, arg1) ret0, _ := ret[0].(error) return ret0 } // SetColumns indicates an expected call of SetColumns. -func (mr *MockSchemaColumnSetterMockRecorder) SetColumns(arg0, arg1 any) *gomock.Call { +func (mr *MockSchemaColumnSetterMockRecorder) SetColumns(ctx, arg1 any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetColumns", reflect.TypeOf((*MockSchemaColumnSetter)(nil).SetColumns), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetColumns", reflect.TypeOf((*MockSchemaColumnSetter)(nil).SetColumns), ctx, arg1) } // MockRelationshipNotifier is a mock of RelationshipNotifier interface. type MockRelationshipNotifier struct { ctrl *gomock.Controller recorder *MockRelationshipNotifierMockRecorder + isgomock struct{} } // MockRelationshipNotifierMockRecorder is the mock recorder for MockRelationshipNotifier. @@ -353,23 +358,24 @@ func (m *MockRelationshipNotifier) EXPECT() *MockRelationshipNotifierMockRecorde } // OnInboundRelationshipChange mocks base method. -func (m *MockRelationshipNotifier) OnInboundRelationshipChange(arg0 context.Context, arg1 *types.APISchema, arg2 string) <-chan *summary.Relationship { +func (m *MockRelationshipNotifier) OnInboundRelationshipChange(ctx context.Context, arg1 *types.APISchema, namespace string) <-chan *summary.Relationship { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "OnInboundRelationshipChange", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "OnInboundRelationshipChange", ctx, arg1, namespace) ret0, _ := ret[0].(<-chan *summary.Relationship) return ret0 } // OnInboundRelationshipChange indicates an expected call of OnInboundRelationshipChange. -func (mr *MockRelationshipNotifierMockRecorder) OnInboundRelationshipChange(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockRelationshipNotifierMockRecorder) OnInboundRelationshipChange(ctx, arg1, namespace any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnInboundRelationshipChange", reflect.TypeOf((*MockRelationshipNotifier)(nil).OnInboundRelationshipChange), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "OnInboundRelationshipChange", reflect.TypeOf((*MockRelationshipNotifier)(nil).OnInboundRelationshipChange), ctx, arg1, namespace) } // MockTransformBuilder is a mock of TransformBuilder interface. type MockTransformBuilder struct { ctrl *gomock.Controller recorder *MockTransformBuilderMockRecorder + isgomock struct{} } // MockTransformBuilderMockRecorder is the mock recorder for MockTransformBuilder. @@ -390,15 +396,15 @@ func (m *MockTransformBuilder) EXPECT() *MockTransformBuilderMockRecorder { } // GetTransformFunc mocks base method. -func (m *MockTransformBuilder) GetTransformFunc(arg0 schema.GroupVersionKind, arg1 []common.ColumnDefinition) cache.TransformFunc { +func (m *MockTransformBuilder) GetTransformFunc(gvk schema.GroupVersionKind, colDefs []common.ColumnDefinition) cache.TransformFunc { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetTransformFunc", arg0, arg1) + ret := m.ctrl.Call(m, "GetTransformFunc", gvk, colDefs) ret0, _ := ret[0].(cache.TransformFunc) return ret0 } // GetTransformFunc indicates an expected call of GetTransformFunc. -func (mr *MockTransformBuilderMockRecorder) GetTransformFunc(arg0, arg1 any) *gomock.Call { +func (mr *MockTransformBuilderMockRecorder) GetTransformFunc(gvk, colDefs any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTransformFunc", reflect.TypeOf((*MockTransformBuilder)(nil).GetTransformFunc), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTransformFunc", reflect.TypeOf((*MockTransformBuilder)(nil).GetTransformFunc), gvk, colDefs) } diff --git a/pkg/stores/sqlproxy/sql_informer_mocks_test.go b/pkg/stores/sqlproxy/sql_informer_mocks_test.go index 3588449a..cc39ad6d 100644 --- a/pkg/stores/sqlproxy/sql_informer_mocks_test.go +++ b/pkg/stores/sqlproxy/sql_informer_mocks_test.go @@ -25,6 +25,7 @@ import ( type MockByOptionsLister struct { ctrl *gomock.Controller recorder *MockByOptionsListerMockRecorder + isgomock struct{} } // MockByOptionsListerMockRecorder is the mock recorder for MockByOptionsLister. @@ -45,9 +46,9 @@ func (m *MockByOptionsLister) EXPECT() *MockByOptionsListerMockRecorder { } // ListByOptions mocks base method. -func (m *MockByOptionsLister) ListByOptions(arg0 context.Context, arg1 *sqltypes.ListOptions, arg2 []partition.Partition, arg3 string) (*unstructured.UnstructuredList, int, string, error) { +func (m *MockByOptionsLister) ListByOptions(ctx context.Context, lo *sqltypes.ListOptions, partitions []partition.Partition, namespace string) (*unstructured.UnstructuredList, int, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ListByOptions", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "ListByOptions", ctx, lo, partitions, namespace) ret0, _ := ret[0].(*unstructured.UnstructuredList) ret1, _ := ret[1].(int) ret2, _ := ret[2].(string) @@ -56,21 +57,21 @@ func (m *MockByOptionsLister) ListByOptions(arg0 context.Context, arg1 *sqltypes } // ListByOptions indicates an expected call of ListByOptions. -func (mr *MockByOptionsListerMockRecorder) ListByOptions(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockByOptionsListerMockRecorder) ListByOptions(ctx, lo, partitions, namespace any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListByOptions", reflect.TypeOf((*MockByOptionsLister)(nil).ListByOptions), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ListByOptions", reflect.TypeOf((*MockByOptionsLister)(nil).ListByOptions), ctx, lo, partitions, namespace) } // Watch mocks base method. -func (m *MockByOptionsLister) Watch(arg0 context.Context, arg1 informer.WatchOptions, arg2 chan<- watch.Event) error { +func (m *MockByOptionsLister) Watch(ctx context.Context, options informer.WatchOptions, eventsCh chan<- watch.Event) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Watch", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "Watch", ctx, options, eventsCh) ret0, _ := ret[0].(error) return ret0 } // Watch indicates an expected call of Watch. -func (mr *MockByOptionsListerMockRecorder) Watch(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockByOptionsListerMockRecorder) Watch(ctx, options, eventsCh any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockByOptionsLister)(nil).Watch), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockByOptionsLister)(nil).Watch), ctx, options, eventsCh) } diff --git a/pkg/stores/sqlproxy/tablelistconvert/dynamic_mocks_test.go b/pkg/stores/sqlproxy/tablelistconvert/dynamic_mocks_test.go index 3b81b8b5..c3b2ec9e 100644 --- a/pkg/stores/sqlproxy/tablelistconvert/dynamic_mocks_test.go +++ b/pkg/stores/sqlproxy/tablelistconvert/dynamic_mocks_test.go @@ -24,6 +24,7 @@ import ( type MockResourceInterface struct { ctrl *gomock.Controller recorder *MockResourceInterfaceMockRecorder + isgomock struct{} } // MockResourceInterfaceMockRecorder is the mock recorder for MockResourceInterface. @@ -44,10 +45,10 @@ func (m *MockResourceInterface) EXPECT() *MockResourceInterfaceMockRecorder { } // Apply mocks base method. -func (m *MockResourceInterface) Apply(arg0 context.Context, arg1 string, arg2 *unstructured.Unstructured, arg3 v1.ApplyOptions, arg4 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Apply(ctx context.Context, name string, obj *unstructured.Unstructured, options v1.ApplyOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3} - for _, a := range arg4 { + varargs := []any{ctx, name, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Apply", varargs...) @@ -57,32 +58,32 @@ func (m *MockResourceInterface) Apply(arg0 context.Context, arg1 string, arg2 *u } // Apply indicates an expected call of Apply. -func (mr *MockResourceInterfaceMockRecorder) Apply(arg0, arg1, arg2, arg3 any, arg4 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Apply(ctx, name, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3}, arg4...) + varargs := append([]any{ctx, name, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Apply", reflect.TypeOf((*MockResourceInterface)(nil).Apply), varargs...) } // ApplyStatus mocks base method. -func (m *MockResourceInterface) ApplyStatus(arg0 context.Context, arg1 string, arg2 *unstructured.Unstructured, arg3 v1.ApplyOptions) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) ApplyStatus(ctx context.Context, name string, obj *unstructured.Unstructured, options v1.ApplyOptions) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ApplyStatus", arg0, arg1, arg2, arg3) + ret := m.ctrl.Call(m, "ApplyStatus", ctx, name, obj, options) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].(error) return ret0, ret1 } // ApplyStatus indicates an expected call of ApplyStatus. -func (mr *MockResourceInterfaceMockRecorder) ApplyStatus(arg0, arg1, arg2, arg3 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) ApplyStatus(ctx, name, obj, options any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplyStatus", reflect.TypeOf((*MockResourceInterface)(nil).ApplyStatus), arg0, arg1, arg2, arg3) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplyStatus", reflect.TypeOf((*MockResourceInterface)(nil).ApplyStatus), ctx, name, obj, options) } // Create mocks base method. -func (m *MockResourceInterface) Create(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.CreateOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Create(ctx context.Context, obj *unstructured.Unstructured, options v1.CreateOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Create", varargs...) @@ -92,17 +93,17 @@ func (m *MockResourceInterface) Create(arg0 context.Context, arg1 *unstructured. } // Create indicates an expected call of Create. -func (mr *MockResourceInterfaceMockRecorder) Create(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Create(ctx, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Create", reflect.TypeOf((*MockResourceInterface)(nil).Create), varargs...) } // Delete mocks base method. -func (m *MockResourceInterface) Delete(arg0 context.Context, arg1 string, arg2 v1.DeleteOptions, arg3 ...string) error { +func (m *MockResourceInterface) Delete(ctx context.Context, name string, options v1.DeleteOptions, subresources ...string) error { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, name, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Delete", varargs...) @@ -111,31 +112,31 @@ func (m *MockResourceInterface) Delete(arg0 context.Context, arg1 string, arg2 v } // Delete indicates an expected call of Delete. -func (mr *MockResourceInterfaceMockRecorder) Delete(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Delete(ctx, name, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, name, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Delete", reflect.TypeOf((*MockResourceInterface)(nil).Delete), varargs...) } // DeleteCollection mocks base method. -func (m *MockResourceInterface) DeleteCollection(arg0 context.Context, arg1 v1.DeleteOptions, arg2 v1.ListOptions) error { +func (m *MockResourceInterface) DeleteCollection(ctx context.Context, options v1.DeleteOptions, listOptions v1.ListOptions) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteCollection", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "DeleteCollection", ctx, options, listOptions) ret0, _ := ret[0].(error) return ret0 } // DeleteCollection indicates an expected call of DeleteCollection. -func (mr *MockResourceInterfaceMockRecorder) DeleteCollection(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) DeleteCollection(ctx, options, listOptions any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCollection", reflect.TypeOf((*MockResourceInterface)(nil).DeleteCollection), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCollection", reflect.TypeOf((*MockResourceInterface)(nil).DeleteCollection), ctx, options, listOptions) } // Get mocks base method. -func (m *MockResourceInterface) Get(arg0 context.Context, arg1 string, arg2 v1.GetOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Get(ctx context.Context, name string, options v1.GetOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, name, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Get", varargs...) @@ -145,32 +146,32 @@ func (m *MockResourceInterface) Get(arg0 context.Context, arg1 string, arg2 v1.G } // Get indicates an expected call of Get. -func (mr *MockResourceInterfaceMockRecorder) Get(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Get(ctx, name, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, name, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Get", reflect.TypeOf((*MockResourceInterface)(nil).Get), varargs...) } // List mocks base method. -func (m *MockResourceInterface) List(arg0 context.Context, arg1 v1.ListOptions) (*unstructured.UnstructuredList, error) { +func (m *MockResourceInterface) List(ctx context.Context, opts v1.ListOptions) (*unstructured.UnstructuredList, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "List", arg0, arg1) + ret := m.ctrl.Call(m, "List", ctx, opts) ret0, _ := ret[0].(*unstructured.UnstructuredList) ret1, _ := ret[1].(error) return ret0, ret1 } // List indicates an expected call of List. -func (mr *MockResourceInterfaceMockRecorder) List(arg0, arg1 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) List(ctx, opts any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockResourceInterface)(nil).List), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "List", reflect.TypeOf((*MockResourceInterface)(nil).List), ctx, opts) } // Patch mocks base method. -func (m *MockResourceInterface) Patch(arg0 context.Context, arg1 string, arg2 types.PatchType, arg3 []byte, arg4 v1.PatchOptions, arg5 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Patch(ctx context.Context, name string, pt types.PatchType, data []byte, options v1.PatchOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2, arg3, arg4} - for _, a := range arg5 { + varargs := []any{ctx, name, pt, data, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Patch", varargs...) @@ -180,17 +181,17 @@ func (m *MockResourceInterface) Patch(arg0 context.Context, arg1 string, arg2 ty } // Patch indicates an expected call of Patch. -func (mr *MockResourceInterfaceMockRecorder) Patch(arg0, arg1, arg2, arg3, arg4 any, arg5 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Patch(ctx, name, pt, data, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2, arg3, arg4}, arg5...) + varargs := append([]any{ctx, name, pt, data, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Patch", reflect.TypeOf((*MockResourceInterface)(nil).Patch), varargs...) } // Update mocks base method. -func (m *MockResourceInterface) Update(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.UpdateOptions, arg3 ...string) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) Update(ctx context.Context, obj *unstructured.Unstructured, options v1.UpdateOptions, subresources ...string) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - varargs := []any{arg0, arg1, arg2} - for _, a := range arg3 { + varargs := []any{ctx, obj, options} + for _, a := range subresources { varargs = append(varargs, a) } ret := m.ctrl.Call(m, "Update", varargs...) @@ -200,38 +201,38 @@ func (m *MockResourceInterface) Update(arg0 context.Context, arg1 *unstructured. } // Update indicates an expected call of Update. -func (mr *MockResourceInterfaceMockRecorder) Update(arg0, arg1, arg2 any, arg3 ...any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Update(ctx, obj, options any, subresources ...any) *gomock.Call { mr.mock.ctrl.T.Helper() - varargs := append([]any{arg0, arg1, arg2}, arg3...) + varargs := append([]any{ctx, obj, options}, subresources...) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Update", reflect.TypeOf((*MockResourceInterface)(nil).Update), varargs...) } // UpdateStatus mocks base method. -func (m *MockResourceInterface) UpdateStatus(arg0 context.Context, arg1 *unstructured.Unstructured, arg2 v1.UpdateOptions) (*unstructured.Unstructured, error) { +func (m *MockResourceInterface) UpdateStatus(ctx context.Context, obj *unstructured.Unstructured, options v1.UpdateOptions) (*unstructured.Unstructured, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UpdateStatus", arg0, arg1, arg2) + ret := m.ctrl.Call(m, "UpdateStatus", ctx, obj, options) ret0, _ := ret[0].(*unstructured.Unstructured) ret1, _ := ret[1].(error) return ret0, ret1 } // UpdateStatus indicates an expected call of UpdateStatus. -func (mr *MockResourceInterfaceMockRecorder) UpdateStatus(arg0, arg1, arg2 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) UpdateStatus(ctx, obj, options any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateStatus", reflect.TypeOf((*MockResourceInterface)(nil).UpdateStatus), arg0, arg1, arg2) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateStatus", reflect.TypeOf((*MockResourceInterface)(nil).UpdateStatus), ctx, obj, options) } // Watch mocks base method. -func (m *MockResourceInterface) Watch(arg0 context.Context, arg1 v1.ListOptions) (watch.Interface, error) { +func (m *MockResourceInterface) Watch(ctx context.Context, opts v1.ListOptions) (watch.Interface, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Watch", arg0, arg1) + ret := m.ctrl.Call(m, "Watch", ctx, opts) ret0, _ := ret[0].(watch.Interface) ret1, _ := ret[1].(error) return ret0, ret1 } // Watch indicates an expected call of Watch. -func (mr *MockResourceInterfaceMockRecorder) Watch(arg0, arg1 any) *gomock.Call { +func (mr *MockResourceInterfaceMockRecorder) Watch(ctx, opts any) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockResourceInterface)(nil).Watch), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Watch", reflect.TypeOf((*MockResourceInterface)(nil).Watch), ctx, opts) } diff --git a/pkg/stores/sqlproxy/tablelistconvert/watch_mocks_test.go b/pkg/stores/sqlproxy/tablelistconvert/watch_mocks_test.go index a4217b16..2d1be4ec 100644 --- a/pkg/stores/sqlproxy/tablelistconvert/watch_mocks_test.go +++ b/pkg/stores/sqlproxy/tablelistconvert/watch_mocks_test.go @@ -20,6 +20,7 @@ import ( type MockInterface struct { ctrl *gomock.Controller recorder *MockInterfaceMockRecorder + isgomock struct{} } // MockInterfaceMockRecorder is the mock recorder for MockInterface.