From 34d07c8899b8a52532e93ef1c9b2509fb0772122 Mon Sep 17 00:00:00 2001 From: Friedrich Date: Tue, 17 Dec 2024 12:30:44 +0100 Subject: [PATCH] chore: cherry pick for 1.2.2 (#482) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Unify NATS CR description in Kyma dashboard (#378) * chore: add information about high availability of NATS servers (#365) * chore: add information about high availability of NATS servers * updated * Update 02-configuration.md * deps(dependabot): bump google.golang.org/protobuf from 1.31.0 to 1.33.0 (#348) Bumps google.golang.org/protobuf from 1.31.0 to 1.33.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump golangci/golangci-lint-action from 4.0.0 to 6.0.1 (#377) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4.0.0 to 6.0.1. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v4.0.0...v6.0.1) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/docker/docker from 24.0.7+incompatible to 24.0.9+incompatible (#353) deps(dependabot): bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 24.0.7+incompatible to 24.0.9+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v24.0.7...v24.0.9) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump amannn/action-semantic-pull-request from 5.4.0 to 5.5.3 (#389) deps(dependabot): bump amannn/action-semantic-pull-request Bumps [amannn/action-semantic-pull-request](https://github.com/amannn/action-semantic-pull-request) from 5.4.0 to 5.5.3. - [Release notes](https://github.com/amannn/action-semantic-pull-request/releases) - [Changelog](https://github.com/amannn/action-semantic-pull-request/blob/main/CHANGELOG.md) - [Commits](https://github.com/amannn/action-semantic-pull-request/compare/e9fabac35e210fea40ca5b14c0da95a099eff26f...0723387faaf9b38adef4775cd42cfd5155ed6017) --- updated-dependencies: - dependency-name: amannn/action-semantic-pull-request dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: update go version to 1.22.5 (#390) * update go version * correct alpine number * deps(dependabot): bump github.com/nats-io/nats-server/v2 from 2.10.11 to 2.10.17 (#391) deps(dependabot): bump github.com/nats-io/nats-server/v2 Bumps [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server) from 2.10.11 to 2.10.17. - [Release notes](https://github.com/nats-io/nats-server/releases) - [Changelog](https://github.com/nats-io/nats-server/blob/main/.goreleaser.yml) - [Commits](https://github.com/nats-io/nats-server/compare/v2.10.11...v2.10.17) --- updated-dependencies: - dependency-name: github.com/nats-io/nats-server/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump dependencies (#396) * chore: bump dependencies * fixed owner link * deps(dependabot): upgrade modules fix multiple dependabot prs (#403) * Delete external CRD folder * Upgrade go modules to fix DependaBot PRs * deps(dependabot): bump github.com/onsi/gomega from 1.33.1 to 1.34.0 (#405) Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.33.1 to 1.34.0. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.33.1...v1.34.0) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/docker/docker from 25.0.5+incompatible to 26.1.4+incompatible (#406) deps(dependabot): bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 25.0.5+incompatible to 26.1.4+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v25.0.5...v26.1.4) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/onsi/gomega from 1.34.0 to 1.34.1 (#407) Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.34.0 to 1.34.1. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.34.0...v1.34.1) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/vektra/mockery/v2 from 2.43.2 to 2.44.1 (#408) deps(dependabot): bump github.com/vektra/mockery/v2 Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.43.2 to 2.44.1. - [Release notes](https://github.com/vektra/mockery/releases) - [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md) - [Commits](https://github.com/vektra/mockery/compare/v2.43.2...v2.44.1) --- updated-dependencies: - dependency-name: github.com/vektra/mockery/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump golangci/golangci-lint-action from 6.0.1 to 6.1.0 (#409) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6.0.1 to 6.1.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v6.0.1...v6.1.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump dependencies (#415) * chore: bump dependencies * updated * updated * updated * chore: bump dependencies (#417) * bump golang builder image * bump golang version * fix builder image dir * deps(dependabot): bump github.com/docker/docker from 26.1.4+incompatible to 26.1.5+incompatible (#416) deps(dependabot): bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 26.1.4+incompatible to 26.1.5+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v26.1.4...v26.1.5) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/vektra/mockery/v2 from 2.44.2 to 2.45.0 (#419) deps(dependabot): bump github.com/vektra/mockery/v2 Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.44.2 to 2.45.0. - [Release notes](https://github.com/vektra/mockery/releases) - [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md) - [Commits](https://github.com/vektra/mockery/compare/v2.44.2...v2.45.0) --- updated-dependencies: - dependency-name: github.com/vektra/mockery/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/prometheus/client_golang from 1.20.0 to 1.20.2 (#418) deps(dependabot): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.0 to 1.20.2. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.20.0...v1.20.2) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: upgrade golangci-lint version to v1.60.3 (#422) * deps(dependabot): bump github.com/nats-io/nats-server/v2 from 2.10.18 to 2.10.20 (#421) deps(dependabot): bump github.com/nats-io/nats-server/v2 Bumps [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server) from 2.10.18 to 2.10.20. - [Release notes](https://github.com/nats-io/nats-server/releases) - [Changelog](https://github.com/nats-io/nats-server/blob/main/.goreleaser.yml) - [Commits](https://github.com/nats-io/nats-server/compare/v2.10.18...v2.10.20) --- updated-dependencies: - dependency-name: github.com/nats-io/nats-server/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/onsi/gomega from 1.34.1 to 1.34.2 (#420) Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.34.1 to 1.34.2. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.34.1...v1.34.2) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * docs: update the contributing file (#423) * deps(dependabot): bump github.com/prometheus/client_golang from 1.20.2 to 1.20.3 (#424) deps(dependabot): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.2 to 1.20.3. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/v1.20.3/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.20.2...v1.20.3) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: added github action based build jobs (#431) added github action based build jobs * chore: replace prow build job waiting with github action (#433) * replace prow build job waiting with github action * updated * updated * updated * updated * chore: image bump (#432) * image bump * image bump * chore: bump golang version to 1.23.1 (#434) bump golang version * fix: remove prow reference (#436) remove prow reference * deps(dependabot): bump github.com/vektra/mockery/v2 from 2.46.0 to 2.46.1 (#438) deps(dependabot): bump github.com/vektra/mockery/v2 Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.46.0 to 2.46.1. - [Release notes](https://github.com/vektra/mockery/releases) - [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md) - [Commits](https://github.com/vektra/mockery/compare/v2.46.0...v2.46.1) --- updated-dependencies: - dependency-name: github.com/vektra/mockery/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/nats-io/nats-server/v2 from 2.10.20 to 2.10.21 (#439) deps(dependabot): bump github.com/nats-io/nats-server/v2 Bumps [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server) from 2.10.20 to 2.10.21. - [Release notes](https://github.com/nats-io/nats-server/releases) - [Changelog](https://github.com/nats-io/nats-server/blob/main/.goreleaser.yml) - [Commits](https://github.com/nats-io/nats-server/compare/v2.10.20...v2.10.21) --- updated-dependencies: - dependency-name: github.com/nats-io/nats-server/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump golangci/golangci-lint-action from 6.1.0 to 6.1.1 (#442) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6.1.0 to 6.1.1. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](https://github.com/golangci/golangci-lint-action/compare/v6.1.0...v6.1.1) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/vektra/mockery/v2 from 2.46.1 to 2.46.2 (#441) deps(dependabot): bump github.com/vektra/mockery/v2 Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.46.1 to 2.46.2. - [Release notes](https://github.com/vektra/mockery/releases) - [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md) - [Commits](https://github.com/vektra/mockery/compare/v2.46.1...v2.46.2) --- updated-dependencies: - dependency-name: github.com/vektra/mockery/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/vektra/mockery/v2 from 2.46.2 to 2.46.3 (#443) deps(dependabot): bump github.com/vektra/mockery/v2 Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.46.2 to 2.46.3. - [Release notes](https://github.com/vektra/mockery/releases) - [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md) - [Commits](https://github.com/vektra/mockery/compare/v2.46.2...v2.46.3) --- updated-dependencies: - dependency-name: github.com/vektra/mockery/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump helm.sh/helm/v3 from 3.16.1 to 3.16.2 (#444) Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.16.1 to 3.16.2. - [Release notes](https://github.com/helm/helm/releases) - [Commits](https://github.com/helm/helm/compare/v3.16.1...v3.16.2) --- updated-dependencies: - dependency-name: helm.sh/helm/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/prometheus/client_golang from 1.20.4 to 1.20.5 (#446) deps(dependabot): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.20.4 to 1.20.5. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.20.4...v1.20.5) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/nats-io/nats-server/v2 from 2.10.21 to 2.10.22 (#445) deps(dependabot): bump github.com/nats-io/nats-server/v2 Bumps [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server) from 2.10.21 to 2.10.22. - [Release notes](https://github.com/nats-io/nats-server/releases) - [Changelog](https://github.com/nats-io/nats-server/blob/main/.goreleaser.yml) - [Commits](https://github.com/nats-io/nats-server/compare/v2.10.21...v2.10.22) --- updated-dependencies: - dependency-name: github.com/nats-io/nats-server/v2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump sigs.k8s.io/controller-runtime from 0.19.0 to 0.19.1 (#448) deps(dependabot): bump sigs.k8s.io/controller-runtime Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.19.0 to 0.19.1. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes-sigs/controller-runtime/compare/v0.19.0...v0.19.1) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump k8s.io/apiextensions-apiserver from 0.31.1 to 0.31.2 (#449) deps(dependabot): bump k8s.io/apiextensions-apiserver Bumps [k8s.io/apiextensions-apiserver](https://github.com/kubernetes/apiextensions-apiserver) from 0.31.1 to 0.31.2. - [Release notes](https://github.com/kubernetes/apiextensions-apiserver/releases) - [Commits](https://github.com/kubernetes/apiextensions-apiserver/compare/v0.31.1...v0.31.2) --- updated-dependencies: - dependency-name: k8s.io/apiextensions-apiserver dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump kyma-project/prod/external/library/golang from 1.23.1-alpine3.20 to 1.23.2-alpine3.20 (#453) deps(dependabot): bump kyma-project/prod/external/library/golang Bumps kyma-project/prod/external/library/golang from 1.23.1-alpine3.20 to 1.23.2-alpine3.20. --- updated-dependencies: - dependency-name: kyma-project/prod/external/library/golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * docs: remove a broken link (#447) remove broken link * deps(dependabot): bump k8s.io/cli-runtime from 0.31.1 to 0.31.2 (#454) Bumps [k8s.io/cli-runtime](https://github.com/kubernetes/cli-runtime) from 0.31.1 to 0.31.2. - [Commits](https://github.com/kubernetes/cli-runtime/compare/v0.31.1...v0.31.2) --- updated-dependencies: - dependency-name: k8s.io/cli-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/onsi/gomega from 1.34.2 to 1.35.1 (#455) Bumps [github.com/onsi/gomega](https://github.com/onsi/gomega) from 1.34.2 to 1.35.1. - [Release notes](https://github.com/onsi/gomega/releases) - [Changelog](https://github.com/onsi/gomega/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/gomega/compare/v1.34.2...v1.35.1) --- updated-dependencies: - dependency-name: github.com/onsi/gomega dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/vektra/mockery/v2 from 2.46.3 to 2.47.0 (#457) deps(dependabot): bump github.com/vektra/mockery/v2 Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.46.3 to 2.47.0. - [Release notes](https://github.com/vektra/mockery/releases) - [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md) - [Commits](https://github.com/vektra/mockery/compare/v2.46.3...v2.47.0) --- updated-dependencies: - dependency-name: github.com/vektra/mockery/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump helm.sh/helm/v3 from 3.16.2 to 3.16.3 (#456) Bumps [helm.sh/helm/v3](https://github.com/helm/helm) from 3.16.2 to 3.16.3. - [Release notes](https://github.com/helm/helm/releases) - [Commits](https://github.com/helm/helm/compare/v3.16.2...v3.16.3) --- updated-dependencies: - dependency-name: helm.sh/helm/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * docs: replace Remedy with Solution (#458) docs: Replace Remedy with Solution * deps(dependabot): bump kyma-project/prod/external/library/golang from 1.23.2-alpine3.20 to 1.23.3-alpine3.20 (#459) deps(dependabot): bump kyma-project/prod/external/library/golang Bumps kyma-project/prod/external/library/golang from 1.23.2-alpine3.20 to 1.23.3-alpine3.20. --- updated-dependencies: - dependency-name: kyma-project/prod/external/library/golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: upgrade depenedencies (#465) Upgrade depenedencies * deps(dependabot): bump kyma-project/prod/external/library/golang from 1.23.3-alpine3.20 to 1.23.4-alpine3.20 (#467) deps(dependabot): bump kyma-project/prod/external/library/golang Bumps kyma-project/prod/external/library/golang from 1.23.3-alpine3.20 to 1.23.4-alpine3.20. --- updated-dependencies: - dependency-name: kyma-project/prod/external/library/golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump sigs.k8s.io/controller-runtime from 0.19.2 to 0.19.3 (#469) deps(dependabot): bump sigs.k8s.io/controller-runtime Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.19.2 to 0.19.3. - [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases) - [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md) - [Commits](https://github.com/kubernetes-sigs/controller-runtime/compare/v0.19.2...v0.19.3) --- updated-dependencies: - dependency-name: sigs.k8s.io/controller-runtime dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * deps(dependabot): bump github.com/vektra/mockery/v2 from 2.49.1 to 2.50.0 (#468) deps(dependabot): bump github.com/vektra/mockery/v2 Bumps [github.com/vektra/mockery/v2](https://github.com/vektra/mockery) from 2.49.1 to 2.50.0. - [Release notes](https://github.com/vektra/mockery/releases) - [Changelog](https://github.com/vektra/mockery/blob/master/docs/changelog.md) - [Commits](https://github.com/vektra/mockery/compare/v2.49.1...v2.50.0) --- updated-dependencies: - dependency-name: github.com/vektra/mockery/v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: bump dependencies (#470) bump dependencies * fix: retry functions (#478) * fix the retry functions * add comment * chore: bump dependencies and tooling (#481) * bump dependencies and tooling * bump go version * update helm * fix table in docs * fix table in docs * fix table in docs * update sec-scenners-config --------- Signed-off-by: dependabot[bot] Co-authored-by: Małgorzata Świeca Co-authored-by: Muhammad Faizan Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Carina Kothe <69976260+grischperl@users.noreply.github.com> Co-authored-by: Mansur Uralov Co-authored-by: Tibor Kiss <32801432+the1bit@users.noreply.github.com> Co-authored-by: Natalia Sitko <80401180+nataliasitko@users.noreply.github.com> Co-authored-by: Nina Hingerl <76950046+NHingerl@users.noreply.github.com> --- .github/workflows/codequality.yml | 6 +- .github/workflows/create-release.yaml | 46 +- .github/workflows/lint-conventional-prs.yml | 2 +- .github/workflows/pull-build-image.yaml | 18 + .github/workflows/pull-e2e-test.yml | 112 +- .github/workflows/pull-e2e-upgrade-test.yaml | 88 -- .github/workflows/push-build-image.yaml | 39 + .github/workflows/push-e2e-upgrade-test.yaml | 49 +- .github/workflows/tag-build-image.yaml | 37 + .golangci.yaml | 4 + CONTRIBUTING.md | 5 +- Dockerfile | 8 +- Makefile | 4 +- README.md | 2 +- .../bases/operator.kyma-project.io_nats.yaml | 29 +- config/rbac/role.yaml | 37 +- config/ui-extensions/nats/general | 4 +- docs/contributor/testing.md | 11 +- docs/contributor/troubleshooting.md | 2 +- docs/user/02-configuration.md | 72 +- e2e/common/retry.go | 20 +- go.mod | 179 ++- go.sum | 451 ++++--- internal/controller/nats/controller.go | 2 +- internal/controller/nats/mocks/controller.go | 254 +--- internal/controller/nats/mocks/manager.go | 73 +- internal/controller/nats/mocks/natsconn.go | 203 ---- .../controller/nats/mocks/typed_controller.go | 236 ++++ internal/controller/nats/status.go | 43 +- internal/controller/nats/status_test.go | 15 - pkg/k8s/chart/mocks/renderer.go | 2 +- pkg/k8s/mocks/client.go | 2 +- pkg/manager/mocks/manager.go | 2 +- pkg/metrics/mocks/collector.go | 22 +- pkg/nats/client.go | 2 + pkg/nats/client_unit_test.go | 12 +- pkg/nats/mocks/client.go | 12 +- pkg/nats/mocks/conn.go | 215 ++++ .../nats/mocks/jet_stream_context.go | 1054 ++++++++++------- sec-scanners-config.yaml | 4 +- 40 files changed, 1861 insertions(+), 1517 deletions(-) create mode 100644 .github/workflows/pull-build-image.yaml delete mode 100644 .github/workflows/pull-e2e-upgrade-test.yaml create mode 100644 .github/workflows/push-build-image.yaml create mode 100644 .github/workflows/tag-build-image.yaml delete mode 100644 internal/controller/nats/mocks/natsconn.go create mode 100644 internal/controller/nats/mocks/typed_controller.go create mode 100644 pkg/nats/mocks/conn.go rename internal/controller/nats/mocks/js.go => pkg/nats/mocks/jet_stream_context.go (66%) diff --git a/.github/workflows/codequality.yml b/.github/workflows/codequality.yml index 6d806719..2ba08166 100644 --- a/.github/workflows/codequality.yml +++ b/.github/workflows/codequality.yml @@ -44,6 +44,8 @@ jobs: go-version-file: go.mod - name: golangci-lint - uses: golangci/golangci-lint-action@v4.0.0 + env: + GOGC: "90" # Garbage collection limit to avoid OOM errors + uses: golangci/golangci-lint-action@v6.1.1 with: - version: v1.57 + version: v1.62 diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml index de99a260..09107204 100644 --- a/.github/workflows/create-release.yaml +++ b/.github/workflows/create-release.yaml @@ -40,6 +40,7 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + token: ${{ secrets.GIT_BOT_TOKEN }} # creating git tag using bot token because GITHUB_TOKEN would not trigger build workflow (https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow). - name: Create changelog env: @@ -54,14 +55,13 @@ jobs: RELEASE_ID=$(./.github/scripts/create_draft_release.sh ${{ github.event.inputs.version }}) # this will use the CHANGELOG.md from the step 'Create changelog' echo "release_id=$RELEASE_ID" >> $GITHUB_OUTPUT - - name: Trigger 'release-nats-manager-build' prow job + - name: Add lightweight tag to trigger release build job + env: + GITHUB_TOKEN: ${{ secrets.GIT_BOT_TOKEN }} # creating git tag using bot token because GITHUB_TOKEN would not trigger build workflow (https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow). run: | git tag ${{ github.event.inputs.version }} git push origin ${{ github.event.inputs.version }} - - name: Wait for 'release-nats-manager-build' - run: ./.github/scripts/check-prow-build-job.sh ${{ github.ref_name }} 600 10 30 - - name: Create and upload nats-manager.yaml and nats-default-cr.yaml env: KUSTOMIZE_VERSION: "v4.5.6" @@ -71,9 +71,45 @@ jobs: outputs: release_id: ${{ steps.create-draft.outputs.release_id }} + wait-for-build-job: + name: Wait for build job + needs: [ create-draft ] + runs-on: ubuntu-latest + + steps: + - name: Checkout eventing-tools + uses: actions/checkout@v4 + with: + repository: 'kyma-project/eventing-tools' + path: 'kyma-project/eventing-tools' + ref: main + sparse-checkout: 'scripts/wait-for-commit-check' + + - name: Setup python + uses: actions/setup-python@v5 + with: + python-version: '3.10' + cache: 'pip' + + - name: Install requirements + run: | + pip install -r $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/requirements.txt + + - name: wait for build + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPOSITORY_FULL_NAME: ${{ github.repository_owner }}/nats-manager + GIT_REF: ${{ github.event.inputs.version }} + # The re-usable image-builder workflow from neighbors appends the "Build image" suffix to the check run name. + GIT_CHECK_RUN_NAME: "build-${{ github.event.inputs.version }} / Build image" + INTERVAL: 60 + TIMEOUT: 900 + run: | + python $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/run.py + publish-release: name: Publish release - needs: [verify-release-status, create-draft] + needs: [verify-release-status, create-draft, wait-for-build-job] runs-on: ubuntu-latest steps: diff --git a/.github/workflows/lint-conventional-prs.yml b/.github/workflows/lint-conventional-prs.yml index e1ef6e39..6ca1e72a 100644 --- a/.github/workflows/lint-conventional-prs.yml +++ b/.github/workflows/lint-conventional-prs.yml @@ -14,7 +14,7 @@ jobs: name: Check Title runs-on: ubuntu-latest steps: - - uses: amannn/action-semantic-pull-request@e9fabac35e210fea40ca5b14c0da95a099eff26f + - uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/.github/workflows/pull-build-image.yaml b/.github/workflows/pull-build-image.yaml new file mode 100644 index 00000000..e85dc3a9 --- /dev/null +++ b/.github/workflows/pull-build-image.yaml @@ -0,0 +1,18 @@ +name: Pull Build Image + +on: + pull_request_target: + types: [opened, edited, synchronize, reopened, ready_for_review] + +permissions: + id-token: write # This is required for requesting the JWT token + contents: read # This is required for actions/checkout + +jobs: + build: + uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main + with: + name: nats-manager + dockerfile: Dockerfile + context: . + export-tags: true diff --git a/.github/workflows/pull-e2e-test.yml b/.github/workflows/pull-e2e-test.yml index b3488503..7990ab06 100644 --- a/.github/workflows/pull-e2e-test.yml +++ b/.github/workflows/pull-e2e-test.yml @@ -15,7 +15,44 @@ on: - "sec-scanners-config.yaml" jobs: + wait-for-build-job: + name: Wait for build job + runs-on: ubuntu-latest + + steps: + - name: Checkout eventing-tools + uses: actions/checkout@v4 + with: + repository: 'kyma-project/eventing-tools' + path: 'kyma-project/eventing-tools' + ref: main + sparse-checkout: 'scripts/wait-for-commit-check' + + - name: Setup python + uses: actions/setup-python@v5 + with: + python-version: '3.10' + cache: 'pip' + + - name: Install requirements + run: | + pip install -r $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/requirements.txt + + - name: Wait for build job + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPOSITORY_FULL_NAME: ${{ github.repository_owner }}/nats-manager + GIT_REF: "${{ github.event.pull_request.head.sha }}" # Note: 'github.event.pull_request.head.sha' is not same as 'github.sha' on pull requests. + # The re-usable image-builder workflow from neighbors appends the "Build image" suffix to the check run name. + GIT_CHECK_RUN_NAME: "build / Build image" + INTERVAL: 60 + TIMEOUT: 900 + run: | + python $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/run.py + e2e: + name: e2e + needs: [ wait-for-build-job ] runs-on: ubuntu-latest steps: - name: Checkout @@ -45,19 +82,6 @@ jobs: run: | make install IMG=$DOCKER_IMAGE - - name: Wait for the 'pull-nats-manager-build' job to succeed - uses: kyma-project/wait-for-commit-status-action@2b3ffe09af8b6f40e1213d5fb7f91a7bd41ffb20 - with: - context: "pull-nats-manager-build" - commit_ref: "${{ github.event.pull_request.head.sha }}" # Note: 'github.event.pull_request.head.sha' is not same as 'github.sha' on pull requests. - timeout: 600000 # 10 minutes in milliseconds - # The check interval is kept long otherwise it will exhaust the GitHub rate limit (More info: https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting) - check_interval: 60000 # 1 minute in milliseconds - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - GITHUB_OWNER: "${{ github.repository_owner }}" - GITHUB_REPO: "nats-manager" - - name: Create kyma-system namespace run: | kubectl create namespace kyma-system @@ -116,5 +140,63 @@ jobs: run: | kubectl get nats --all-namespaces -# references: -# wait for other gh checks to finish: https://github.com/marketplace/actions/wait-for-check + e2e-upgrade: # This job tests the upgrade of NATS module from latest image of the main branch to the current commit. + name: e2e-upgrade + needs: [ wait-for-build-job ] + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Cache Go dependencies + uses: actions/setup-go@v5 + with: + go-version-file: "./go.mod" + check-latest: true + cache-dependency-path: "./go.sum" + + - run: go version + + - name: Install k3d tools + run: | + make -C hack/ci/ install-k3d-tools + + - name: Install Kyma CLI & setup k3d cluster using kyma CLI + run: | + make kyma + make -C hack/ci/ create-k3d + kubectl version + kubectl cluster-info + + - name: Install latest NATS manager from main branch + run: | + make -C hack/ci/ create-kyma-system-ns + make deploy IMG=europe-docker.pkg.dev/kyma-project/prod/nats-manager:main + + - name: Setup & test NATS CR + run: | + make e2e-setup + + - name: Install the new NATS manager from current commit + run: | + make deploy IMG=${DOCKER_IMAGE} + + - name: Wait for new changes to be reflected + # Waits for NATS-manager image to be updated and NATS CR readiness. + run: | + export MANAGER_IMAGE=${DOCKER_IMAGE} + make e2e-setup + + - name: Run NATS bench + run: | + go install github.com/nats-io/natscli/nats@latest + export PATH=$HOME/go/bin:$PATH + make e2e-bench + + - name: Test NATS-server + run: | + make e2e-nats-server + + - name: Cleanup NATS CR + run: | + make e2e-cleanup diff --git a/.github/workflows/pull-e2e-upgrade-test.yaml b/.github/workflows/pull-e2e-upgrade-test.yaml deleted file mode 100644 index 18d7c9d0..00000000 --- a/.github/workflows/pull-e2e-upgrade-test.yaml +++ /dev/null @@ -1,88 +0,0 @@ -name: pull-e2e-upgrade-test - -env: - DOCKER_IMAGE: europe-docker.pkg.dev/kyma-project/dev/nats-manager:PR-${{ github.event.number }} - E2E_LOG_LEVEL: debug - KYMA_STABILITY: "unstable" - KYMA: "./hack/kyma" - -on: - pull_request: - branches: ["main"] - paths-ignore: - - "docs/**" - - "**.md" - - "sec-scanners-config.yaml" - -jobs: - e2e-upgrade: # This job tests the upgrade of NATS module from latest image of the main branch to the current commit. - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Cache Go dependencies - uses: actions/setup-go@v5 - with: - go-version-file: "./go.mod" - check-latest: true - cache-dependency-path: "./go.sum" - - - run: go version - - - name: Install k3d tools - run: | - make -C hack/ci/ install-k3d-tools - - - name: Install Kyma CLI & setup k3d cluster using kyma CLI - run: | - make kyma - make -C hack/ci/ create-k3d - kubectl version - kubectl cluster-info - - - name: Install latest NATS manager from main branch - run: | - make -C hack/ci/ create-kyma-system-ns - make deploy IMG=europe-docker.pkg.dev/kyma-project/prod/nats-manager:main - - - name: Setup & test NATS CR - run: | - make e2e-setup - - - name: Wait for the 'pull-nats-manager-build' job to succeed - uses: kyma-project/wait-for-commit-status-action@2b3ffe09af8b6f40e1213d5fb7f91a7bd41ffb20 - with: - context: "pull-nats-manager-build" - commit_ref: "${{ github.event.pull_request.head.sha }}" # Note: 'github.event.pull_request.head.sha' is not same as 'github.sha' on pull requests. - timeout: 600000 # 10 minutes in milliseconds - # The check interval is kept long otherwise it will exhaust the GitHub rate limit (More info: https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting) - check_interval: 60000 # 1 minute in milliseconds - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - GITHUB_OWNER: "${{ github.repository_owner }}" - GITHUB_REPO: "nats-manager" - - - name: Install the new NATS manager from current commit - run: | - make deploy IMG=${DOCKER_IMAGE} - - - name: Wait for new changes to be reflected - # Waits for NATS-manager image to be updated and NATS CR readiness. - run: | - export MANAGER_IMAGE=${DOCKER_IMAGE} - make e2e-setup - - - name: Run NATS bench - run: | - go install github.com/nats-io/natscli/nats@latest - export PATH=$HOME/go/bin:$PATH - make e2e-bench - - - name: Test NATS-server - run: | - make e2e-nats-server - - - name: Cleanup NATS CR - run: | - make e2e-cleanup diff --git a/.github/workflows/push-build-image.yaml b/.github/workflows/push-build-image.yaml new file mode 100644 index 00000000..ea36a307 --- /dev/null +++ b/.github/workflows/push-build-image.yaml @@ -0,0 +1,39 @@ +name: Push Build Image + +on: + push: + branches: + - "main" + - "release-*" + paths-ignore: + - "docs/**" + +permissions: + id-token: write # This is required for requesting the JWT token + contents: read # This is required for actions/checkout + +jobs: + compute-tags: + runs-on: ubuntu-latest + outputs: + tags: ${{ steps.get_tag.outputs.TAGS }} + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Get the latest tag + id: get_tag + run: | + { + echo 'TAGS<> "$GITHUB_OUTPUT" + build: + needs: compute-tags + uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main + with: + name: nats-manager + dockerfile: Dockerfile + context: . + tags: ${{ needs.compute-tags.outputs.tags }} diff --git a/.github/workflows/push-e2e-upgrade-test.yaml b/.github/workflows/push-e2e-upgrade-test.yaml index 17b70e49..7a11bf4c 100644 --- a/.github/workflows/push-e2e-upgrade-test.yaml +++ b/.github/workflows/push-e2e-upgrade-test.yaml @@ -15,7 +15,43 @@ on: - "sec-scanners-config.yaml" jobs: + wait-for-build-job: + name: Wait for build job + runs-on: ubuntu-latest + + steps: + - name: Checkout eventing-tools + uses: actions/checkout@v4 + with: + repository: 'kyma-project/eventing-tools' + path: 'kyma-project/eventing-tools' + ref: main + sparse-checkout: 'scripts/wait-for-commit-check' + + - name: Setup python + uses: actions/setup-python@v5 + with: + python-version: '3.10' + cache: 'pip' + + - name: Install requirements + run: | + pip install -r $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/requirements.txt + + - name: Wait for build job + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPOSITORY_FULL_NAME: ${{ github.repository_owner }}/nats-manager + GIT_REF: "${{ github.sha }}" + # The re-usable image-builder workflow from neighbors appends the "Build image" suffix to the check run name. + GIT_CHECK_RUN_NAME: "build / Build image" + INTERVAL: 60 + TIMEOUT: 900 + run: | + python $GITHUB_WORKSPACE/kyma-project/eventing-tools/scripts/wait-for-commit-check/run.py + e2e-upgrade: # This job tests the upgrade of NATS module from latest release from fast channel to current commit. + needs: [ wait-for-build-job ] runs-on: ubuntu-latest steps: - name: Checkout @@ -50,19 +86,6 @@ jobs: run: | make e2e-setup - - name: Wait for the 'post-nats-manager-build' job to succeed - uses: kyma-project/wait-for-commit-status-action@2b3ffe09af8b6f40e1213d5fb7f91a7bd41ffb20 - with: - context: "post-nats-manager-build" - commit_ref: "${{ github.sha }}" - timeout: 600000 # 10 minutes in milliseconds - # The check interval is kept long otherwise it will exhaust the GitHub rate limit (More info: https://docs.github.com/en/rest/overview/resources-in-the-rest-api?apiVersion=2022-11-28#rate-limiting) - check_interval: 60000 # 1 minute in milliseconds - env: - GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - GITHUB_OWNER: "${{ github.repository_owner }}" - GITHUB_REPO: "nats-manager" - - name: Install the new NATS manager from current commit env: COMMIT_SHA: "${{ github.sha }}" diff --git a/.github/workflows/tag-build-image.yaml b/.github/workflows/tag-build-image.yaml new file mode 100644 index 00000000..de10c920 --- /dev/null +++ b/.github/workflows/tag-build-image.yaml @@ -0,0 +1,37 @@ +name: Tag Build Image + +on: + push: + tags: + - '[0-9]+.[0-9]+.[0-9]+' # This will trigger the workflow when a tag (x.y.z) is pushed. + +permissions: + id-token: write # This is required for requesting the JWT token + contents: read # This is required for actions/checkout + +jobs: + compute-tags: + runs-on: ubuntu-latest + outputs: + tags: ${{ steps.get_tag.outputs.TAGS }} + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Get the latest tag + id: get_tag + run: | + { + echo 'TAGS<> "$GITHUB_OUTPUT" + build: + name: build-${{ github.ref_name }} # The release pipeline will check the status of this job by this name format (e.g. build-1.0.1). + needs: compute-tags + uses: kyma-project/test-infra/.github/workflows/image-builder.yml@main + with: + name: nats-manager + dockerfile: Dockerfile + context: . + tags: ${{ needs.compute-tags.outputs.tags }} diff --git a/.golangci.yaml b/.golangci.yaml index 2a2fbbfe..1565c7c1 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -149,6 +149,8 @@ linters-settings: alias: kscheme - pkg: sigs.k8s.io/controller-runtime alias: kcontrollerruntime + - pkg: "sigs.k8s.io/controller-runtime/pkg/reconcile" + alias: kcontrollerruntimereconcile - pkg: github.com/onsi/gomega/types alias: onsigomegatypes - pkg: sigs.k8s.io/controller-runtime/pkg/log @@ -165,6 +167,8 @@ linters-settings: alias: klogzap - pkg: github.com/kyma-project/nats-manager/pkg/k8s/mocks alias: nmkmocks + - pkg: github.com/kyma-project/nats-manager/pkg/nats/mocks + alias: nmnatsmocks - pkg: k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 alias: kapiextv1 - pkg: k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 71bc0fc6..091082b2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,4 +1,3 @@ +# Contributing -## Overview - -To contribute to this project, follow the general [contributing](https://github.com/kyma-project/community/blob/main/docs/contributing/02-contributing.md) guidelines. +To contribute to this project, follow the general [Contributing Rules](https://github.com/kyma-project/community/blob/main/docs/contributing/02-contributing.md). diff --git a/Dockerfile b/Dockerfile index 329b516c..06b331e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ # Build the manager binary -FROM europe-docker.pkg.dev/kyma-project/prod/external/golang:1.22.2-alpine3.19 as builder +FROM europe-docker.pkg.dev/kyma-project/prod/external/library/golang:1.23.4-alpine3.20 AS builder ARG TARGETOS ARG TARGETARCH -WORKDIR /workspace +WORKDIR /app # Copy the Go Modules manifests COPY go.mod go.mod COPY go.sum go.sum @@ -31,8 +31,8 @@ FROM gcr.io/distroless/static:nonroot LABEL source = git@github.com:kyma-project/nats-manager.git WORKDIR / -COPY --from=builder /workspace/manager . -COPY --from=builder /workspace/resources/nats resources/nats +COPY --from=builder /app/manager . +COPY --from=builder /app/resources/nats resources/nats USER nonroot:nonroot ENTRYPOINT ["/manager"] diff --git a/Makefile b/Makefile index c3c413c8..ac92244c 100644 --- a/Makefile +++ b/Makefile @@ -237,8 +237,8 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest ## Tool Versions KUSTOMIZE_VERSION ?= v5.3.0 -CONTROLLER_TOOLS_VERSION ?= v0.14.0 -GOLANG_CI_LINT_VERSION ?= v1.57 +CONTROLLER_TOOLS_VERSION ?= v0.16.1 +GOLANG_CI_LINT_VERSION ?= v1.62 KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize diff --git a/README.md b/README.md index 3c7da9e9..abd460e6 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ This project aims to follow the [Kubernetes Operator pattern](https://kubernetes It uses [Controllers](https://kubernetes.io/docs/concepts/architecture/controller/), which provide a reconcile function responsible for synchronizing resources until the desired state is reached in the cluster. -This project is scaffolded using [Kubebuilder](https://book.kubebuilder.io), and all the Kubebuilder [`makefile` helpers](https://book.kubebuilder.io/reference/makefile-helpers.html) can be used. +This project is scaffolded using [Kubebuilder](https://book.kubebuilder.io). ## Installation diff --git a/config/crd/bases/operator.kyma-project.io_nats.yaml b/config/crd/bases/operator.kyma-project.io_nats.yaml index 3ce4be57..e24c70d8 100644 --- a/config/crd/bases/operator.kyma-project.io_nats.yaml +++ b/config/crd/bases/operator.kyma-project.io_nats.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.14.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: nats.operator.kyma-project.io spec: group: operator.kyma-project.io @@ -194,11 +194,9 @@ spec: Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. - This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. - This field is immutable. It can only be set for containers. items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. @@ -209,6 +207,12 @@ spec: the Pod where this field is used. It makes that resource available inside a container. type: string + request: + description: |- + Request is the name chosen for a request in the referenced claim. + If empty, everything from the claim is made available, otherwise + only the result of this request. + type: string required: - name type: object @@ -249,16 +253,8 @@ spec: type: integer conditions: items: - description: "Condition contains details for one aspect of the current - state of this API Resource.\n---\nThis struct is intended for - direct use as an array at the field path .status.conditions. For - example,\n\n\n\ttype FooStatus struct{\n\t // Represents the - observations of a foo's current state.\n\t // Known .status.conditions.type - are: \"Available\", \"Progressing\", and \"Degraded\"\n\t // - +patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t - \ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\" - patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t - \ // other fields\n\t}" + description: Condition contains details for one aspect of the current + state of this API Resource. properties: lastTransitionTime: description: |- @@ -299,12 +295,7 @@ spec: - Unknown type: string type: - description: |- - type of condition in CamelCase or in foo.example.com/CamelCase. - --- - Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - useful (see .node.status.conditions), the ability to deconflict is important. - The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) + description: type of condition in CamelCase or in foo.example.com/CamelCase. maxLength: 316 pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$ type: string diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index d24b8946..f7e2b911 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -4,13 +4,6 @@ kind: ClusterRole metadata: name: manager-role rules: -- apiGroups: - - "" - resources: - - configmaps - verbs: - - list - - watch - apiGroups: - "" resourceNames: @@ -28,29 +21,23 @@ rules: - apiGroups: - "" resources: - - events - verbs: - - create - - patch -- apiGroups: - - "" - resources: - - nodes + - configmaps + - secrets + - services verbs: - - get - list - watch - apiGroups: - "" resources: - - persistentvolumeclaims + - events verbs: - - delete - - list - - watch + - create + - patch - apiGroups: - "" resources: + - nodes - pods verbs: - get @@ -59,8 +46,9 @@ rules: - apiGroups: - "" resources: - - secrets + - persistentvolumeclaims verbs: + - delete - list - watch - apiGroups: @@ -77,13 +65,6 @@ rules: - patch - update - watch -- apiGroups: - - "" - resources: - - services - verbs: - - list - - watch - apiGroups: - "" resourceNames: diff --git a/config/ui-extensions/nats/general b/config/ui-extensions/nats/general index f2d4832e..bac451f4 100644 --- a/config/ui-extensions/nats/general +++ b/config/ui-extensions/nats/general @@ -11,5 +11,5 @@ features: disableCreate: false disableDelete: false description: >- - {{[NATS CR](https://github.com/kyma-project/nats-manager/blob/main/config/samples/default.yaml)}} - specifies NATS module. + {{[NATS custom resource](https://kyma-project.io/#/nats-manager/user/02-configuration)}} + configures the NATS module. diff --git a/docs/contributor/testing.md b/docs/contributor/testing.md index 1ac82607..7ebb302c 100644 --- a/docs/contributor/testing.md +++ b/docs/contributor/testing.md @@ -89,20 +89,11 @@ The E2E test consists of four consecutive steps. If desired, you can run them in ## CI/CD -This project uses [Prow](https://docs.prow.k8s.io/docs/) and [GitHub Actions](https://docs.github.com/en/actions) as part of the development cycle. +This project uses [GitHub Actions](https://docs.github.com/en/actions) as part of the development cycle. The aim is to verify the functional correctness of the NATS Manager. -### Prow jobs - -The Prow jobs that cover code of this repository reside in [their own repository](https://github.com/kyma-project/test-infra/tree/main/prow/jobs/kyma-project/nats-manager). -Presubmit jobs run on PRs and are marked with the prefix `pull`. Postsubmit jobs run on main after a PR was merged and carry the prefix `post`. - -For more information on execution details of each job, refer to their `description` field and the `command` and `args` fields. -Alternatively, you can access this information from your PR by inspecting the details to the job and viewing the Prow job `.yaml` file. - ### GitHub Actions GitHub Actions reside [within this module repository](https://github.com/kyma-project/nats-manager/tree/main/.github/workflows). -Pre- and postsubmit actions follow the same naming conventions as Prow jobs. The [Actions overview](https://github.com/kyma-project/nats-manager/actions/), shows all the existing workflows and their execution details. Here, you can also trigger a re-run of an action. diff --git a/docs/contributor/troubleshooting.md b/docs/contributor/troubleshooting.md index 00f6ebaa..34d37821 100644 --- a/docs/contributor/troubleshooting.md +++ b/docs/contributor/troubleshooting.md @@ -12,7 +12,7 @@ This document contains tips and tricks to common problems with the NATS Manager **Cause:** The namespace of the Deployment does not exist yet. -**Remedy:** Create the namespace. +**Solution:** Create the namespace. ```sh kubectl create ns kyma-system diff --git a/docs/user/02-configuration.md b/docs/user/02-configuration.md index c93f6a81..3b1e6dca 100644 --- a/docs/user/02-configuration.md +++ b/docs/user/02-configuration.md @@ -25,6 +25,10 @@ Use the following sample CRs as guidance. Each can be applied immediately when y - [Minimal CR](https://github.com/kyma-project/nats-manager/blob/main/config/samples/minimal.yaml#L1) - [Full spec CR](https://github.com/kyma-project/nats-manager/blob/main/config/samples/nats-full-spec.yaml#L1) +## High availability + +For high availability, the NATS servers must be set up across different availability zones for uninterrupted operation and uptime. NATS Manager deploys the NATS servers in the availability zones where your Kubernetes cluster has Nodes. If the Kubernetes cluster has Nodes distributed across at least three availability zones, NATS Manager automatically distributes the NATS servers across these availability zones. If the Kubernetes cluster doesn’t have Nodes distributed across at least three availability zones, high availability is compromised. + ## Reference @@ -32,44 +36,46 @@ Use the following sample CRs as guidance. Each can be applied immediately when y -### NATS.operator.kyma-project.io/v1alpha1 +### NATS.operator.Kyma-project.io/v1alpha1 **Spec:** -| Parameter | Type | Description | -|------------------------------------------------------------|------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **annotations** | map\[string\]string | Annotations allows to add annotations to NATS. | -| **cluster** | object | Cluster defines configurations that are specific to NATS clusters. | -| **cluster.​size** | integer | Size of a NATS cluster, i.e. number of NATS nodes. | -| **jetStream** | object | JetStream defines configurations that are specific to NATS JetStream. | -| **jetStream.​fileStorage** | object | FileStorage defines configurations to file storage in NATS JetStream. | -| **jetStream.​fileStorage.​size** | \{integer or string\} | Size defines the file storage size. | -| **jetStream.​fileStorage.​storageClassName** | string | StorageClassName defines the file storage class name. | -| **jetStream.​memStorage** | object | MemStorage defines configurations to memory storage in NATS JetStream. | -| **jetStream.​memStorage.​enabled** | boolean | Enabled allows the enablement of memory storage. | -| **jetStream.​memStorage.​size** | \{integer or string\} | Size defines the mem. | -| **labels** | map\[string\]string | Labels allows to add Labels to NATS. | -| **logging** | object | JetStream defines configurations that are specific to NATS logging in NATS. | -| **logging.​debug** | boolean | Debug allows debug logging. | -| **logging.​trace** | boolean | Trace allows trace logging. | -| **resources** | object | Resources defines resources for NATS. | -| **resources.​claims** | \[\]object | Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. This field is immutable. It can only be set for containers. | -| **resources.​claims.​name** (required) | string | Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. | -| **resources.​limits** | map\[string\]\{integer or string\} | Limits describes the maximum amount of compute resources allowed. Fore more information, check [Resource Management for Pods and Containers](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/). | -| **resources.​requests** | map\[string\]\{integer or string\} | Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. Fore more information, check [Resource Management for Pods and Containers](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/). | +| Parameter | Type | Description | +| ---- | ----------- | ---- | +| **annotations** | map\[string\]string | Annotations allows to add annotations to NATS. | +| **cluster** | object | Cluster defines configurations that are specific to NATS clusters. | +| **cluster.​size** | integer | Size of a NATS cluster, i.e. number of NATS nodes. | +| **jetStream** | object | JetStream defines configurations that are specific to NATS JetStream. | +| **jetStream.​fileStorage** | object | FileStorage defines configurations to file storage in NATS JetStream. | +| **jetStream.​fileStorage.​size** | \{integer or string\} | Size defines the file storage size. | +| **jetStream.​fileStorage.​storageClassName** | string | StorageClassName defines the file storage class name. | +| **jetStream.​memStorage** | object | MemStorage defines configurations to memory storage in NATS JetStream. | +| **jetStream.​memStorage.​enabled** | boolean | Enabled allows the enablement of memory storage. | +| **jetStream.​memStorage.​size** | \{integer or string\} | Size defines the mem. | +| **labels** | map\[string\]string | Labels allows to add Labels to NATS. | +| **logging** | object | JetStream defines configurations that are specific to NATS logging in NATS. | +| **logging.​debug** | boolean | Debug allows debug logging. | +| **logging.​trace** | boolean | Trace allows trace logging. | +| **resources** | object | Resources defines resources for NATS. | +| **resources.​claims** | \[\]object | Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. This field is immutable. It can only be set for containers.| +| **resources.​claims.​name** (required) | string | Name must match the name of one entry in Pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container.| +| **resources.​claims.​request** | string | Request is the name chosen for a request in the referenced claim. If empty, everything from the claim is made available, otherwise only the result of this request.| +| **resources.​limits** | map\[string\]\{integer or string\} | Limits describes the maximum amount of compute resources allowed. More info: | +| **resources.​requests** | map\[string\]\{integer or string\} | Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: | **Status:** -| Parameter | Type | Description | -|------------------------------------------------------|------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **conditions** | \[\]object | Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: "Available", "Progressing", and "Degraded" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []kmetav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"` // other fields } | -| **conditions.​lastTransitionTime** (required) | string | lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. | -| **conditions.​message** (required) | string | message is a human readable message indicating details about the transition. This may be an empty string. | -| **conditions.​observedGeneration** | integer | observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance. | -| **conditions.​reason** (required) | string | reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty. | -| **conditions.​status** (required) | string | status of the condition, one of True, False, Unknown. | -| **conditions.​type** (required) | string | type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt) | -| **state** (required) | string | | -| **url** | string | | +| Parameter | Type | Description | +| ---- | ----------- | ---- | +| **availabilityZonesUsed** | integer | | +| **conditions** | \[\]object | Condition contains details for one aspect of the current state of this API Resource. | +| **conditions.​lastTransitionTime** (required) | string | lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. | +| **conditions.​message** (required) | string | message is a human readable message indicating details about the transition. This may be an empty string.| +| **conditions.​observedGeneration** | integer | observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance. | +| **conditions.​reason** (required) | string | reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.| +| **conditions.​status** (required) | string | status of the condition, one of True, False, Unknown. | +| **conditions.​type** (required) | string | type of condition in CamelCase or in foo.example.com/CamelCase. | +| **state** (required) | string | | +| **url** | string | | diff --git a/e2e/common/retry.go b/e2e/common/retry.go index 9c8aee5d..a69d5cfb 100644 --- a/e2e/common/retry.go +++ b/e2e/common/retry.go @@ -8,15 +8,17 @@ func Retry(attempts int, interval time.Duration, fn func() error) error { ticker := time.NewTicker(interval) defer ticker.Stop() var err error - for range ticker.C { + + for attempts > 0 { + <-ticker.C // Wait for the ticker interval. attempts-- err = fn() - if err == nil || attempts == 0 { - return err + if err == nil { + return nil } } - // Return nil if all attempts fail. - return nil + // Return the err if all attempts fail. + return err } func RetryGet[T any](attempts int, interval time.Duration, fn func() (*T, error)) (*T, error) { @@ -24,11 +26,13 @@ func RetryGet[T any](attempts int, interval time.Duration, fn func() (*T, error) defer ticker.Stop() var err error var obj *T - for range ticker.C { + + for attempts > 0 { + <-ticker.C // Wait for the ticker interval. attempts-- obj, err = fn() - if err == nil || attempts == 0 { - return obj, err + if err == nil { + return obj, nil } } // Return nil object if all attempts fail. diff --git a/go.mod b/go.mod index 536e9025..57c33a55 100644 --- a/go.mod +++ b/go.mod @@ -1,99 +1,101 @@ module github.com/kyma-project/nats-manager -go 1.22.2 +go 1.23.4 require ( - dario.cat/mergo v1.0.0 + dario.cat/mergo v1.0.1 github.com/avast/retry-go/v3 v3.1.1 github.com/dustin/go-humanize v1.0.1 - github.com/go-logr/logr v1.4.1 + github.com/go-logr/logr v1.4.2 github.com/kelseyhightower/envconfig v1.4.0 - github.com/nats-io/nats-server/v2 v2.10.11 - github.com/nats-io/nats.go v1.33.1 - github.com/onsi/gomega v1.31.1 + github.com/nats-io/nats-server/v2 v2.10.23 + github.com/nats-io/nats.go v1.37.0 + github.com/onsi/gomega v1.36.1 github.com/pkg/errors v0.9.1 - github.com/prometheus/client_golang v1.18.0 - github.com/stretchr/testify v1.9.0 - github.com/vektra/mockery/v2 v2.42.0 + github.com/prometheus/client_golang v1.20.5 + github.com/stretchr/testify v1.10.0 + github.com/vektra/mockery/v2 v2.50.0 go.uber.org/zap v1.27.0 gopkg.in/yaml.v3 v3.0.1 - helm.sh/helm/v3 v3.14.2 - k8s.io/api v0.29.2 - k8s.io/apiextensions-apiserver v0.29.2 - k8s.io/apimachinery v0.29.2 - k8s.io/cli-runtime v0.29.2 - k8s.io/client-go v0.29.2 - k8s.io/utils v0.0.0-20240102154912-e7106e64919e - sigs.k8s.io/controller-runtime v0.17.2 + helm.sh/helm/v3 v3.16.4 + k8s.io/api v0.32.0 + k8s.io/apiextensions-apiserver v0.32.0 + k8s.io/apimachinery v0.32.0 + k8s.io/cli-runtime v0.32.0 + k8s.io/client-go v0.32.0 + k8s.io/utils v0.0.0-20241210054802-24370beab758 + sigs.k8s.io/controller-runtime v0.19.3 sigs.k8s.io/yaml v1.4.0 ) require ( github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect - github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/BurntSushi/toml v1.3.2 // indirect github.com/MakeNowJust/heredoc v1.0.0 // indirect github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/semver/v3 v3.2.1 // indirect - github.com/Masterminds/sprig/v3 v3.2.3 // indirect + github.com/Masterminds/semver/v3 v3.3.0 // indirect + github.com/Masterminds/sprig/v3 v3.3.0 // indirect github.com/Masterminds/squirrel v1.5.4 // indirect - github.com/Microsoft/hcsshim v0.11.4 // indirect - github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect + github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/blang/semver/v4 v4.0.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect github.com/chigopher/pathlib v0.19.1 // indirect - github.com/containerd/containerd v1.7.11 // indirect + github.com/containerd/containerd v1.7.23 // indirect + github.com/containerd/errdefs v0.3.0 // indirect github.com/containerd/log v0.1.0 // indirect - github.com/cyphar/filepath-securejoin v0.2.4 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/docker/cli v24.0.6+incompatible // indirect - github.com/docker/distribution v2.8.2+incompatible // indirect - github.com/docker/docker v24.0.7+incompatible // indirect + github.com/containerd/platforms v0.2.1 // indirect + github.com/cyphar/filepath-securejoin v0.3.4 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/distribution/reference v0.6.0 // indirect + github.com/docker/cli v25.0.1+incompatible // indirect + github.com/docker/distribution v2.8.3+incompatible // indirect + github.com/docker/docker v26.1.5+incompatible // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect - github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-connections v0.5.0 // indirect github.com/docker/go-metrics v0.0.1 // indirect - github.com/docker/go-units v0.5.0 // indirect github.com/emicklei/go-restful/v3 v3.11.0 // indirect - github.com/evanphx/json-patch v5.7.0+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.8.0 // indirect + github.com/evanphx/json-patch v5.9.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.9.0 // indirect github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect github.com/fatih/color v1.13.0 // indirect - github.com/felixge/httpsnoop v1.0.3 // 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 github.com/go-errors/errors v1.4.2 // indirect github.com/go-gorp/gorp/v3 v3.1.0 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-logr/zapr v1.3.0 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.3 // indirect + github.com/go-openapi/swag v0.23.0 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/btree v1.0.1 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect - github.com/google/uuid v1.3.0 // indirect + github.com/google/uuid v1.6.0 // indirect github.com/gorilla/mux v1.8.0 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/gosuri/uitable v0.0.4 // indirect - github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect + github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/huandu/xstrings v1.4.0 // indirect + github.com/huandu/xstrings v1.5.0 // indirect github.com/iancoleman/strcase v0.2.0 // indirect - github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jinzhu/copier v0.3.5 // indirect - github.com/jmoiron/sqlx v1.3.5 // indirect + github.com/jmoiron/sqlx v1.4.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.6 // indirect + github.com/klauspost/compress v1.17.11 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect github.com/lib/pq v1.10.9 // indirect @@ -103,83 +105,80 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.17 // indirect github.com/mattn/go-runewidth v0.0.9 // indirect - github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect - github.com/minio/highwayhash v1.0.2 // indirect + github.com/minio/highwayhash v1.0.3 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/moby/locker v1.0.1 // indirect - github.com/moby/spdystream v0.2.0 // indirect + github.com/moby/spdystream v0.5.0 // indirect github.com/moby/term v0.5.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect - github.com/morikuni/aec v1.0.0 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/nats-io/jwt/v2 v2.5.3 // indirect - github.com/nats-io/nkeys v0.4.7 // indirect + github.com/nats-io/jwt/v2 v2.5.8 // indirect + github.com/nats-io/nkeys v0.4.8 // indirect github.com/nats-io/nuid v1.0.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.1.0-rc5 // indirect + github.com/opencontainers/image-spec v1.1.0 // indirect github.com/pelletier/go-toml/v2 v2.0.6 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_model v0.5.0 // indirect - github.com/prometheus/common v0.45.0 // indirect - github.com/prometheus/procfs v0.12.0 // 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/procfs v0.15.1 // indirect github.com/rs/zerolog v1.29.0 // indirect - github.com/rubenv/sql-migrate v1.5.2 // indirect + github.com/rubenv/sql-migrate v1.7.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/shopspring/decimal v1.3.1 // indirect + github.com/shopspring/decimal v1.4.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/spf13/afero v1.9.3 // indirect - github.com/spf13/cast v1.5.0 // indirect - github.com/spf13/cobra v1.8.0 // indirect + github.com/spf13/cast v1.7.0 // indirect + github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.15.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/subosito/gotenv v1.4.2 // indirect + github.com/x448/float16 v0.8.4 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect github.com/xlab/treeprint v1.2.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect - go.opentelemetry.io/otel v1.19.0 // indirect - go.opentelemetry.io/otel/metric v1.19.0 // indirect - go.opentelemetry.io/otel/trace v1.19.0 // indirect - go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // 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/metric v1.28.0 // indirect + go.opentelemetry.io/otel/trace v1.28.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.19.0 // indirect - golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/oauth2 v0.12.0 // indirect - golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.17.0 // indirect - golang.org/x/term v0.17.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.17.0 // indirect + golang.org/x/crypto v0.31.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/oauth2 v0.23.0 // indirect + golang.org/x/sync v0.10.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/term v0.27.0 // indirect + golang.org/x/text v0.21.0 // indirect + golang.org/x/time v0.8.0 // indirect + golang.org/x/tools v0.26.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect - google.golang.org/grpc v1.58.3 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect + google.golang.org/grpc v1.65.0 // indirect + google.golang.org/protobuf v1.35.1 // indirect + gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apiserver v0.29.2 // indirect - k8s.io/component-base v0.29.2 // indirect - k8s.io/klog/v2 v2.110.1 // indirect - k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect - k8s.io/kubectl v0.29.0 // indirect - oras.land/oras-go v1.2.4 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect - sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + k8s.io/apiserver v0.32.0 // indirect + k8s.io/component-base v0.32.0 // indirect + k8s.io/klog/v2 v2.130.1 // indirect + k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect + k8s.io/kubectl v0.31.3 // indirect + oras.land/oras-go v1.2.5 // indirect + sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect + sigs.k8s.io/kustomize/api v0.18.0 // indirect + sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect ) diff --git a/go.sum b/go.sum index 9291568c..ab83e849 100644 --- a/go.sum +++ b/go.sum @@ -35,48 +35,51 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk= -dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= +dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= -github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= +github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= -github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= +github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= +github.com/DATA-DOG/go-sqlmock v1.5.2/go.mod h1:88MAG/4G7SMwSE3CeA0ZKzrT5CiOU3OJ+JlNzwDqpNU= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= -github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= -github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= -github.com/Masterminds/sprig/v3 v3.2.3 h1:eL2fZNezLomi0uOLqjQoN6BfsDD+fyLtgbJMAj9n6YA= -github.com/Masterminds/sprig/v3 v3.2.3/go.mod h1:rXcFaZ2zZbLRJv/xSysmlgIM1u11eBaRMhvYXJNkGuM= +github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0= +github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= +github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs= +github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0= github.com/Masterminds/squirrel v1.5.4 h1:uUcX/aBc8O7Fg9kaISIUsHXdKuqehiXAMQTYX8afzqM= github.com/Masterminds/squirrel v1.5.4/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA400rg+riTZj10= -github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= -github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= -github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= +github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY= +github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= +github.com/Microsoft/hcsshim v0.11.7 h1:vl/nj3Bar/CvJSYo7gIQPyRWc9f3c6IeSNavBTSZNZQ= +github.com/Microsoft/hcsshim v0.11.7/go.mod h1:MV8xMfmECjl5HdO7U/3/hFVnkmSBjAjmA09d4bExKcU= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 h1:4daAzAu0S6Vi7/lbWECcX0j45yZReDZ56BQsrVBOEEY= -github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= +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/avast/retry-go/v3 v3.1.1 h1:49Scxf4v8PmiQ/nY0aY3p0hDueqSmc7++cBbtiDGu2g= github.com/avast/retry-go/v3 v3.1.1/go.mod h1:6cXRK369RpzFL3UQGqIUp9Q7GDrams+KsYWrfNA1/nQ= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 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= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/bshuster-repo/logrus-logstash-hook v1.0.0 h1:e+C0SB5R1pu//O4MQ3f9cFuPGoOVeF2fE4Og9otCc70= github.com/bshuster-repo/logrus-logstash-hook v1.0.0/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZkEHchZRSq9OQbsSzIT/OrI8YFFmRIng= @@ -86,8 +89,8 @@ github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0Bsq github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chai2010/gettext-go v1.0.2 h1:1Lwwip6Q2QGsAdl/ZKPCwTe9fe0CjlUbqj5bFNSjIRk= github.com/chai2010/gettext-go v1.0.2/go.mod h1:y+wnP2cHYaVj19NZhYKAwEMH2CI1gNHeQQ+5AjwawxA= github.com/chigopher/pathlib v0.19.1 h1:RoLlUJc0CqBGwq239cilyhxPNLXTK+HXoASGyGznx5A= @@ -101,40 +104,45 @@ github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnht github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= -github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw= -github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE= +github.com/containerd/containerd v1.7.23 h1:H2CClyUkmpKAGlhQp95g2WXHfLYc7whAuvZGBNYOOwQ= +github.com/containerd/containerd v1.7.23/go.mod h1:7QUzfURqZWCZV7RLNEn1XjUCQLEf0bkaK4GjUaZehxw= github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= +github.com/containerd/errdefs v0.3.0 h1:FSZgGOeK4yuT/+DnF07/Olde/q4KBoMsaamhXxIMDp4= +github.com/containerd/errdefs v0.3.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M= github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= +github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A= +github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw= github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= -github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg= -github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/cyphar/filepath-securejoin v0.3.4 h1:VBWugsJh2ZxJmLFSM06/0qzQyiQX2Qs0ViKrUAcqdZ8= +github.com/cyphar/filepath-securejoin v0.3.4/go.mod h1:8s/MCNJREmFK0H02MF6Ihv1nakJe4L/w3WZLHNkvlYM= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2 h1:aBfCb7iqHmDEIp6fBvC/hQUddQfg+3qdYjwzaiP9Hnc= github.com/distribution/distribution/v3 v3.0.0-20221208165359-362910506bc2/go.mod h1:WHNsWjnIn2V1LYOrME7e8KxSeKunYHsxEm4am0BUtcI= -github.com/docker/cli v24.0.6+incompatible h1:fF+XCQCgJjjQNIMjzaSmiKJSCcfcXb3TWTcc7GAneOY= -github.com/docker/cli v24.0.6+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= -github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk= +github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= +github.com/docker/cli v25.0.1+incompatible h1:mFpqnrS6Hsm3v1k7Wa/BO23oz0k121MTbTO1lpcGSkU= +github.com/docker/cli v25.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= +github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v26.1.5+incompatible h1:NEAxTwEjxV6VbBMBoGG3zPqbiJosIApZjxlbrG9q3/g= +github.com/docker/docker v26.1.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.7.0 h1:xtCHsjxogADNZcdv1pKUHXryefjlVRqWqIhk/uXJp0A= github.com/docker/docker-credential-helpers v0.7.0/go.mod h1:rETQfLdHNT3foU5kuNkFR1R1V12OJRRO5lzt2D1b5X0= -github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= -github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= +github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c= +github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c h1:+pKlWGMw7gf6bQ+oDZB4KHQFypsfjYlq/C4rfL7D3g8= github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA= github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQV8= github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw= -github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= -github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4= github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1/go.mod h1:cyGadeNEkKy96OOhEzfZl+yxihPEzKnqJwvfuSUqbZE= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= @@ -147,22 +155,24 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v5.7.0+incompatible h1:vgGkfT/9f8zE6tvSCe74nfpAVDQ2tG6yudJd8LBksgI= -github.com/evanphx/json-patch v5.7.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro= -github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls= +github.com/evanphx/json-patch v5.9.0+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/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= -github.com/felixge/httpsnoop v1.0.3/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/foxcpp/go-mockdns v1.0.0 h1:7jBqxd3WDWwi/6WhDvacvH1XsN3rOLXyHM1uhvIx6FI= -github.com/foxcpp/go-mockdns v1.0.0/go.mod h1:lgRN6+KxQBawyIghpnl5CezHFGS9VLzvtVlwxvzXTQ4= -github.com/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= -github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/foxcpp/go-mockdns v1.1.0 h1:jI0rD8M0wuYAxL7r/ynTrCQQq0BVqfB99Vgk7DlmewI= +github.com/foxcpp/go-mockdns v1.1.0/go.mod h1:IhLeSFGed3mJIAXPH2aiRQB+kqz7oqu8ld2qVbOu7Wk= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA= github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= @@ -174,30 +184,25 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= -github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE= +github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= -github.com/gobuffalo/logger v1.0.6 h1:nnZNpxYo0zx+Aj9RfMPBm+x9zAU2OayFh/xrAWi34HU= -github.com/gobuffalo/logger v1.0.6/go.mod h1:J31TBEHR1QLV2683OXTAItYIg8pv2JMHnF/quuAbMjs= -github.com/gobuffalo/packd v1.0.1 h1:U2wXfRr4E9DH8IdsDLlRFwTZTK7hLfq9qT/QHXGVe/0= -github.com/gobuffalo/packd v1.0.1/go.mod h1:PP2POP3p3RXGz7Jh6eYEf93S7vA2za6xM7QT85L4+VY= -github.com/gobuffalo/packr/v2 v2.8.3 h1:xE1yzvnO56cUC0sTpKR3DIbxZgB54AftTFMhB2XEWlY= -github.com/gobuffalo/packr/v2 v2.8.3/go.mod h1:0SahksCVcx4IMnigTjiFuyldmTrdTctXsOdiU5KwbKc= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -231,9 +236,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -251,7 +255,6 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= 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= @@ -271,15 +274,14 @@ github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db h1:097atOisP2aRj7vFgYQBbFN4U4JNXUNYpxael3UzMyo= +github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= -github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= @@ -287,13 +289,12 @@ github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gosuri/uitable v0.0.4 h1:IG2xLKRvErL3uhY6e1BylFzG+aJiwQviDDTfOKeKTpY= github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= -github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= +github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -305,22 +306,18 @@ github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+l github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/huandu/xstrings v1.3.3/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= -github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= -github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/huandu/xstrings v1.5.0 h1:2ag3IFq9ZDANvthTwTiqSSZLjDc+BedvHPAp5tJy2TI= +github.com/huandu/xstrings v1.5.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= -github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= -github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= -github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= +github.com/jmoiron/sqlx v1.4.0 h1:1PLqN7S1UYp5t4SrVVnt4nUVNemrDAtxlulVe+Qgm3o= +github.com/jmoiron/sqlx v1.4.0/go.mod h1:ZrZ7UsYB/weZdl2Bxg6jCRO9c3YHl8r3ahlKmRT4JLY= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -330,14 +327,12 @@ github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHm github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= -github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8= github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= 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.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI= -github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc= +github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -349,11 +344,12 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= +github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 h1:SOEGU9fKiNWd/HOJuq6+3iTQz8KNCLtVX6idSoTLdUw= github.com/lann/builder v0.0.0-20180802200727-47ae307949d0/go.mod h1:dXGbAdH5GtBTC4WfIxhKZfyBF/HBFgRZSWwZ9g/He9o= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 h1:P6pPBnrTSX3DEVR4fDembhRWSsG5rVo6hYhAB/ADZrk= github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0/go.mod h1:vmVJ0l/dxyfGW6FmdpVm2joNMFikkuWg0EoCKLGUMNw= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= @@ -362,12 +358,6 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/markbates/errx v1.1.0 h1:QDFeR+UP95dO12JgW+tgi2UVfo0V8YBHiUIOaeBPiEI= -github.com/markbates/errx v1.1.0/go.mod h1:PLa46Oex9KNbVDZhKel8v1OT7hD5JZ2eI7AHhA0wswc= -github.com/markbates/oncer v1.0.0 h1:E83IaVAHygyndzPimgUYJjbshhDTALZyXxvk9FOlQRY= -github.com/markbates/oncer v1.0.0/go.mod h1:Z59JA581E9GP6w96jai+TGqafHPW+cPfRxz2aSZ0mcI= -github.com/markbates/safe v1.0.1 h1:yjZkbvRM6IzKj9tlu/zMJLS0n/V351OZWRnF3QfaUxI= -github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -379,17 +369,13 @@ github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPn github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= -github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU= +github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= -github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+k= -github.com/miekg/dns v1.1.25 h1:dFwPR6SfLtrSwgDcIq2bcU/gVutB4sNApq2HBdqcakg= -github.com/miekg/dns v1.1.25/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= -github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= -github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFWgYaq1OVrnRcwhnw= +github.com/miekg/dns v1.1.57 h1:Jzi7ApEIzwEPLHWRcafCN9LZSBbqQpxjt/wpgvg7wcM= +github.com/miekg/dns v1.1.57/go.mod h1:uqRjCRUuEAA6qsOiJvDd+CFo/vW+y5WR6SNmHE55hZk= +github.com/minio/highwayhash v1.0.3 h1:kbnuUMoHYyVl7szWjSxJnxw11k2U709jqFPPmIUyD6Q= +github.com/minio/highwayhash v1.0.3/go.mod h1:GGYsuwP/fPD6Y9hMiXuapVvlIUEhFhMTh0rxU3ik1LQ= github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= @@ -398,15 +384,16 @@ github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQ github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= -github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= -github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU= +github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI= github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78= github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI= +github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g= +github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28= github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0= github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -418,31 +405,29 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= -github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= -github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= -github.com/nats-io/jwt/v2 v2.5.3 h1:/9SWvzc6hTfamcgXJ3uYRpgj+QuY2aLNqRiqrKcrpEo= -github.com/nats-io/jwt/v2 v2.5.3/go.mod h1:iysuPemFcc7p4IoYots3IuELSI4EDe9Y0bQMe+I3Bf4= -github.com/nats-io/nats-server/v2 v2.10.11 h1:yKUiLVincZISpo3A4YljJQ+HfLltGAgoNNJl99KL8I0= -github.com/nats-io/nats-server/v2 v2.10.11/go.mod h1:dXtOqVWzbMTEj+tUyC/itXjJhW37xh0tUBrTAlqAfx8= -github.com/nats-io/nats.go v1.33.1 h1:8TxLZZ/seeEfR97qV0/Bl939tpDnt2Z2fK3HkPypj70= -github.com/nats-io/nats.go v1.33.1/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= -github.com/nats-io/nkeys v0.4.7 h1:RwNJbbIdYCoClSDNY7QVKZlyb/wfT6ugvFCiKy6vDvI= -github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc= +github.com/nats-io/jwt/v2 v2.5.8 h1:uvdSzwWiEGWGXf+0Q+70qv6AQdvcvxrv9hPM0RiPamE= +github.com/nats-io/jwt/v2 v2.5.8/go.mod h1:ZdWS1nZa6WMZfFwwgpEaqBV8EPGVgOTDHN/wTbz0Y5A= +github.com/nats-io/nats-server/v2 v2.10.23 h1:jvfb9cEi5h8UG6HkZgJGdn9f1UPaX3Dohk0PohEekJI= +github.com/nats-io/nats-server/v2 v2.10.23/go.mod h1:hMFnpDT2XUXsvHglABlFl/uroQCCOcW6X/0esW6GpBk= +github.com/nats-io/nats.go v1.37.0 h1:07rauXbVnnJvv1gfIyghFEo6lUcYRY0WXc3x7x0vUxE= +github.com/nats-io/nats.go v1.37.0/go.mod h1:Ubdu4Nh9exXdSz0RVWRFBbRfrbSxOYd26oF0wkWclB8= +github.com/nats-io/nkeys v0.4.8 h1:+wee30071y3vCZAYRsnrmIPaOe47A/SkK/UBDPdIV70= +github.com/nats-io/nkeys v0.4.8/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDmGD0nc= github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= -github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= -github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= -github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= +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/gomega v1.36.1 h1:bJDPBO7ibjxcbHMgSCoo4Yj18UWbKDlLwX1x9sybDcw= +github.com/onsi/gomega v1.36.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= -github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= +github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug= +github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= @@ -453,54 +438,53 @@ github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/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/poy/onpar v1.1.2 h1:QaNrNiZx0+Nar5dLgTVp5mXkyoVFIbepjyEoGSnhbAY= github.com/poy/onpar v1.1.2/go.mod h1:6X8FLNoxyr9kkmnlqpK6LSoiOtrO6MICtWwEuWkLjzg= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= -github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= -github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +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_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= -github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +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.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= -github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= -github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= -github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= -github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +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/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +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/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w= github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= -github.com/rubenv/sql-migrate v1.5.2 h1:bMDqOnrJVV/6JQgQ/MxOpU+AdO8uzYYA/TxFUBzFtS0= -github.com/rubenv/sql-migrate v1.5.2/go.mod h1:H38GW8Vqf8F0Su5XignRyaRcbXbJunSWxs+kmzlg0Is= +github.com/rubenv/sql-migrate v1.7.0 h1:HtQq1xyTN2ISmQDggnh0c9U3JlP8apWh8YO2jzlXpTI= +github.com/rubenv/sql-migrate v1.7.0/go.mod h1:S4wtDEG1CKn+0ShpTtzWhFpHHI5PvCUtiGI+C+Z2THE= 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/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= -github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= -github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8= -github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o= +github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= +github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k= +github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/spf13/afero v1.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= -github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= -github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= +github.com/spf13/cast v1.7.0 h1:ntdiHjuueXFgm5nzDRdOS4yfT43P5Fnud6DH50rz/7w= +github.com/spf13/cast v1.7.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -521,12 +505,14 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= -github.com/vektra/mockery/v2 v2.42.0 h1:xnP1KXjpcc1GD8jHRjgdpRIW4LDK5MdSMrhbJizAmaI= -github.com/vektra/mockery/v2 v2.42.0/go.mod h1:XNTE9RIu3deGAGQRVjP1VZxGpQNm0YedZx4oDs3prr8= +github.com/vektra/mockery/v2 v2.50.0 h1:0GYRH38nKiRghwUq+0aJXG1sT3yyTYj/J1xQRM8kGzQ= +github.com/vektra/mockery/v2 v2.50.0/go.mod h1:xO2DeYemEPC2tCzIZ+a1tifZ/7Laf/Chxg3vlc+oDsI= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -540,7 +526,6 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI= github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs= github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE= @@ -555,16 +540,14 @@ go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q= -go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= -go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= -go.opentelemetry.io/otel/metric v1.19.0 h1:aTzpGtV0ar9wlV4Sna9sdJyII5jTVJEvKETPiOKwvpE= -go.opentelemetry.io/otel/metric v1.19.0/go.mod h1:L5rUsV9kM1IxCj1MmSdS+JQAcVm319EUrDVLrt7jqt8= -go.opentelemetry.io/otel/trace v1.19.0 h1:DFVQmlVbfVeOuBRrwdtaehRrWiL1JoVs9CPIQ1Dzxpg= -go.opentelemetry.io/otel/trace v1.19.0/go.mod h1:mfaSyvGyEJEI0nyV2I4qhNQnbBOUUmYZpYojqMnX2vo= -go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY= -go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds= +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/metric v1.28.0 h1:f0HGvSl1KRAU1DLgLGFjrwVyismPlnuU6JD6bOeuA5Q= +go.opentelemetry.io/otel/metric v1.28.0/go.mod h1:Fb1eVBFZmLVTMb6PPohq3TO9IIhUisDsbJoL/+uQW4s= +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.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= @@ -578,11 +561,9 @@ golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= -golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= -golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -593,8 +574,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= -golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -618,9 +599,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= +golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -654,10 +634,8 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= 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= @@ -667,8 +645,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= -golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= 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= @@ -679,13 +657,11 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/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.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= +golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -724,34 +700,27 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.17.0 h1:mkTF7LCd6WGJNL3K1Ad7kwxNfYAW6a8a8QqtMblp/4U= -golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= +golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= 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.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= 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.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= -golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= +golang.org/x/time v0.8.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-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -801,9 +770,8 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -835,7 +803,6 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -873,8 +840,8 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4= -google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= +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/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -891,8 +858,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.58.3 h1:BjnpXut1btbtgN/6sp+brB2Kbm2LjNXnidYujAVbSoQ= -google.golang.org/grpc v1.58.3/go.mod h1:tgX3ZQDlNJGU96V6yHh1T/JeoBQ2TXdr43YbYSsCJk0= +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 v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -903,24 +870,22 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA= +google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= 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= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -928,8 +893,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g= -helm.sh/helm/v3 v3.14.2 h1:V71fv+NGZv0icBlr+in1MJXuUIHCiPG1hW9gEBISTIA= -helm.sh/helm/v3 v3.14.2/go.mod h1:2itvvDv2WSZXTllknfQo6j7u3VVgMAvm8POCDgYH424= +helm.sh/helm/v3 v3.16.4 h1:rBn/h9MACw+QlhxQTjpl8Ifx+VTWaYsw3rguGBYBzr0= +helm.sh/helm/v3 v3.16.4/go.mod h1:k8QPotUt57wWbi90w3LNmg3/MWcLPigVv+0/X4B8BzA= 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= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= @@ -937,42 +902,42 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.29.2 h1:hBC7B9+MU+ptchxEqTNW2DkUosJpp1P+Wn6YncZ474A= -k8s.io/api v0.29.2/go.mod h1:sdIaaKuU7P44aoyyLlikSLayT6Vb7bvJNCX105xZXY0= -k8s.io/apiextensions-apiserver v0.29.2 h1:UK3xB5lOWSnhaCk0RFZ0LUacPZz9RY4wi/yt2Iu+btg= -k8s.io/apiextensions-apiserver v0.29.2/go.mod h1:aLfYjpA5p3OwtqNXQFkhJ56TB+spV8Gc4wfMhUA3/b8= -k8s.io/apimachinery v0.29.2 h1:EWGpfJ856oj11C52NRCHuU7rFDwxev48z+6DSlGNsV8= -k8s.io/apimachinery v0.29.2/go.mod h1:6HVkd1FwxIagpYrHSwJlQqZI3G9LfYWRPAkUvLnXTKU= -k8s.io/apiserver v0.29.2 h1:+Z9S0dSNr+CjnVXQePG8TcBWHr3Q7BmAr7NraHvsMiQ= -k8s.io/apiserver v0.29.2/go.mod h1:B0LieKVoyU7ykQvPFm7XSdIHaCHSzCzQWPFa5bqbeMQ= -k8s.io/cli-runtime v0.29.2 h1:smfsOcT4QujeghsNjECKN3lwyX9AwcFU0nvJ7sFN3ro= -k8s.io/cli-runtime v0.29.2/go.mod h1:KLisYYfoqeNfO+MkTWvpqIyb1wpJmmFJhioA0xd4MW8= -k8s.io/client-go v0.29.2 h1:FEg85el1TeZp+/vYJM7hkDlSTFZ+c5nnK44DJ4FyoRg= -k8s.io/client-go v0.29.2/go.mod h1:knlvFZE58VpqbQpJNbCbctTVXcd35mMyAAwBdpt4jrA= -k8s.io/component-base v0.29.2 h1:lpiLyuvPA9yV1aQwGLENYyK7n/8t6l3nn3zAtFTJYe8= -k8s.io/component-base v0.29.2/go.mod h1:BfB3SLrefbZXiBfbM+2H1dlat21Uewg/5qtKOl8degM= -k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0= -k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780= -k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= -k8s.io/kubectl v0.29.0 h1:Oqi48gXjikDhrBF67AYuZRTcJV4lg2l42GmvsP7FmYI= -k8s.io/kubectl v0.29.0/go.mod h1:0jMjGWIcMIQzmUaMgAzhSELv5WtHo2a8pq67DtviAJs= -k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= -k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -oras.land/oras-go v1.2.4 h1:djpBY2/2Cs1PV87GSJlxv4voajVOMZxqqtq9AB8YNvY= -oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324= +k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= +k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= +k8s.io/apiextensions-apiserver v0.32.0 h1:S0Xlqt51qzzqjKPxfgX1xh4HBZE+p8KKBq+k2SWNOE0= +k8s.io/apiextensions-apiserver v0.32.0/go.mod h1:86hblMvN5yxMvZrZFX2OhIHAuFIMJIZ19bTvzkP+Fmw= +k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= +k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/apiserver v0.32.0 h1:VJ89ZvQZ8p1sLeiWdRJpRD6oLozNZD2+qVSLi+ft5Qs= +k8s.io/apiserver v0.32.0/go.mod h1:HFh+dM1/BE/Hm4bS4nTXHVfN6Z6tFIZPi649n83b4Ag= +k8s.io/cli-runtime v0.32.0 h1:dP+OZqs7zHPpGQMCGAhectbHU2SNCuZtIimRKTv2T1c= +k8s.io/cli-runtime v0.32.0/go.mod h1:Mai8ht2+esoDRK5hr861KRy6z0zHsSTYttNVJXgP3YQ= +k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= +k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= +k8s.io/component-base v0.32.0 h1:d6cWHZkCiiep41ObYQS6IcgzOUQUNpywm39KVYaUqzU= +k8s.io/component-base v0.32.0/go.mod h1:JLG2W5TUxUu5uDyKiH2R/7NnxJo1HlPoRIIbVLkK5eM= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +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/kubectl v0.31.3 h1:3r111pCjPsvnR98oLLxDMwAeM6OPGmPty6gSKaLTQes= +k8s.io/kubectl v0.31.3/go.mod h1:lhMECDCbJN8He12qcKqs2QfmVo9Pue30geovBVpH5fs= +k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= +k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +oras.land/oras-go v1.2.5 h1:XpYuAwAb0DfQsunIyMfeET92emK8km3W4yEzZvUbsTo= +oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0= -sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 h1:XX3Ajgzov2RKUdc5jW3t5jwY7Bo7dcRm+tFxT+NfgY0= -sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3/go.mod h1:9n16EZKMhXBNSiUC5kSdFQJkdH3zbxS/JoO619G1VAY= -sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 h1:W6cLQc5pnqM7vh3b7HvGNfXrJ/xL6BDMS0v1V/HHg5U= -sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3/go.mod h1:JWP1Fj0VWGHyw3YUPjXSQnRnrwezrZSrApfX5S0nIag= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw= +sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM= +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/kustomize/api v0.18.0 h1:hTzp67k+3NEVInwz5BHyzc9rGxIauoXferXyjv5lWPo= +sigs.k8s.io/kustomize/api v0.18.0/go.mod h1:f8isXnX+8b+SGLHQ6yO4JG1rdkZlvhaCf/uZbLVMb0U= +sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt4E= +sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW5FT9FcjYo= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA= +sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/internal/controller/nats/controller.go b/internal/controller/nats/controller.go index 1dbd7165..c0c034d7 100644 --- a/internal/controller/nats/controller.go +++ b/internal/controller/nats/controller.go @@ -56,7 +56,7 @@ const ( // Reconciler reconciles a NATS object. // -//go:generate go run github.com/vektra/mockery/v2 --name=Controller --dir=../../../vendor/sigs.k8s.io/controller-runtime/pkg/controller --outpkg=mocks --case=underscore +//go:generate go run github.com/vektra/mockery/v2 --name=TypedController --dir=../../../vendor/sigs.k8s.io/controller-runtime/pkg/controller --outpkg=mocks --case=underscore //go:generate go run github.com/vektra/mockery/v2 --name=Manager --dir=../../../vendor/sigs.k8s.io/controller-runtime/pkg/manager --outpkg=mocks --case=underscore type Reconciler struct { client.Client diff --git a/internal/controller/nats/mocks/controller.go b/internal/controller/nats/mocks/controller.go index 34ad00b8..fdf5c380 100644 --- a/internal/controller/nats/mocks/controller.go +++ b/internal/controller/nats/mocks/controller.go @@ -1,256 +1,10 @@ -// Code generated by mockery v2.42.0. DO NOT EDIT. - package mocks import ( - context "context" - - handler "sigs.k8s.io/controller-runtime/pkg/handler" - - logr "github.com/go-logr/logr" - - mock "github.com/stretchr/testify/mock" - - predicate "sigs.k8s.io/controller-runtime/pkg/predicate" - - reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile" - - source "sigs.k8s.io/controller-runtime/pkg/source" + kcontrollerruntimereconcile "sigs.k8s.io/controller-runtime/pkg/reconcile" ) -// Controller is an autogenerated mock type for the Controller type -type Controller struct { - mock.Mock -} - -type Controller_Expecter struct { - mock *mock.Mock -} - -func (_m *Controller) EXPECT() *Controller_Expecter { - return &Controller_Expecter{mock: &_m.Mock} -} - -// GetLogger provides a mock function with given fields: -func (_m *Controller) GetLogger() logr.Logger { - ret := _m.Called() - - if len(ret) == 0 { - panic("no return value specified for GetLogger") - } - - var r0 logr.Logger - if rf, ok := ret.Get(0).(func() logr.Logger); ok { - r0 = rf() - } else { - r0 = ret.Get(0).(logr.Logger) - } - - return r0 -} - -// Controller_GetLogger_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetLogger' -type Controller_GetLogger_Call struct { - *mock.Call -} - -// GetLogger is a helper method to define mock.On call -func (_e *Controller_Expecter) GetLogger() *Controller_GetLogger_Call { - return &Controller_GetLogger_Call{Call: _e.mock.On("GetLogger")} -} - -func (_c *Controller_GetLogger_Call) Run(run func()) *Controller_GetLogger_Call { - _c.Call.Run(func(args mock.Arguments) { - run() - }) - return _c -} - -func (_c *Controller_GetLogger_Call) Return(_a0 logr.Logger) *Controller_GetLogger_Call { - _c.Call.Return(_a0) - return _c -} - -func (_c *Controller_GetLogger_Call) RunAndReturn(run func() logr.Logger) *Controller_GetLogger_Call { - _c.Call.Return(run) - return _c -} - -// Reconcile provides a mock function with given fields: _a0, _a1 -func (_m *Controller) Reconcile(_a0 context.Context, _a1 reconcile.Request) (reconcile.Result, error) { - ret := _m.Called(_a0, _a1) - - if len(ret) == 0 { - panic("no return value specified for Reconcile") - } - - var r0 reconcile.Result - var r1 error - if rf, ok := ret.Get(0).(func(context.Context, reconcile.Request) (reconcile.Result, error)); ok { - return rf(_a0, _a1) - } - if rf, ok := ret.Get(0).(func(context.Context, reconcile.Request) reconcile.Result); ok { - r0 = rf(_a0, _a1) - } else { - r0 = ret.Get(0).(reconcile.Result) - } - - if rf, ok := ret.Get(1).(func(context.Context, reconcile.Request) error); ok { - r1 = rf(_a0, _a1) - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// Controller_Reconcile_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Reconcile' -type Controller_Reconcile_Call struct { - *mock.Call -} - -// Reconcile is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 reconcile.Request -func (_e *Controller_Expecter) Reconcile(_a0 interface{}, _a1 interface{}) *Controller_Reconcile_Call { - return &Controller_Reconcile_Call{Call: _e.mock.On("Reconcile", _a0, _a1)} -} - -func (_c *Controller_Reconcile_Call) Run(run func(_a0 context.Context, _a1 reconcile.Request)) *Controller_Reconcile_Call { - _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(reconcile.Request)) - }) - return _c -} - -func (_c *Controller_Reconcile_Call) Return(_a0 reconcile.Result, _a1 error) *Controller_Reconcile_Call { - _c.Call.Return(_a0, _a1) - return _c -} - -func (_c *Controller_Reconcile_Call) RunAndReturn(run func(context.Context, reconcile.Request) (reconcile.Result, error)) *Controller_Reconcile_Call { - _c.Call.Return(run) - return _c -} - -// Start provides a mock function with given fields: ctx -func (_m *Controller) Start(ctx context.Context) error { - ret := _m.Called(ctx) - - if len(ret) == 0 { - panic("no return value specified for Start") - } - - var r0 error - if rf, ok := ret.Get(0).(func(context.Context) error); ok { - r0 = rf(ctx) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// Controller_Start_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Start' -type Controller_Start_Call struct { - *mock.Call -} - -// Start is a helper method to define mock.On call -// - ctx context.Context -func (_e *Controller_Expecter) Start(ctx interface{}) *Controller_Start_Call { - return &Controller_Start_Call{Call: _e.mock.On("Start", ctx)} -} - -func (_c *Controller_Start_Call) Run(run func(ctx context.Context)) *Controller_Start_Call { - _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context)) - }) - return _c -} - -func (_c *Controller_Start_Call) Return(_a0 error) *Controller_Start_Call { - _c.Call.Return(_a0) - return _c -} - -func (_c *Controller_Start_Call) RunAndReturn(run func(context.Context) error) *Controller_Start_Call { - _c.Call.Return(run) - return _c -} - -// Watch provides a mock function with given fields: src, eventhandler, predicates -func (_m *Controller) Watch(src source.Source, eventhandler handler.EventHandler, predicates ...predicate.Predicate) error { - _va := make([]interface{}, len(predicates)) - for _i := range predicates { - _va[_i] = predicates[_i] - } - var _ca []interface{} - _ca = append(_ca, src, eventhandler) - _ca = append(_ca, _va...) - ret := _m.Called(_ca...) - - if len(ret) == 0 { - panic("no return value specified for Watch") - } - - var r0 error - if rf, ok := ret.Get(0).(func(source.Source, handler.EventHandler, ...predicate.Predicate) error); ok { - r0 = rf(src, eventhandler, predicates...) - } else { - r0 = ret.Error(0) - } - - return r0 -} - -// Controller_Watch_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Watch' -type Controller_Watch_Call struct { - *mock.Call -} - -// Watch is a helper method to define mock.On call -// - src source.Source -// - eventhandler handler.EventHandler -// - predicates ...predicate.Predicate -func (_e *Controller_Expecter) Watch(src interface{}, eventhandler interface{}, predicates ...interface{}) *Controller_Watch_Call { - return &Controller_Watch_Call{Call: _e.mock.On("Watch", - append([]interface{}{src, eventhandler}, predicates...)...)} -} - -func (_c *Controller_Watch_Call) Run(run func(src source.Source, eventhandler handler.EventHandler, predicates ...predicate.Predicate)) *Controller_Watch_Call { - _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]predicate.Predicate, len(args)-2) - for i, a := range args[2:] { - if a != nil { - variadicArgs[i] = a.(predicate.Predicate) - } - } - run(args[0].(source.Source), args[1].(handler.EventHandler), variadicArgs...) - }) - return _c -} - -func (_c *Controller_Watch_Call) Return(_a0 error) *Controller_Watch_Call { - _c.Call.Return(_a0) - return _c -} - -func (_c *Controller_Watch_Call) RunAndReturn(run func(source.Source, handler.EventHandler, ...predicate.Predicate) error) *Controller_Watch_Call { - _c.Call.Return(run) - return _c -} - -// NewController creates a new instance of Controller. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -// The first argument is typically a *testing.T value. -func NewController(t interface { - mock.TestingT - Cleanup(func()) -}) *Controller { - mock := &Controller{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) +// Update it when the issue: https://github.com/vektra/mockery/issues/787#issuecomment-2296180438 is fixed. - return mock -} +// Controller is an autogenerated mock type for the Controller type. +type Controller = TypedController[kcontrollerruntimereconcile.Request] diff --git a/internal/controller/nats/mocks/manager.go b/internal/controller/nats/mocks/manager.go index af1a9e78..c4b5a945 100644 --- a/internal/controller/nats/mocks/manager.go +++ b/internal/controller/nats/mocks/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.42.0. DO NOT EDIT. +// Code generated by mockery v2.50.0. DO NOT EDIT. package mocks @@ -137,6 +137,53 @@ func (_c *Manager_AddHealthzCheck_Call) RunAndReturn(run func(string, healthz.Ch return _c } +// AddMetricsServerExtraHandler provides a mock function with given fields: path, handler +func (_m *Manager) AddMetricsServerExtraHandler(path string, handler http.Handler) error { + ret := _m.Called(path, handler) + + if len(ret) == 0 { + panic("no return value specified for AddMetricsServerExtraHandler") + } + + var r0 error + if rf, ok := ret.Get(0).(func(string, http.Handler) error); ok { + r0 = rf(path, handler) + } else { + r0 = ret.Error(0) + } + + return r0 +} + +// Manager_AddMetricsServerExtraHandler_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'AddMetricsServerExtraHandler' +type Manager_AddMetricsServerExtraHandler_Call struct { + *mock.Call +} + +// AddMetricsServerExtraHandler is a helper method to define mock.On call +// - path string +// - handler http.Handler +func (_e *Manager_Expecter) AddMetricsServerExtraHandler(path interface{}, handler interface{}) *Manager_AddMetricsServerExtraHandler_Call { + return &Manager_AddMetricsServerExtraHandler_Call{Call: _e.mock.On("AddMetricsServerExtraHandler", path, handler)} +} + +func (_c *Manager_AddMetricsServerExtraHandler_Call) Run(run func(path string, handler http.Handler)) *Manager_AddMetricsServerExtraHandler_Call { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(string), args[1].(http.Handler)) + }) + return _c +} + +func (_c *Manager_AddMetricsServerExtraHandler_Call) Return(_a0 error) *Manager_AddMetricsServerExtraHandler_Call { + _c.Call.Return(_a0) + return _c +} + +func (_c *Manager_AddMetricsServerExtraHandler_Call) RunAndReturn(run func(string, http.Handler) error) *Manager_AddMetricsServerExtraHandler_Call { + _c.Call.Return(run) + return _c +} + // AddReadyzCheck provides a mock function with given fields: name, check func (_m *Manager) AddReadyzCheck(name string, check healthz.Checker) error { ret := _m.Called(name, check) @@ -184,7 +231,7 @@ func (_c *Manager_AddReadyzCheck_Call) RunAndReturn(run func(string, healthz.Che return _c } -// Elected provides a mock function with given fields: +// Elected provides a mock function with no fields func (_m *Manager) Elected() <-chan struct{} { ret := _m.Called() @@ -231,7 +278,7 @@ func (_c *Manager_Elected_Call) RunAndReturn(run func() <-chan struct{}) *Manage return _c } -// GetAPIReader provides a mock function with given fields: +// GetAPIReader provides a mock function with no fields func (_m *Manager) GetAPIReader() client.Reader { ret := _m.Called() @@ -278,7 +325,7 @@ func (_c *Manager_GetAPIReader_Call) RunAndReturn(run func() client.Reader) *Man return _c } -// GetCache provides a mock function with given fields: +// GetCache provides a mock function with no fields func (_m *Manager) GetCache() cache.Cache { ret := _m.Called() @@ -325,7 +372,7 @@ func (_c *Manager_GetCache_Call) RunAndReturn(run func() cache.Cache) *Manager_G return _c } -// GetClient provides a mock function with given fields: +// GetClient provides a mock function with no fields func (_m *Manager) GetClient() client.Client { ret := _m.Called() @@ -372,7 +419,7 @@ func (_c *Manager_GetClient_Call) RunAndReturn(run func() client.Client) *Manage return _c } -// GetConfig provides a mock function with given fields: +// GetConfig provides a mock function with no fields func (_m *Manager) GetConfig() *rest.Config { ret := _m.Called() @@ -419,7 +466,7 @@ func (_c *Manager_GetConfig_Call) RunAndReturn(run func() *rest.Config) *Manager return _c } -// GetControllerOptions provides a mock function with given fields: +// GetControllerOptions provides a mock function with no fields func (_m *Manager) GetControllerOptions() config.Controller { ret := _m.Called() @@ -512,7 +559,7 @@ func (_c *Manager_GetEventRecorderFor_Call) RunAndReturn(run func(string) record return _c } -// GetFieldIndexer provides a mock function with given fields: +// GetFieldIndexer provides a mock function with no fields func (_m *Manager) GetFieldIndexer() client.FieldIndexer { ret := _m.Called() @@ -559,7 +606,7 @@ func (_c *Manager_GetFieldIndexer_Call) RunAndReturn(run func() client.FieldInde return _c } -// GetHTTPClient provides a mock function with given fields: +// GetHTTPClient provides a mock function with no fields func (_m *Manager) GetHTTPClient() *http.Client { ret := _m.Called() @@ -606,7 +653,7 @@ func (_c *Manager_GetHTTPClient_Call) RunAndReturn(run func() *http.Client) *Man return _c } -// GetLogger provides a mock function with given fields: +// GetLogger provides a mock function with no fields func (_m *Manager) GetLogger() logr.Logger { ret := _m.Called() @@ -651,7 +698,7 @@ func (_c *Manager_GetLogger_Call) RunAndReturn(run func() logr.Logger) *Manager_ return _c } -// GetRESTMapper provides a mock function with given fields: +// GetRESTMapper provides a mock function with no fields func (_m *Manager) GetRESTMapper() meta.RESTMapper { ret := _m.Called() @@ -698,7 +745,7 @@ func (_c *Manager_GetRESTMapper_Call) RunAndReturn(run func() meta.RESTMapper) * return _c } -// GetScheme provides a mock function with given fields: +// GetScheme provides a mock function with no fields func (_m *Manager) GetScheme() *runtime.Scheme { ret := _m.Called() @@ -745,7 +792,7 @@ func (_c *Manager_GetScheme_Call) RunAndReturn(run func() *runtime.Scheme) *Mana return _c } -// GetWebhookServer provides a mock function with given fields: +// GetWebhookServer provides a mock function with no fields func (_m *Manager) GetWebhookServer() webhook.Server { ret := _m.Called() diff --git a/internal/controller/nats/mocks/natsconn.go b/internal/controller/nats/mocks/natsconn.go deleted file mode 100644 index cd4a99b6..00000000 --- a/internal/controller/nats/mocks/natsconn.go +++ /dev/null @@ -1,203 +0,0 @@ -// Code generated by mockery v2.30.1. DO NOT EDIT. - -package mocks - -import ( - mock "github.com/stretchr/testify/mock" - - natsgo "github.com/nats-io/nats.go" -) - -// NatsConn is an autogenerated mock type for the NatsConn type -type NatsConn struct { - mock.Mock -} - -type NatsConn_Expecter struct { - mock *mock.Mock -} - -func (_m *NatsConn) EXPECT() *NatsConn_Expecter { - return &NatsConn_Expecter{mock: &_m.Mock} -} - -// Close provides a mock function with given fields: -func (_m *NatsConn) Close() { - _m.Called() -} - -// NatsConn_Close_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Close' -type NatsConn_Close_Call struct { - *mock.Call -} - -// Close is a helper method to define mock.On call -func (_e *NatsConn_Expecter) Close() *NatsConn_Close_Call { - return &NatsConn_Close_Call{Call: _e.mock.On("Close")} -} - -func (_c *NatsConn_Close_Call) Run(run func()) *NatsConn_Close_Call { - _c.Call.Run(func(args mock.Arguments) { - run() - }) - return _c -} - -func (_c *NatsConn_Close_Call) Return() *NatsConn_Close_Call { - _c.Call.Return() - return _c -} - -func (_c *NatsConn_Close_Call) RunAndReturn(run func()) *NatsConn_Close_Call { - _c.Call.Return(run) - return _c -} - -// IsConnected provides a mock function with given fields: -func (_m *NatsConn) IsConnected() bool { - ret := _m.Called() - - var r0 bool - if rf, ok := ret.Get(0).(func() bool); ok { - r0 = rf() - } else { - r0 = ret.Get(0).(bool) - } - - return r0 -} - -// NatsConn_IsConnected_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'IsConnected' -type NatsConn_IsConnected_Call struct { - *mock.Call -} - -// IsConnected is a helper method to define mock.On call -func (_e *NatsConn_Expecter) IsConnected() *NatsConn_IsConnected_Call { - return &NatsConn_IsConnected_Call{Call: _e.mock.On("IsConnected")} -} - -func (_c *NatsConn_IsConnected_Call) Run(run func()) *NatsConn_IsConnected_Call { - _c.Call.Run(func(args mock.Arguments) { - run() - }) - return _c -} - -func (_c *NatsConn_IsConnected_Call) Return(_a0 bool) *NatsConn_IsConnected_Call { - _c.Call.Return(_a0) - return _c -} - -func (_c *NatsConn_IsConnected_Call) RunAndReturn(run func() bool) *NatsConn_IsConnected_Call { - _c.Call.Return(run) - return _c -} - -// JetStream provides a mock function with given fields: -func (_m *NatsConn) JetStream() (natsgo.JetStreamContext, error) { - ret := _m.Called() - - var r0 natsgo.JetStreamContext - var r1 error - if rf, ok := ret.Get(0).(func() (natsgo.JetStreamContext, error)); ok { - return rf() - } - if rf, ok := ret.Get(0).(func() natsgo.JetStreamContext); ok { - r0 = rf() - } else { - if ret.Get(0) != nil { - r0 = ret.Get(0).(natsgo.JetStreamContext) - } - } - - if rf, ok := ret.Get(1).(func() error); ok { - r1 = rf() - } else { - r1 = ret.Error(1) - } - - return r0, r1 -} - -// NatsConn_JetStream_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'JetStream' -type NatsConn_JetStream_Call struct { - *mock.Call -} - -// JetStream is a helper method to define mock.On call -func (_e *NatsConn_Expecter) JetStream() *NatsConn_JetStream_Call { - return &NatsConn_JetStream_Call{Call: _e.mock.On("JetStream")} -} - -func (_c *NatsConn_JetStream_Call) Run(run func()) *NatsConn_JetStream_Call { - _c.Call.Run(func(args mock.Arguments) { - run() - }) - return _c -} - -func (_c *NatsConn_JetStream_Call) Return(_a0 natsgo.JetStreamContext, _a1 error) *NatsConn_JetStream_Call { - _c.Call.Return(_a0, _a1) - return _c -} - -func (_c *NatsConn_JetStream_Call) RunAndReturn(run func() (natsgo.JetStreamContext, error)) *NatsConn_JetStream_Call { - _c.Call.Return(run) - return _c -} - -// Status provides a mock function with given fields: -func (_m *NatsConn) Status() natsgo.Status { - ret := _m.Called() - - var r0 natsgo.Status - if rf, ok := ret.Get(0).(func() natsgo.Status); ok { - r0 = rf() - } else { - r0 = ret.Get(0).(natsgo.Status) - } - - return r0 -} - -// NatsConn_Status_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Status' -type NatsConn_Status_Call struct { - *mock.Call -} - -// Status is a helper method to define mock.On call -func (_e *NatsConn_Expecter) Status() *NatsConn_Status_Call { - return &NatsConn_Status_Call{Call: _e.mock.On("Status")} -} - -func (_c *NatsConn_Status_Call) Run(run func()) *NatsConn_Status_Call { - _c.Call.Run(func(args mock.Arguments) { - run() - }) - return _c -} - -func (_c *NatsConn_Status_Call) Return(_a0 natsgo.Status) *NatsConn_Status_Call { - _c.Call.Return(_a0) - return _c -} - -func (_c *NatsConn_Status_Call) RunAndReturn(run func() natsgo.Status) *NatsConn_Status_Call { - _c.Call.Return(run) - return _c -} - -// NewNatsConn creates a new instance of NatsConn. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. -// The first argument is typically a *testing.T value. -func NewNatsConn(t interface { - mock.TestingT - Cleanup(func()) -}) *NatsConn { - mock := &NatsConn{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/internal/controller/nats/mocks/typed_controller.go b/internal/controller/nats/mocks/typed_controller.go new file mode 100644 index 00000000..b5f4cb09 --- /dev/null +++ b/internal/controller/nats/mocks/typed_controller.go @@ -0,0 +1,236 @@ +// Code generated by mockery v2.50.0. DO NOT EDIT. + +package mocks + +import ( + context "context" + + logr "github.com/go-logr/logr" + + mock "github.com/stretchr/testify/mock" + + reconcile "sigs.k8s.io/controller-runtime/pkg/reconcile" + + source "sigs.k8s.io/controller-runtime/pkg/source" +) + +// TypedController is an autogenerated mock type for the TypedController type +type TypedController[request comparable] struct { + mock.Mock +} + +type TypedController_Expecter[request comparable] struct { + mock *mock.Mock +} + +func (_m *TypedController[request]) EXPECT() *TypedController_Expecter[request] { + return &TypedController_Expecter[request]{mock: &_m.Mock} +} + +// GetLogger provides a mock function with no fields +func (_m *TypedController[request]) GetLogger() logr.Logger { + ret := _m.Called() + + if len(ret) == 0 { + panic("no return value specified for GetLogger") + } + + var r0 logr.Logger + if rf, ok := ret.Get(0).(func() logr.Logger); ok { + r0 = rf() + } else { + r0 = ret.Get(0).(logr.Logger) + } + + return r0 +} + +// TypedController_GetLogger_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetLogger' +type TypedController_GetLogger_Call[request comparable] struct { + *mock.Call +} + +// GetLogger is a helper method to define mock.On call +func (_e *TypedController_Expecter[request]) GetLogger() *TypedController_GetLogger_Call[request] { + return &TypedController_GetLogger_Call[request]{Call: _e.mock.On("GetLogger")} +} + +func (_c *TypedController_GetLogger_Call[request]) Run(run func()) *TypedController_GetLogger_Call[request] { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *TypedController_GetLogger_Call[request]) Return(_a0 logr.Logger) *TypedController_GetLogger_Call[request] { + _c.Call.Return(_a0) + return _c +} + +func (_c *TypedController_GetLogger_Call[request]) RunAndReturn(run func() logr.Logger) *TypedController_GetLogger_Call[request] { + _c.Call.Return(run) + return _c +} + +// Reconcile provides a mock function with given fields: _a0, _a1 +func (_m *TypedController[request]) Reconcile(_a0 context.Context, _a1 request) (reconcile.Result, error) { + ret := _m.Called(_a0, _a1) + + if len(ret) == 0 { + panic("no return value specified for Reconcile") + } + + var r0 reconcile.Result + var r1 error + if rf, ok := ret.Get(0).(func(context.Context, request) (reconcile.Result, error)); ok { + return rf(_a0, _a1) + } + if rf, ok := ret.Get(0).(func(context.Context, request) reconcile.Result); ok { + r0 = rf(_a0, _a1) + } else { + r0 = ret.Get(0).(reconcile.Result) + } + + if rf, ok := ret.Get(1).(func(context.Context, request) error); ok { + r1 = rf(_a0, _a1) + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// TypedController_Reconcile_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Reconcile' +type TypedController_Reconcile_Call[request comparable] struct { + *mock.Call +} + +// Reconcile is a helper method to define mock.On call +// - _a0 context.Context +// - _a1 request +func (_e *TypedController_Expecter[request]) Reconcile(_a0 interface{}, _a1 interface{}) *TypedController_Reconcile_Call[request] { + return &TypedController_Reconcile_Call[request]{Call: _e.mock.On("Reconcile", _a0, _a1)} +} + +func (_c *TypedController_Reconcile_Call[request]) Run(run func(_a0 context.Context, _a1 request)) *TypedController_Reconcile_Call[request] { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(context.Context), args[1].(request)) + }) + return _c +} + +func (_c *TypedController_Reconcile_Call[request]) Return(_a0 reconcile.Result, _a1 error) *TypedController_Reconcile_Call[request] { + _c.Call.Return(_a0, _a1) + return _c +} + +func (_c *TypedController_Reconcile_Call[request]) RunAndReturn(run func(context.Context, request) (reconcile.Result, error)) *TypedController_Reconcile_Call[request] { + _c.Call.Return(run) + return _c +} + +// Start provides a mock function with given fields: ctx +func (_m *TypedController[request]) Start(ctx context.Context) error { + ret := _m.Called(ctx) + + if len(ret) == 0 { + panic("no return value specified for Start") + } + + var r0 error + if rf, ok := ret.Get(0).(func(context.Context) error); ok { + r0 = rf(ctx) + } else { + r0 = ret.Error(0) + } + + return r0 +} + +// TypedController_Start_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Start' +type TypedController_Start_Call[request comparable] struct { + *mock.Call +} + +// Start is a helper method to define mock.On call +// - ctx context.Context +func (_e *TypedController_Expecter[request]) Start(ctx interface{}) *TypedController_Start_Call[request] { + return &TypedController_Start_Call[request]{Call: _e.mock.On("Start", ctx)} +} + +func (_c *TypedController_Start_Call[request]) Run(run func(ctx context.Context)) *TypedController_Start_Call[request] { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(context.Context)) + }) + return _c +} + +func (_c *TypedController_Start_Call[request]) Return(_a0 error) *TypedController_Start_Call[request] { + _c.Call.Return(_a0) + return _c +} + +func (_c *TypedController_Start_Call[request]) RunAndReturn(run func(context.Context) error) *TypedController_Start_Call[request] { + _c.Call.Return(run) + return _c +} + +// Watch provides a mock function with given fields: src +func (_m *TypedController[request]) Watch(src source.TypedSource[request]) error { + ret := _m.Called(src) + + if len(ret) == 0 { + panic("no return value specified for Watch") + } + + var r0 error + if rf, ok := ret.Get(0).(func(source.TypedSource[request]) error); ok { + r0 = rf(src) + } else { + r0 = ret.Error(0) + } + + return r0 +} + +// TypedController_Watch_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Watch' +type TypedController_Watch_Call[request comparable] struct { + *mock.Call +} + +// Watch is a helper method to define mock.On call +// - src source.TypedSource[request] +func (_e *TypedController_Expecter[request]) Watch(src interface{}) *TypedController_Watch_Call[request] { + return &TypedController_Watch_Call[request]{Call: _e.mock.On("Watch", src)} +} + +func (_c *TypedController_Watch_Call[request]) Run(run func(src source.TypedSource[request])) *TypedController_Watch_Call[request] { + _c.Call.Run(func(args mock.Arguments) { + run(args[0].(source.TypedSource[request])) + }) + return _c +} + +func (_c *TypedController_Watch_Call[request]) Return(_a0 error) *TypedController_Watch_Call[request] { + _c.Call.Return(_a0) + return _c +} + +func (_c *TypedController_Watch_Call[request]) RunAndReturn(run func(source.TypedSource[request]) error) *TypedController_Watch_Call[request] { + _c.Call.Return(run) + return _c +} + +// NewTypedController creates a new instance of TypedController. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewTypedController[request comparable](t interface { + mock.TestingT + Cleanup(func()) +}) *TypedController[request] { + mock := &TypedController[request]{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/internal/controller/nats/status.go b/internal/controller/nats/status.go index 9c356853..48b5685d 100644 --- a/internal/controller/nats/status.go +++ b/internal/controller/nats/status.go @@ -9,6 +9,7 @@ import ( "go.uber.org/zap" kmetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" + "k8s.io/apimachinery/pkg/labels" ktypes "k8s.io/apimachinery/pkg/types" "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/handler" @@ -84,32 +85,42 @@ func (r *Reconciler) watchDestinationRule(logger *zap.SugaredLogger) error { } // define label selector for "managed-by". - labelSelectorPredicate, err := predicate.LabelSelectorPredicate( - kmetav1.LabelSelector{ - MatchLabels: map[string]string{ - ManagedByLabelKey: ManagedByLabelValue, - }, - }) + selector, err := kmetav1.LabelSelectorAsSelector(&kmetav1.LabelSelector{ + MatchLabels: map[string]string{ + ManagedByLabelKey: ManagedByLabelValue, + }, + }) if err != nil { return err } + labelSelectorPredicate := predicate.NewTypedPredicateFuncs[*unstructured.Unstructured]( + func(o *unstructured.Unstructured) bool { + return selector.Matches(labels.Set(o.GetLabels())) + }, + ) // define ignore creation predicate - ignoreCreationPredicate := predicate.Funcs{ - CreateFunc: func(e event.CreateEvent) bool { + ignoreCreationPredicate := predicate.TypedFuncs[*unstructured.Unstructured]{ + CreateFunc: func(e event.TypedCreateEvent[*unstructured.Unstructured]) bool { logger.Debugw("Ignoring create event for DestinationRule", "name", e.Object.GetName(), "namespace", e.Object.GetNamespace(), "kind", e.Object.GetObjectKind()) return false }, } - // start watcher for DestinationRules. - return r.controller.Watch( - source.Kind(r.ctrlManager.GetCache(), destinationRuleType), - handler.EnqueueRequestForOwner(r.scheme, r.ctrlManager.GetRESTMapper(), - &nmapiv1alpha1.NATS{}, handler.OnlyControllerOwner()), - labelSelectorPredicate, - predicate.ResourceVersionChangedPredicate{}, - ignoreCreationPredicate, + // define handler. + objectHandler := handler.TypedEnqueueRequestForOwner[*unstructured.Unstructured](r.scheme, + r.ctrlManager.GetRESTMapper(), + &nmapiv1alpha1.NATS{}, + handler.OnlyControllerOwner(), ) + + return r.controller.Watch( + source.Kind( + r.ctrlManager.GetCache(), + destinationRuleType, + objectHandler, + labelSelectorPredicate, + ignoreCreationPredicate, + )) } diff --git a/internal/controller/nats/status_test.go b/internal/controller/nats/status_test.go index e1a89536..9dcf6d4a 100644 --- a/internal/controller/nats/status_test.go +++ b/internal/controller/nats/status_test.go @@ -5,14 +5,10 @@ import ( "testing" nmapiv1alpha1 "github.com/kyma-project/nats-manager/api/v1alpha1" - "github.com/kyma-project/nats-manager/pkg/k8s" "github.com/kyma-project/nats-manager/testutils" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" kmetav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "sigs.k8s.io/controller-runtime/pkg/predicate" - "sigs.k8s.io/controller-runtime/pkg/source" ) var ErrTestErrorMsg = errors.New("test error") @@ -223,21 +219,10 @@ func Test_watchDestinationRule(t *testing.T) { testEnv := NewMockedUnitTestEnvironment(t) reconciler := testEnv.Reconciler - destinationRuleType := &unstructured.Unstructured{ - Object: map[string]interface{}{ - "kind": k8s.DestinationRuleKind, - "apiVersion": k8s.DestinationRuleAPIVersion, - }, - } - // define mock behaviour testEnv.ctrlManager.On("GetCache").Return(nil) testEnv.ctrlManager.On("GetRESTMapper").Return(testEnv.Client.RESTMapper()) testEnv.controller.On("Watch", - source.Kind(nil, destinationRuleType), - mock.Anything, - mock.Anything, - predicate.ResourceVersionChangedPredicate{}, mock.Anything, ).Return(nil).Once() diff --git a/pkg/k8s/chart/mocks/renderer.go b/pkg/k8s/chart/mocks/renderer.go index 4e457234..9701a30a 100644 --- a/pkg/k8s/chart/mocks/renderer.go +++ b/pkg/k8s/chart/mocks/renderer.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.42.0. DO NOT EDIT. +// Code generated by mockery v2.50.0. DO NOT EDIT. package mocks diff --git a/pkg/k8s/mocks/client.go b/pkg/k8s/mocks/client.go index a4c92412..647157a3 100644 --- a/pkg/k8s/mocks/client.go +++ b/pkg/k8s/mocks/client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.42.0. DO NOT EDIT. +// Code generated by mockery v2.50.0. DO NOT EDIT. package mocks diff --git a/pkg/manager/mocks/manager.go b/pkg/manager/mocks/manager.go index c7b5d9f7..deb9f51b 100644 --- a/pkg/manager/mocks/manager.go +++ b/pkg/manager/mocks/manager.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.42.0. DO NOT EDIT. +// Code generated by mockery v2.50.0. DO NOT EDIT. package mocks diff --git a/pkg/metrics/mocks/collector.go b/pkg/metrics/mocks/collector.go index fe8b5f89..2d9b1030 100644 --- a/pkg/metrics/mocks/collector.go +++ b/pkg/metrics/mocks/collector.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.42.0. DO NOT EDIT. +// Code generated by mockery v2.50.0. DO NOT EDIT. package mocks @@ -20,7 +20,7 @@ func (_m *Collector) EXPECT() *Collector_Expecter { return &Collector_Expecter{mock: &_m.Mock} } -// GetAvailabilityZonesUsedMetric provides a mock function with given fields: +// GetAvailabilityZonesUsedMetric provides a mock function with no fields func (_m *Collector) GetAvailabilityZonesUsedMetric() (prometheus.Gauge, error) { ret := _m.Called() @@ -77,7 +77,7 @@ func (_c *Collector_GetAvailabilityZonesUsedMetric_Call) RunAndReturn(run func() return _c } -// GetClusterSizeMetric provides a mock function with given fields: +// GetClusterSizeMetric provides a mock function with no fields func (_m *Collector) GetClusterSizeMetric() (prometheus.Gauge, error) { ret := _m.Called() @@ -163,7 +163,7 @@ func (_c *Collector_RecordAvailabilityZonesUsedMetric_Call) Return() *Collector_ } func (_c *Collector_RecordAvailabilityZonesUsedMetric_Call) RunAndReturn(run func(int)) *Collector_RecordAvailabilityZonesUsedMetric_Call { - _c.Call.Return(run) + _c.Run(run) return _c } @@ -196,11 +196,11 @@ func (_c *Collector_RecordClusterSizeMetric_Call) Return() *Collector_RecordClus } func (_c *Collector_RecordClusterSizeMetric_Call) RunAndReturn(run func(int)) *Collector_RecordClusterSizeMetric_Call { - _c.Call.Return(run) + _c.Run(run) return _c } -// RegisterMetrics provides a mock function with given fields: +// RegisterMetrics provides a mock function with no fields func (_m *Collector) RegisterMetrics() { _m.Called() } @@ -228,11 +228,11 @@ func (_c *Collector_RegisterMetrics_Call) Return() *Collector_RegisterMetrics_Ca } func (_c *Collector_RegisterMetrics_Call) RunAndReturn(run func()) *Collector_RegisterMetrics_Call { - _c.Call.Return(run) + _c.Run(run) return _c } -// ResetAvailabilityZonesUsedMetric provides a mock function with given fields: +// ResetAvailabilityZonesUsedMetric provides a mock function with no fields func (_m *Collector) ResetAvailabilityZonesUsedMetric() { _m.Called() } @@ -260,11 +260,11 @@ func (_c *Collector_ResetAvailabilityZonesUsedMetric_Call) Return() *Collector_R } func (_c *Collector_ResetAvailabilityZonesUsedMetric_Call) RunAndReturn(run func()) *Collector_ResetAvailabilityZonesUsedMetric_Call { - _c.Call.Return(run) + _c.Run(run) return _c } -// ResetClusterSizeMetric provides a mock function with given fields: +// ResetClusterSizeMetric provides a mock function with no fields func (_m *Collector) ResetClusterSizeMetric() { _m.Called() } @@ -292,7 +292,7 @@ func (_c *Collector_ResetClusterSizeMetric_Call) Return() *Collector_ResetCluste } func (_c *Collector_ResetClusterSizeMetric_Call) RunAndReturn(run func()) *Collector_ResetClusterSizeMetric_Call { - _c.Call.Return(run) + _c.Run(run) return _c } diff --git a/pkg/nats/client.go b/pkg/nats/client.go index 8b054ea1..19c6ec7b 100644 --- a/pkg/nats/client.go +++ b/pkg/nats/client.go @@ -110,6 +110,8 @@ func (c *natsClient) Close() { } } +//go:generate go run github.com/vektra/mockery/v2 --name=Conn --outpkg=mocks --case=underscore +//go:generate go run github.com/vektra/mockery/v2 --name=JetStreamContext --dir=../../vendor/github.com/nats-io/nats.go --outpkg=mocks --case=underscore type Conn interface { Status() nats.Status JetStream() (nats.JetStreamContext, error) diff --git a/pkg/nats/client_unit_test.go b/pkg/nats/client_unit_test.go index e0ae6b3e..b92dc835 100644 --- a/pkg/nats/client_unit_test.go +++ b/pkg/nats/client_unit_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - nmctrlmocks "github.com/kyma-project/nats-manager/internal/controller/nats/mocks" + nmnatsmocks "github.com/kyma-project/nats-manager/pkg/nats/mocks" natsgo "github.com/nats-io/nats.go" "github.com/stretchr/testify/require" ) @@ -24,8 +24,8 @@ func Test_StreamExists(t *testing.T) { { name: "should no stream exist", createMockNatsClient: func() *natsClient { - mockNatsConn := &nmctrlmocks.NatsConn{} - jsCtx := &nmctrlmocks.JetStreamContext{} + mockNatsConn := &nmnatsmocks.Conn{} + jsCtx := &nmnatsmocks.JetStreamContext{} jsCtx.On("Streams").Return(returnEmptyStream()) mockNatsConn.On("JetStream").Return(jsCtx, nil) return &natsClient{conn: mockNatsConn} @@ -36,8 +36,8 @@ func Test_StreamExists(t *testing.T) { { name: "should streams exist", createMockNatsClient: func() *natsClient { - mockNatsConn := &nmctrlmocks.NatsConn{} - jsCtx := &nmctrlmocks.JetStreamContext{} + mockNatsConn := &nmnatsmocks.Conn{} + jsCtx := &nmnatsmocks.JetStreamContext{} jsCtx.On("Streams").Return(returnStreams()) mockNatsConn.On("JetStream").Return(jsCtx, nil) return &natsClient{conn: mockNatsConn} @@ -48,7 +48,7 @@ func Test_StreamExists(t *testing.T) { { name: "should fail getting JetStream context", createMockNatsClient: func() *natsClient { - mockNatsConn := &nmctrlmocks.NatsConn{} + mockNatsConn := &nmnatsmocks.Conn{} mockNatsConn.On("JetStream").Return(nil, fakeError) return &natsClient{conn: mockNatsConn} }, diff --git a/pkg/nats/mocks/client.go b/pkg/nats/mocks/client.go index e38b6359..4ece4dd3 100644 --- a/pkg/nats/mocks/client.go +++ b/pkg/nats/mocks/client.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.42.0. DO NOT EDIT. +// Code generated by mockery v2.50.0. DO NOT EDIT. package mocks @@ -21,7 +21,7 @@ func (_m *Client) EXPECT() *Client_Expecter { return &Client_Expecter{mock: &_m.Mock} } -// Close provides a mock function with given fields: +// Close provides a mock function with no fields func (_m *Client) Close() { _m.Called() } @@ -49,7 +49,7 @@ func (_c *Client_Close_Call) Return() *Client_Close_Call { } func (_c *Client_Close_Call) RunAndReturn(run func()) *Client_Close_Call { - _c.Call.Return(run) + _c.Run(run) return _c } @@ -109,7 +109,7 @@ func (_c *Client_ConsumersExist_Call) RunAndReturn(run func(string) (bool, error return _c } -// GetStreams provides a mock function with given fields: +// GetStreams provides a mock function with no fields func (_m *Client) GetStreams() ([]*nats_go.StreamInfo, error) { ret := _m.Called() @@ -166,7 +166,7 @@ func (_c *Client_GetStreams_Call) RunAndReturn(run func() ([]*nats_go.StreamInfo return _c } -// Init provides a mock function with given fields: +// Init provides a mock function with no fields func (_m *Client) Init() error { ret := _m.Called() @@ -211,7 +211,7 @@ func (_c *Client_Init_Call) RunAndReturn(run func() error) *Client_Init_Call { return _c } -// StreamExists provides a mock function with given fields: +// StreamExists provides a mock function with no fields func (_m *Client) StreamExists() (bool, error) { ret := _m.Called() diff --git a/pkg/nats/mocks/conn.go b/pkg/nats/mocks/conn.go new file mode 100644 index 00000000..4639c2ba --- /dev/null +++ b/pkg/nats/mocks/conn.go @@ -0,0 +1,215 @@ +// Code generated by mockery v2.50.0. DO NOT EDIT. + +package mocks + +import ( + mock "github.com/stretchr/testify/mock" + + nats_go "github.com/nats-io/nats.go" +) + +// Conn is an autogenerated mock type for the Conn type +type Conn struct { + mock.Mock +} + +type Conn_Expecter struct { + mock *mock.Mock +} + +func (_m *Conn) EXPECT() *Conn_Expecter { + return &Conn_Expecter{mock: &_m.Mock} +} + +// Close provides a mock function with no fields +func (_m *Conn) Close() { + _m.Called() +} + +// Conn_Close_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Close' +type Conn_Close_Call struct { + *mock.Call +} + +// Close is a helper method to define mock.On call +func (_e *Conn_Expecter) Close() *Conn_Close_Call { + return &Conn_Close_Call{Call: _e.mock.On("Close")} +} + +func (_c *Conn_Close_Call) Run(run func()) *Conn_Close_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *Conn_Close_Call) Return() *Conn_Close_Call { + _c.Call.Return() + return _c +} + +func (_c *Conn_Close_Call) RunAndReturn(run func()) *Conn_Close_Call { + _c.Run(run) + return _c +} + +// IsConnected provides a mock function with no fields +func (_m *Conn) IsConnected() bool { + ret := _m.Called() + + if len(ret) == 0 { + panic("no return value specified for IsConnected") + } + + var r0 bool + if rf, ok := ret.Get(0).(func() bool); ok { + r0 = rf() + } else { + r0 = ret.Get(0).(bool) + } + + return r0 +} + +// Conn_IsConnected_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'IsConnected' +type Conn_IsConnected_Call struct { + *mock.Call +} + +// IsConnected is a helper method to define mock.On call +func (_e *Conn_Expecter) IsConnected() *Conn_IsConnected_Call { + return &Conn_IsConnected_Call{Call: _e.mock.On("IsConnected")} +} + +func (_c *Conn_IsConnected_Call) Run(run func()) *Conn_IsConnected_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *Conn_IsConnected_Call) Return(_a0 bool) *Conn_IsConnected_Call { + _c.Call.Return(_a0) + return _c +} + +func (_c *Conn_IsConnected_Call) RunAndReturn(run func() bool) *Conn_IsConnected_Call { + _c.Call.Return(run) + return _c +} + +// JetStream provides a mock function with no fields +func (_m *Conn) JetStream() (nats_go.JetStreamContext, error) { + ret := _m.Called() + + if len(ret) == 0 { + panic("no return value specified for JetStream") + } + + var r0 nats_go.JetStreamContext + var r1 error + if rf, ok := ret.Get(0).(func() (nats_go.JetStreamContext, error)); ok { + return rf() + } + if rf, ok := ret.Get(0).(func() nats_go.JetStreamContext); ok { + r0 = rf() + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(nats_go.JetStreamContext) + } + } + + if rf, ok := ret.Get(1).(func() error); ok { + r1 = rf() + } else { + r1 = ret.Error(1) + } + + return r0, r1 +} + +// Conn_JetStream_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'JetStream' +type Conn_JetStream_Call struct { + *mock.Call +} + +// JetStream is a helper method to define mock.On call +func (_e *Conn_Expecter) JetStream() *Conn_JetStream_Call { + return &Conn_JetStream_Call{Call: _e.mock.On("JetStream")} +} + +func (_c *Conn_JetStream_Call) Run(run func()) *Conn_JetStream_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *Conn_JetStream_Call) Return(_a0 nats_go.JetStreamContext, _a1 error) *Conn_JetStream_Call { + _c.Call.Return(_a0, _a1) + return _c +} + +func (_c *Conn_JetStream_Call) RunAndReturn(run func() (nats_go.JetStreamContext, error)) *Conn_JetStream_Call { + _c.Call.Return(run) + return _c +} + +// Status provides a mock function with no fields +func (_m *Conn) Status() nats_go.Status { + ret := _m.Called() + + if len(ret) == 0 { + panic("no return value specified for Status") + } + + var r0 nats_go.Status + if rf, ok := ret.Get(0).(func() nats_go.Status); ok { + r0 = rf() + } else { + r0 = ret.Get(0).(nats_go.Status) + } + + return r0 +} + +// Conn_Status_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'Status' +type Conn_Status_Call struct { + *mock.Call +} + +// Status is a helper method to define mock.On call +func (_e *Conn_Expecter) Status() *Conn_Status_Call { + return &Conn_Status_Call{Call: _e.mock.On("Status")} +} + +func (_c *Conn_Status_Call) Run(run func()) *Conn_Status_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *Conn_Status_Call) Return(_a0 nats_go.Status) *Conn_Status_Call { + _c.Call.Return(_a0) + return _c +} + +func (_c *Conn_Status_Call) RunAndReturn(run func() nats_go.Status) *Conn_Status_Call { + _c.Call.Return(run) + return _c +} + +// NewConn creates a new instance of Conn. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations. +// The first argument is typically a *testing.T value. +func NewConn(t interface { + mock.TestingT + Cleanup(func()) +}) *Conn { + mock := &Conn{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} diff --git a/internal/controller/nats/mocks/js.go b/pkg/nats/mocks/jet_stream_context.go similarity index 66% rename from internal/controller/nats/mocks/js.go rename to pkg/nats/mocks/jet_stream_context.go index f4652337..e5230493 100644 --- a/internal/controller/nats/mocks/js.go +++ b/pkg/nats/mocks/jet_stream_context.go @@ -1,9 +1,9 @@ -// Code generated by mockery v2.30.1. DO NOT EDIT. +// Code generated by mockery v2.50.0. DO NOT EDIT. package mocks import ( - natsgo "github.com/nats-io/nats.go" + nats "github.com/nats-io/nats.go" mock "github.com/stretchr/testify/mock" ) @@ -21,7 +21,7 @@ func (_m *JetStreamContext) EXPECT() *JetStreamContext_Expecter { } // AccountInfo provides a mock function with given fields: opts -func (_m *JetStreamContext) AccountInfo(opts ...natsgo.JSOpt) (*natsgo.AccountInfo, error) { +func (_m *JetStreamContext) AccountInfo(opts ...nats.JSOpt) (*nats.AccountInfo, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -30,20 +30,24 @@ func (_m *JetStreamContext) AccountInfo(opts ...natsgo.JSOpt) (*natsgo.AccountIn _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.AccountInfo + if len(ret) == 0 { + panic("no return value specified for AccountInfo") + } + + var r0 *nats.AccountInfo var r1 error - if rf, ok := ret.Get(0).(func(...natsgo.JSOpt) (*natsgo.AccountInfo, error)); ok { + if rf, ok := ret.Get(0).(func(...nats.JSOpt) (*nats.AccountInfo, error)); ok { return rf(opts...) } - if rf, ok := ret.Get(0).(func(...natsgo.JSOpt) *natsgo.AccountInfo); ok { + if rf, ok := ret.Get(0).(func(...nats.JSOpt) *nats.AccountInfo); ok { r0 = rf(opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.AccountInfo) + r0 = ret.Get(0).(*nats.AccountInfo) } } - if rf, ok := ret.Get(1).(func(...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(1).(func(...nats.JSOpt) error); ok { r1 = rf(opts...) } else { r1 = ret.Error(1) @@ -58,18 +62,18 @@ type JetStreamContext_AccountInfo_Call struct { } // AccountInfo is a helper method to define mock.On call -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) AccountInfo(opts ...interface{}) *JetStreamContext_AccountInfo_Call { return &JetStreamContext_AccountInfo_Call{Call: _e.mock.On("AccountInfo", append([]interface{}{}, opts...)...)} } -func (_c *JetStreamContext_AccountInfo_Call) Run(run func(opts ...natsgo.JSOpt)) *JetStreamContext_AccountInfo_Call { +func (_c *JetStreamContext_AccountInfo_Call) Run(run func(opts ...nats.JSOpt)) *JetStreamContext_AccountInfo_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-0) + variadicArgs := make([]nats.JSOpt, len(args)-0) for i, a := range args[0:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(variadicArgs...) @@ -77,18 +81,18 @@ func (_c *JetStreamContext_AccountInfo_Call) Run(run func(opts ...natsgo.JSOpt)) return _c } -func (_c *JetStreamContext_AccountInfo_Call) Return(_a0 *natsgo.AccountInfo, _a1 error) *JetStreamContext_AccountInfo_Call { +func (_c *JetStreamContext_AccountInfo_Call) Return(_a0 *nats.AccountInfo, _a1 error) *JetStreamContext_AccountInfo_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_AccountInfo_Call) RunAndReturn(run func(...natsgo.JSOpt) (*natsgo.AccountInfo, error)) *JetStreamContext_AccountInfo_Call { +func (_c *JetStreamContext_AccountInfo_Call) RunAndReturn(run func(...nats.JSOpt) (*nats.AccountInfo, error)) *JetStreamContext_AccountInfo_Call { _c.Call.Return(run) return _c } // AddConsumer provides a mock function with given fields: stream, cfg, opts -func (_m *JetStreamContext) AddConsumer(stream string, cfg *natsgo.ConsumerConfig, opts ...natsgo.JSOpt) (*natsgo.ConsumerInfo, error) { +func (_m *JetStreamContext) AddConsumer(stream string, cfg *nats.ConsumerConfig, opts ...nats.JSOpt) (*nats.ConsumerInfo, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -98,20 +102,24 @@ func (_m *JetStreamContext) AddConsumer(stream string, cfg *natsgo.ConsumerConfi _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.ConsumerInfo + if len(ret) == 0 { + panic("no return value specified for AddConsumer") + } + + var r0 *nats.ConsumerInfo var r1 error - if rf, ok := ret.Get(0).(func(string, *natsgo.ConsumerConfig, ...natsgo.JSOpt) (*natsgo.ConsumerInfo, error)); ok { + if rf, ok := ret.Get(0).(func(string, *nats.ConsumerConfig, ...nats.JSOpt) (*nats.ConsumerInfo, error)); ok { return rf(stream, cfg, opts...) } - if rf, ok := ret.Get(0).(func(string, *natsgo.ConsumerConfig, ...natsgo.JSOpt) *natsgo.ConsumerInfo); ok { + if rf, ok := ret.Get(0).(func(string, *nats.ConsumerConfig, ...nats.JSOpt) *nats.ConsumerInfo); ok { r0 = rf(stream, cfg, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.ConsumerInfo) + r0 = ret.Get(0).(*nats.ConsumerInfo) } } - if rf, ok := ret.Get(1).(func(string, *natsgo.ConsumerConfig, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, *nats.ConsumerConfig, ...nats.JSOpt) error); ok { r1 = rf(stream, cfg, opts...) } else { r1 = ret.Error(1) @@ -127,38 +135,38 @@ type JetStreamContext_AddConsumer_Call struct { // AddConsumer is a helper method to define mock.On call // - stream string -// - cfg *natsgo.ConsumerConfig -// - opts ...natsgo.JSOpt +// - cfg *nats.ConsumerConfig +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) AddConsumer(stream interface{}, cfg interface{}, opts ...interface{}) *JetStreamContext_AddConsumer_Call { return &JetStreamContext_AddConsumer_Call{Call: _e.mock.On("AddConsumer", append([]interface{}{stream, cfg}, opts...)...)} } -func (_c *JetStreamContext_AddConsumer_Call) Run(run func(stream string, cfg *natsgo.ConsumerConfig, opts ...natsgo.JSOpt)) *JetStreamContext_AddConsumer_Call { +func (_c *JetStreamContext_AddConsumer_Call) Run(run func(stream string, cfg *nats.ConsumerConfig, opts ...nats.JSOpt)) *JetStreamContext_AddConsumer_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-2) + variadicArgs := make([]nats.JSOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } - run(args[0].(string), args[1].(*natsgo.ConsumerConfig), variadicArgs...) + run(args[0].(string), args[1].(*nats.ConsumerConfig), variadicArgs...) }) return _c } -func (_c *JetStreamContext_AddConsumer_Call) Return(_a0 *natsgo.ConsumerInfo, _a1 error) *JetStreamContext_AddConsumer_Call { +func (_c *JetStreamContext_AddConsumer_Call) Return(_a0 *nats.ConsumerInfo, _a1 error) *JetStreamContext_AddConsumer_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_AddConsumer_Call) RunAndReturn(run func(string, *natsgo.ConsumerConfig, ...natsgo.JSOpt) (*natsgo.ConsumerInfo, error)) *JetStreamContext_AddConsumer_Call { +func (_c *JetStreamContext_AddConsumer_Call) RunAndReturn(run func(string, *nats.ConsumerConfig, ...nats.JSOpt) (*nats.ConsumerInfo, error)) *JetStreamContext_AddConsumer_Call { _c.Call.Return(run) return _c } // AddStream provides a mock function with given fields: cfg, opts -func (_m *JetStreamContext) AddStream(cfg *natsgo.StreamConfig, opts ...natsgo.JSOpt) (*natsgo.StreamInfo, error) { +func (_m *JetStreamContext) AddStream(cfg *nats.StreamConfig, opts ...nats.JSOpt) (*nats.StreamInfo, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -168,20 +176,24 @@ func (_m *JetStreamContext) AddStream(cfg *natsgo.StreamConfig, opts ...natsgo.J _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.StreamInfo + if len(ret) == 0 { + panic("no return value specified for AddStream") + } + + var r0 *nats.StreamInfo var r1 error - if rf, ok := ret.Get(0).(func(*natsgo.StreamConfig, ...natsgo.JSOpt) (*natsgo.StreamInfo, error)); ok { + if rf, ok := ret.Get(0).(func(*nats.StreamConfig, ...nats.JSOpt) (*nats.StreamInfo, error)); ok { return rf(cfg, opts...) } - if rf, ok := ret.Get(0).(func(*natsgo.StreamConfig, ...natsgo.JSOpt) *natsgo.StreamInfo); ok { + if rf, ok := ret.Get(0).(func(*nats.StreamConfig, ...nats.JSOpt) *nats.StreamInfo); ok { r0 = rf(cfg, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.StreamInfo) + r0 = ret.Get(0).(*nats.StreamInfo) } } - if rf, ok := ret.Get(1).(func(*natsgo.StreamConfig, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(1).(func(*nats.StreamConfig, ...nats.JSOpt) error); ok { r1 = rf(cfg, opts...) } else { r1 = ret.Error(1) @@ -196,38 +208,38 @@ type JetStreamContext_AddStream_Call struct { } // AddStream is a helper method to define mock.On call -// - cfg *natsgo.StreamConfig -// - opts ...natsgo.JSOpt +// - cfg *nats.StreamConfig +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) AddStream(cfg interface{}, opts ...interface{}) *JetStreamContext_AddStream_Call { return &JetStreamContext_AddStream_Call{Call: _e.mock.On("AddStream", append([]interface{}{cfg}, opts...)...)} } -func (_c *JetStreamContext_AddStream_Call) Run(run func(cfg *natsgo.StreamConfig, opts ...natsgo.JSOpt)) *JetStreamContext_AddStream_Call { +func (_c *JetStreamContext_AddStream_Call) Run(run func(cfg *nats.StreamConfig, opts ...nats.JSOpt)) *JetStreamContext_AddStream_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-1) + variadicArgs := make([]nats.JSOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } - run(args[0].(*natsgo.StreamConfig), variadicArgs...) + run(args[0].(*nats.StreamConfig), variadicArgs...) }) return _c } -func (_c *JetStreamContext_AddStream_Call) Return(_a0 *natsgo.StreamInfo, _a1 error) *JetStreamContext_AddStream_Call { +func (_c *JetStreamContext_AddStream_Call) Return(_a0 *nats.StreamInfo, _a1 error) *JetStreamContext_AddStream_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_AddStream_Call) RunAndReturn(run func(*natsgo.StreamConfig, ...natsgo.JSOpt) (*natsgo.StreamInfo, error)) *JetStreamContext_AddStream_Call { +func (_c *JetStreamContext_AddStream_Call) RunAndReturn(run func(*nats.StreamConfig, ...nats.JSOpt) (*nats.StreamInfo, error)) *JetStreamContext_AddStream_Call { _c.Call.Return(run) return _c } // ChanQueueSubscribe provides a mock function with given fields: subj, queue, ch, opts -func (_m *JetStreamContext) ChanQueueSubscribe(subj string, queue string, ch chan *natsgo.Msg, opts ...natsgo.SubOpt) (*natsgo.Subscription, error) { +func (_m *JetStreamContext) ChanQueueSubscribe(subj string, queue string, ch chan *nats.Msg, opts ...nats.SubOpt) (*nats.Subscription, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -237,20 +249,24 @@ func (_m *JetStreamContext) ChanQueueSubscribe(subj string, queue string, ch cha _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.Subscription + if len(ret) == 0 { + panic("no return value specified for ChanQueueSubscribe") + } + + var r0 *nats.Subscription var r1 error - if rf, ok := ret.Get(0).(func(string, string, chan *natsgo.Msg, ...natsgo.SubOpt) (*natsgo.Subscription, error)); ok { + if rf, ok := ret.Get(0).(func(string, string, chan *nats.Msg, ...nats.SubOpt) (*nats.Subscription, error)); ok { return rf(subj, queue, ch, opts...) } - if rf, ok := ret.Get(0).(func(string, string, chan *natsgo.Msg, ...natsgo.SubOpt) *natsgo.Subscription); ok { + if rf, ok := ret.Get(0).(func(string, string, chan *nats.Msg, ...nats.SubOpt) *nats.Subscription); ok { r0 = rf(subj, queue, ch, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.Subscription) + r0 = ret.Get(0).(*nats.Subscription) } } - if rf, ok := ret.Get(1).(func(string, string, chan *natsgo.Msg, ...natsgo.SubOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, string, chan *nats.Msg, ...nats.SubOpt) error); ok { r1 = rf(subj, queue, ch, opts...) } else { r1 = ret.Error(1) @@ -267,38 +283,38 @@ type JetStreamContext_ChanQueueSubscribe_Call struct { // ChanQueueSubscribe is a helper method to define mock.On call // - subj string // - queue string -// - ch chan *natsgo.Msg -// - opts ...natsgo.SubOpt +// - ch chan *nats.Msg +// - opts ...nats.SubOpt func (_e *JetStreamContext_Expecter) ChanQueueSubscribe(subj interface{}, queue interface{}, ch interface{}, opts ...interface{}) *JetStreamContext_ChanQueueSubscribe_Call { return &JetStreamContext_ChanQueueSubscribe_Call{Call: _e.mock.On("ChanQueueSubscribe", append([]interface{}{subj, queue, ch}, opts...)...)} } -func (_c *JetStreamContext_ChanQueueSubscribe_Call) Run(run func(subj string, queue string, ch chan *natsgo.Msg, opts ...natsgo.SubOpt)) *JetStreamContext_ChanQueueSubscribe_Call { +func (_c *JetStreamContext_ChanQueueSubscribe_Call) Run(run func(subj string, queue string, ch chan *nats.Msg, opts ...nats.SubOpt)) *JetStreamContext_ChanQueueSubscribe_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.SubOpt, len(args)-3) + variadicArgs := make([]nats.SubOpt, len(args)-3) for i, a := range args[3:] { if a != nil { - variadicArgs[i] = a.(natsgo.SubOpt) + variadicArgs[i] = a.(nats.SubOpt) } } - run(args[0].(string), args[1].(string), args[2].(chan *natsgo.Msg), variadicArgs...) + run(args[0].(string), args[1].(string), args[2].(chan *nats.Msg), variadicArgs...) }) return _c } -func (_c *JetStreamContext_ChanQueueSubscribe_Call) Return(_a0 *natsgo.Subscription, _a1 error) *JetStreamContext_ChanQueueSubscribe_Call { +func (_c *JetStreamContext_ChanQueueSubscribe_Call) Return(_a0 *nats.Subscription, _a1 error) *JetStreamContext_ChanQueueSubscribe_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_ChanQueueSubscribe_Call) RunAndReturn(run func(string, string, chan *natsgo.Msg, ...natsgo.SubOpt) (*natsgo.Subscription, error)) *JetStreamContext_ChanQueueSubscribe_Call { +func (_c *JetStreamContext_ChanQueueSubscribe_Call) RunAndReturn(run func(string, string, chan *nats.Msg, ...nats.SubOpt) (*nats.Subscription, error)) *JetStreamContext_ChanQueueSubscribe_Call { _c.Call.Return(run) return _c } // ChanSubscribe provides a mock function with given fields: subj, ch, opts -func (_m *JetStreamContext) ChanSubscribe(subj string, ch chan *natsgo.Msg, opts ...natsgo.SubOpt) (*natsgo.Subscription, error) { +func (_m *JetStreamContext) ChanSubscribe(subj string, ch chan *nats.Msg, opts ...nats.SubOpt) (*nats.Subscription, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -308,20 +324,24 @@ func (_m *JetStreamContext) ChanSubscribe(subj string, ch chan *natsgo.Msg, opts _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.Subscription + if len(ret) == 0 { + panic("no return value specified for ChanSubscribe") + } + + var r0 *nats.Subscription var r1 error - if rf, ok := ret.Get(0).(func(string, chan *natsgo.Msg, ...natsgo.SubOpt) (*natsgo.Subscription, error)); ok { + if rf, ok := ret.Get(0).(func(string, chan *nats.Msg, ...nats.SubOpt) (*nats.Subscription, error)); ok { return rf(subj, ch, opts...) } - if rf, ok := ret.Get(0).(func(string, chan *natsgo.Msg, ...natsgo.SubOpt) *natsgo.Subscription); ok { + if rf, ok := ret.Get(0).(func(string, chan *nats.Msg, ...nats.SubOpt) *nats.Subscription); ok { r0 = rf(subj, ch, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.Subscription) + r0 = ret.Get(0).(*nats.Subscription) } } - if rf, ok := ret.Get(1).(func(string, chan *natsgo.Msg, ...natsgo.SubOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, chan *nats.Msg, ...nats.SubOpt) error); ok { r1 = rf(subj, ch, opts...) } else { r1 = ret.Error(1) @@ -337,38 +357,70 @@ type JetStreamContext_ChanSubscribe_Call struct { // ChanSubscribe is a helper method to define mock.On call // - subj string -// - ch chan *natsgo.Msg -// - opts ...natsgo.SubOpt +// - ch chan *nats.Msg +// - opts ...nats.SubOpt func (_e *JetStreamContext_Expecter) ChanSubscribe(subj interface{}, ch interface{}, opts ...interface{}) *JetStreamContext_ChanSubscribe_Call { return &JetStreamContext_ChanSubscribe_Call{Call: _e.mock.On("ChanSubscribe", append([]interface{}{subj, ch}, opts...)...)} } -func (_c *JetStreamContext_ChanSubscribe_Call) Run(run func(subj string, ch chan *natsgo.Msg, opts ...natsgo.SubOpt)) *JetStreamContext_ChanSubscribe_Call { +func (_c *JetStreamContext_ChanSubscribe_Call) Run(run func(subj string, ch chan *nats.Msg, opts ...nats.SubOpt)) *JetStreamContext_ChanSubscribe_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.SubOpt, len(args)-2) + variadicArgs := make([]nats.SubOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.SubOpt) + variadicArgs[i] = a.(nats.SubOpt) } } - run(args[0].(string), args[1].(chan *natsgo.Msg), variadicArgs...) + run(args[0].(string), args[1].(chan *nats.Msg), variadicArgs...) }) return _c } -func (_c *JetStreamContext_ChanSubscribe_Call) Return(_a0 *natsgo.Subscription, _a1 error) *JetStreamContext_ChanSubscribe_Call { +func (_c *JetStreamContext_ChanSubscribe_Call) Return(_a0 *nats.Subscription, _a1 error) *JetStreamContext_ChanSubscribe_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_ChanSubscribe_Call) RunAndReturn(run func(string, chan *natsgo.Msg, ...natsgo.SubOpt) (*natsgo.Subscription, error)) *JetStreamContext_ChanSubscribe_Call { +func (_c *JetStreamContext_ChanSubscribe_Call) RunAndReturn(run func(string, chan *nats.Msg, ...nats.SubOpt) (*nats.Subscription, error)) *JetStreamContext_ChanSubscribe_Call { _c.Call.Return(run) return _c } +// CleanupPublisher provides a mock function with no fields +func (_m *JetStreamContext) CleanupPublisher() { + _m.Called() +} + +// JetStreamContext_CleanupPublisher_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CleanupPublisher' +type JetStreamContext_CleanupPublisher_Call struct { + *mock.Call +} + +// CleanupPublisher is a helper method to define mock.On call +func (_e *JetStreamContext_Expecter) CleanupPublisher() *JetStreamContext_CleanupPublisher_Call { + return &JetStreamContext_CleanupPublisher_Call{Call: _e.mock.On("CleanupPublisher")} +} + +func (_c *JetStreamContext_CleanupPublisher_Call) Run(run func()) *JetStreamContext_CleanupPublisher_Call { + _c.Call.Run(func(args mock.Arguments) { + run() + }) + return _c +} + +func (_c *JetStreamContext_CleanupPublisher_Call) Return() *JetStreamContext_CleanupPublisher_Call { + _c.Call.Return() + return _c +} + +func (_c *JetStreamContext_CleanupPublisher_Call) RunAndReturn(run func()) *JetStreamContext_CleanupPublisher_Call { + _c.Run(run) + return _c +} + // ConsumerInfo provides a mock function with given fields: stream, name, opts -func (_m *JetStreamContext) ConsumerInfo(stream string, name string, opts ...natsgo.JSOpt) (*natsgo.ConsumerInfo, error) { +func (_m *JetStreamContext) ConsumerInfo(stream string, name string, opts ...nats.JSOpt) (*nats.ConsumerInfo, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -378,20 +430,24 @@ func (_m *JetStreamContext) ConsumerInfo(stream string, name string, opts ...nat _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.ConsumerInfo + if len(ret) == 0 { + panic("no return value specified for ConsumerInfo") + } + + var r0 *nats.ConsumerInfo var r1 error - if rf, ok := ret.Get(0).(func(string, string, ...natsgo.JSOpt) (*natsgo.ConsumerInfo, error)); ok { + if rf, ok := ret.Get(0).(func(string, string, ...nats.JSOpt) (*nats.ConsumerInfo, error)); ok { return rf(stream, name, opts...) } - if rf, ok := ret.Get(0).(func(string, string, ...natsgo.JSOpt) *natsgo.ConsumerInfo); ok { + if rf, ok := ret.Get(0).(func(string, string, ...nats.JSOpt) *nats.ConsumerInfo); ok { r0 = rf(stream, name, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.ConsumerInfo) + r0 = ret.Get(0).(*nats.ConsumerInfo) } } - if rf, ok := ret.Get(1).(func(string, string, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, string, ...nats.JSOpt) error); ok { r1 = rf(stream, name, opts...) } else { r1 = ret.Error(1) @@ -408,18 +464,18 @@ type JetStreamContext_ConsumerInfo_Call struct { // ConsumerInfo is a helper method to define mock.On call // - stream string // - name string -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) ConsumerInfo(stream interface{}, name interface{}, opts ...interface{}) *JetStreamContext_ConsumerInfo_Call { return &JetStreamContext_ConsumerInfo_Call{Call: _e.mock.On("ConsumerInfo", append([]interface{}{stream, name}, opts...)...)} } -func (_c *JetStreamContext_ConsumerInfo_Call) Run(run func(stream string, name string, opts ...natsgo.JSOpt)) *JetStreamContext_ConsumerInfo_Call { +func (_c *JetStreamContext_ConsumerInfo_Call) Run(run func(stream string, name string, opts ...nats.JSOpt)) *JetStreamContext_ConsumerInfo_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-2) + variadicArgs := make([]nats.JSOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), args[1].(string), variadicArgs...) @@ -427,18 +483,18 @@ func (_c *JetStreamContext_ConsumerInfo_Call) Run(run func(stream string, name s return _c } -func (_c *JetStreamContext_ConsumerInfo_Call) Return(_a0 *natsgo.ConsumerInfo, _a1 error) *JetStreamContext_ConsumerInfo_Call { +func (_c *JetStreamContext_ConsumerInfo_Call) Return(_a0 *nats.ConsumerInfo, _a1 error) *JetStreamContext_ConsumerInfo_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_ConsumerInfo_Call) RunAndReturn(run func(string, string, ...natsgo.JSOpt) (*natsgo.ConsumerInfo, error)) *JetStreamContext_ConsumerInfo_Call { +func (_c *JetStreamContext_ConsumerInfo_Call) RunAndReturn(run func(string, string, ...nats.JSOpt) (*nats.ConsumerInfo, error)) *JetStreamContext_ConsumerInfo_Call { _c.Call.Return(run) return _c } // ConsumerNames provides a mock function with given fields: stream, opts -func (_m *JetStreamContext) ConsumerNames(stream string, opts ...natsgo.JSOpt) <-chan string { +func (_m *JetStreamContext) ConsumerNames(stream string, opts ...nats.JSOpt) <-chan string { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -448,8 +504,12 @@ func (_m *JetStreamContext) ConsumerNames(stream string, opts ...natsgo.JSOpt) < _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for ConsumerNames") + } + var r0 <-chan string - if rf, ok := ret.Get(0).(func(string, ...natsgo.JSOpt) <-chan string); ok { + if rf, ok := ret.Get(0).(func(string, ...nats.JSOpt) <-chan string); ok { r0 = rf(stream, opts...) } else { if ret.Get(0) != nil { @@ -467,18 +527,18 @@ type JetStreamContext_ConsumerNames_Call struct { // ConsumerNames is a helper method to define mock.On call // - stream string -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) ConsumerNames(stream interface{}, opts ...interface{}) *JetStreamContext_ConsumerNames_Call { return &JetStreamContext_ConsumerNames_Call{Call: _e.mock.On("ConsumerNames", append([]interface{}{stream}, opts...)...)} } -func (_c *JetStreamContext_ConsumerNames_Call) Run(run func(stream string, opts ...natsgo.JSOpt)) *JetStreamContext_ConsumerNames_Call { +func (_c *JetStreamContext_ConsumerNames_Call) Run(run func(stream string, opts ...nats.JSOpt)) *JetStreamContext_ConsumerNames_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-1) + variadicArgs := make([]nats.JSOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), variadicArgs...) @@ -491,13 +551,13 @@ func (_c *JetStreamContext_ConsumerNames_Call) Return(_a0 <-chan string) *JetStr return _c } -func (_c *JetStreamContext_ConsumerNames_Call) RunAndReturn(run func(string, ...natsgo.JSOpt) <-chan string) *JetStreamContext_ConsumerNames_Call { +func (_c *JetStreamContext_ConsumerNames_Call) RunAndReturn(run func(string, ...nats.JSOpt) <-chan string) *JetStreamContext_ConsumerNames_Call { _c.Call.Return(run) return _c } // Consumers provides a mock function with given fields: stream, opts -func (_m *JetStreamContext) Consumers(stream string, opts ...natsgo.JSOpt) <-chan *natsgo.ConsumerInfo { +func (_m *JetStreamContext) Consumers(stream string, opts ...nats.JSOpt) <-chan *nats.ConsumerInfo { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -507,12 +567,16 @@ func (_m *JetStreamContext) Consumers(stream string, opts ...natsgo.JSOpt) <-cha _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 <-chan *natsgo.ConsumerInfo - if rf, ok := ret.Get(0).(func(string, ...natsgo.JSOpt) <-chan *natsgo.ConsumerInfo); ok { + if len(ret) == 0 { + panic("no return value specified for Consumers") + } + + var r0 <-chan *nats.ConsumerInfo + if rf, ok := ret.Get(0).(func(string, ...nats.JSOpt) <-chan *nats.ConsumerInfo); ok { r0 = rf(stream, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan *natsgo.ConsumerInfo) + r0 = ret.Get(0).(<-chan *nats.ConsumerInfo) } } @@ -526,18 +590,18 @@ type JetStreamContext_Consumers_Call struct { // Consumers is a helper method to define mock.On call // - stream string -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) Consumers(stream interface{}, opts ...interface{}) *JetStreamContext_Consumers_Call { return &JetStreamContext_Consumers_Call{Call: _e.mock.On("Consumers", append([]interface{}{stream}, opts...)...)} } -func (_c *JetStreamContext_Consumers_Call) Run(run func(stream string, opts ...natsgo.JSOpt)) *JetStreamContext_Consumers_Call { +func (_c *JetStreamContext_Consumers_Call) Run(run func(stream string, opts ...nats.JSOpt)) *JetStreamContext_Consumers_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-1) + variadicArgs := make([]nats.JSOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), variadicArgs...) @@ -545,18 +609,18 @@ func (_c *JetStreamContext_Consumers_Call) Run(run func(stream string, opts ...n return _c } -func (_c *JetStreamContext_Consumers_Call) Return(_a0 <-chan *natsgo.ConsumerInfo) *JetStreamContext_Consumers_Call { +func (_c *JetStreamContext_Consumers_Call) Return(_a0 <-chan *nats.ConsumerInfo) *JetStreamContext_Consumers_Call { _c.Call.Return(_a0) return _c } -func (_c *JetStreamContext_Consumers_Call) RunAndReturn(run func(string, ...natsgo.JSOpt) <-chan *natsgo.ConsumerInfo) *JetStreamContext_Consumers_Call { +func (_c *JetStreamContext_Consumers_Call) RunAndReturn(run func(string, ...nats.JSOpt) <-chan *nats.ConsumerInfo) *JetStreamContext_Consumers_Call { _c.Call.Return(run) return _c } // ConsumersInfo provides a mock function with given fields: stream, opts -func (_m *JetStreamContext) ConsumersInfo(stream string, opts ...natsgo.JSOpt) <-chan *natsgo.ConsumerInfo { +func (_m *JetStreamContext) ConsumersInfo(stream string, opts ...nats.JSOpt) <-chan *nats.ConsumerInfo { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -566,12 +630,16 @@ func (_m *JetStreamContext) ConsumersInfo(stream string, opts ...natsgo.JSOpt) < _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 <-chan *natsgo.ConsumerInfo - if rf, ok := ret.Get(0).(func(string, ...natsgo.JSOpt) <-chan *natsgo.ConsumerInfo); ok { + if len(ret) == 0 { + panic("no return value specified for ConsumersInfo") + } + + var r0 <-chan *nats.ConsumerInfo + if rf, ok := ret.Get(0).(func(string, ...nats.JSOpt) <-chan *nats.ConsumerInfo); ok { r0 = rf(stream, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan *natsgo.ConsumerInfo) + r0 = ret.Get(0).(<-chan *nats.ConsumerInfo) } } @@ -585,18 +653,18 @@ type JetStreamContext_ConsumersInfo_Call struct { // ConsumersInfo is a helper method to define mock.On call // - stream string -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) ConsumersInfo(stream interface{}, opts ...interface{}) *JetStreamContext_ConsumersInfo_Call { return &JetStreamContext_ConsumersInfo_Call{Call: _e.mock.On("ConsumersInfo", append([]interface{}{stream}, opts...)...)} } -func (_c *JetStreamContext_ConsumersInfo_Call) Run(run func(stream string, opts ...natsgo.JSOpt)) *JetStreamContext_ConsumersInfo_Call { +func (_c *JetStreamContext_ConsumersInfo_Call) Run(run func(stream string, opts ...nats.JSOpt)) *JetStreamContext_ConsumersInfo_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-1) + variadicArgs := make([]nats.JSOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), variadicArgs...) @@ -604,34 +672,38 @@ func (_c *JetStreamContext_ConsumersInfo_Call) Run(run func(stream string, opts return _c } -func (_c *JetStreamContext_ConsumersInfo_Call) Return(_a0 <-chan *natsgo.ConsumerInfo) *JetStreamContext_ConsumersInfo_Call { +func (_c *JetStreamContext_ConsumersInfo_Call) Return(_a0 <-chan *nats.ConsumerInfo) *JetStreamContext_ConsumersInfo_Call { _c.Call.Return(_a0) return _c } -func (_c *JetStreamContext_ConsumersInfo_Call) RunAndReturn(run func(string, ...natsgo.JSOpt) <-chan *natsgo.ConsumerInfo) *JetStreamContext_ConsumersInfo_Call { +func (_c *JetStreamContext_ConsumersInfo_Call) RunAndReturn(run func(string, ...nats.JSOpt) <-chan *nats.ConsumerInfo) *JetStreamContext_ConsumersInfo_Call { _c.Call.Return(run) return _c } // CreateKeyValue provides a mock function with given fields: cfg -func (_m *JetStreamContext) CreateKeyValue(cfg *natsgo.KeyValueConfig) (natsgo.KeyValue, error) { +func (_m *JetStreamContext) CreateKeyValue(cfg *nats.KeyValueConfig) (nats.KeyValue, error) { ret := _m.Called(cfg) - var r0 natsgo.KeyValue + if len(ret) == 0 { + panic("no return value specified for CreateKeyValue") + } + + var r0 nats.KeyValue var r1 error - if rf, ok := ret.Get(0).(func(*natsgo.KeyValueConfig) (natsgo.KeyValue, error)); ok { + if rf, ok := ret.Get(0).(func(*nats.KeyValueConfig) (nats.KeyValue, error)); ok { return rf(cfg) } - if rf, ok := ret.Get(0).(func(*natsgo.KeyValueConfig) natsgo.KeyValue); ok { + if rf, ok := ret.Get(0).(func(*nats.KeyValueConfig) nats.KeyValue); ok { r0 = rf(cfg) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(natsgo.KeyValue) + r0 = ret.Get(0).(nats.KeyValue) } } - if rf, ok := ret.Get(1).(func(*natsgo.KeyValueConfig) error); ok { + if rf, ok := ret.Get(1).(func(*nats.KeyValueConfig) error); ok { r1 = rf(cfg) } else { r1 = ret.Error(1) @@ -646,46 +718,50 @@ type JetStreamContext_CreateKeyValue_Call struct { } // CreateKeyValue is a helper method to define mock.On call -// - cfg *natsgo.KeyValueConfig +// - cfg *nats.KeyValueConfig func (_e *JetStreamContext_Expecter) CreateKeyValue(cfg interface{}) *JetStreamContext_CreateKeyValue_Call { return &JetStreamContext_CreateKeyValue_Call{Call: _e.mock.On("CreateKeyValue", cfg)} } -func (_c *JetStreamContext_CreateKeyValue_Call) Run(run func(cfg *natsgo.KeyValueConfig)) *JetStreamContext_CreateKeyValue_Call { +func (_c *JetStreamContext_CreateKeyValue_Call) Run(run func(cfg *nats.KeyValueConfig)) *JetStreamContext_CreateKeyValue_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(*natsgo.KeyValueConfig)) + run(args[0].(*nats.KeyValueConfig)) }) return _c } -func (_c *JetStreamContext_CreateKeyValue_Call) Return(_a0 natsgo.KeyValue, _a1 error) *JetStreamContext_CreateKeyValue_Call { +func (_c *JetStreamContext_CreateKeyValue_Call) Return(_a0 nats.KeyValue, _a1 error) *JetStreamContext_CreateKeyValue_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_CreateKeyValue_Call) RunAndReturn(run func(*natsgo.KeyValueConfig) (natsgo.KeyValue, error)) *JetStreamContext_CreateKeyValue_Call { +func (_c *JetStreamContext_CreateKeyValue_Call) RunAndReturn(run func(*nats.KeyValueConfig) (nats.KeyValue, error)) *JetStreamContext_CreateKeyValue_Call { _c.Call.Return(run) return _c } // CreateObjectStore provides a mock function with given fields: cfg -func (_m *JetStreamContext) CreateObjectStore(cfg *natsgo.ObjectStoreConfig) (natsgo.ObjectStore, error) { +func (_m *JetStreamContext) CreateObjectStore(cfg *nats.ObjectStoreConfig) (nats.ObjectStore, error) { ret := _m.Called(cfg) - var r0 natsgo.ObjectStore + if len(ret) == 0 { + panic("no return value specified for CreateObjectStore") + } + + var r0 nats.ObjectStore var r1 error - if rf, ok := ret.Get(0).(func(*natsgo.ObjectStoreConfig) (natsgo.ObjectStore, error)); ok { + if rf, ok := ret.Get(0).(func(*nats.ObjectStoreConfig) (nats.ObjectStore, error)); ok { return rf(cfg) } - if rf, ok := ret.Get(0).(func(*natsgo.ObjectStoreConfig) natsgo.ObjectStore); ok { + if rf, ok := ret.Get(0).(func(*nats.ObjectStoreConfig) nats.ObjectStore); ok { r0 = rf(cfg) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(natsgo.ObjectStore) + r0 = ret.Get(0).(nats.ObjectStore) } } - if rf, ok := ret.Get(1).(func(*natsgo.ObjectStoreConfig) error); ok { + if rf, ok := ret.Get(1).(func(*nats.ObjectStoreConfig) error); ok { r1 = rf(cfg) } else { r1 = ret.Error(1) @@ -700,30 +776,30 @@ type JetStreamContext_CreateObjectStore_Call struct { } // CreateObjectStore is a helper method to define mock.On call -// - cfg *natsgo.ObjectStoreConfig +// - cfg *nats.ObjectStoreConfig func (_e *JetStreamContext_Expecter) CreateObjectStore(cfg interface{}) *JetStreamContext_CreateObjectStore_Call { return &JetStreamContext_CreateObjectStore_Call{Call: _e.mock.On("CreateObjectStore", cfg)} } -func (_c *JetStreamContext_CreateObjectStore_Call) Run(run func(cfg *natsgo.ObjectStoreConfig)) *JetStreamContext_CreateObjectStore_Call { +func (_c *JetStreamContext_CreateObjectStore_Call) Run(run func(cfg *nats.ObjectStoreConfig)) *JetStreamContext_CreateObjectStore_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(*natsgo.ObjectStoreConfig)) + run(args[0].(*nats.ObjectStoreConfig)) }) return _c } -func (_c *JetStreamContext_CreateObjectStore_Call) Return(_a0 natsgo.ObjectStore, _a1 error) *JetStreamContext_CreateObjectStore_Call { +func (_c *JetStreamContext_CreateObjectStore_Call) Return(_a0 nats.ObjectStore, _a1 error) *JetStreamContext_CreateObjectStore_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_CreateObjectStore_Call) RunAndReturn(run func(*natsgo.ObjectStoreConfig) (natsgo.ObjectStore, error)) *JetStreamContext_CreateObjectStore_Call { +func (_c *JetStreamContext_CreateObjectStore_Call) RunAndReturn(run func(*nats.ObjectStoreConfig) (nats.ObjectStore, error)) *JetStreamContext_CreateObjectStore_Call { _c.Call.Return(run) return _c } // DeleteConsumer provides a mock function with given fields: stream, consumer, opts -func (_m *JetStreamContext) DeleteConsumer(stream string, consumer string, opts ...natsgo.JSOpt) error { +func (_m *JetStreamContext) DeleteConsumer(stream string, consumer string, opts ...nats.JSOpt) error { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -733,8 +809,12 @@ func (_m *JetStreamContext) DeleteConsumer(stream string, consumer string, opts _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for DeleteConsumer") + } + var r0 error - if rf, ok := ret.Get(0).(func(string, string, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(0).(func(string, string, ...nats.JSOpt) error); ok { r0 = rf(stream, consumer, opts...) } else { r0 = ret.Error(0) @@ -751,18 +831,18 @@ type JetStreamContext_DeleteConsumer_Call struct { // DeleteConsumer is a helper method to define mock.On call // - stream string // - consumer string -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) DeleteConsumer(stream interface{}, consumer interface{}, opts ...interface{}) *JetStreamContext_DeleteConsumer_Call { return &JetStreamContext_DeleteConsumer_Call{Call: _e.mock.On("DeleteConsumer", append([]interface{}{stream, consumer}, opts...)...)} } -func (_c *JetStreamContext_DeleteConsumer_Call) Run(run func(stream string, consumer string, opts ...natsgo.JSOpt)) *JetStreamContext_DeleteConsumer_Call { +func (_c *JetStreamContext_DeleteConsumer_Call) Run(run func(stream string, consumer string, opts ...nats.JSOpt)) *JetStreamContext_DeleteConsumer_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-2) + variadicArgs := make([]nats.JSOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), args[1].(string), variadicArgs...) @@ -775,7 +855,7 @@ func (_c *JetStreamContext_DeleteConsumer_Call) Return(_a0 error) *JetStreamCont return _c } -func (_c *JetStreamContext_DeleteConsumer_Call) RunAndReturn(run func(string, string, ...natsgo.JSOpt) error) *JetStreamContext_DeleteConsumer_Call { +func (_c *JetStreamContext_DeleteConsumer_Call) RunAndReturn(run func(string, string, ...nats.JSOpt) error) *JetStreamContext_DeleteConsumer_Call { _c.Call.Return(run) return _c } @@ -784,6 +864,10 @@ func (_c *JetStreamContext_DeleteConsumer_Call) RunAndReturn(run func(string, st func (_m *JetStreamContext) DeleteKeyValue(bucket string) error { ret := _m.Called(bucket) + if len(ret) == 0 { + panic("no return value specified for DeleteKeyValue") + } + var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { r0 = rf(bucket) @@ -823,7 +907,7 @@ func (_c *JetStreamContext_DeleteKeyValue_Call) RunAndReturn(run func(string) er } // DeleteMsg provides a mock function with given fields: name, seq, opts -func (_m *JetStreamContext) DeleteMsg(name string, seq uint64, opts ...natsgo.JSOpt) error { +func (_m *JetStreamContext) DeleteMsg(name string, seq uint64, opts ...nats.JSOpt) error { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -833,8 +917,12 @@ func (_m *JetStreamContext) DeleteMsg(name string, seq uint64, opts ...natsgo.JS _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for DeleteMsg") + } + var r0 error - if rf, ok := ret.Get(0).(func(string, uint64, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(0).(func(string, uint64, ...nats.JSOpt) error); ok { r0 = rf(name, seq, opts...) } else { r0 = ret.Error(0) @@ -851,18 +939,18 @@ type JetStreamContext_DeleteMsg_Call struct { // DeleteMsg is a helper method to define mock.On call // - name string // - seq uint64 -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) DeleteMsg(name interface{}, seq interface{}, opts ...interface{}) *JetStreamContext_DeleteMsg_Call { return &JetStreamContext_DeleteMsg_Call{Call: _e.mock.On("DeleteMsg", append([]interface{}{name, seq}, opts...)...)} } -func (_c *JetStreamContext_DeleteMsg_Call) Run(run func(name string, seq uint64, opts ...natsgo.JSOpt)) *JetStreamContext_DeleteMsg_Call { +func (_c *JetStreamContext_DeleteMsg_Call) Run(run func(name string, seq uint64, opts ...nats.JSOpt)) *JetStreamContext_DeleteMsg_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-2) + variadicArgs := make([]nats.JSOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), args[1].(uint64), variadicArgs...) @@ -875,7 +963,7 @@ func (_c *JetStreamContext_DeleteMsg_Call) Return(_a0 error) *JetStreamContext_D return _c } -func (_c *JetStreamContext_DeleteMsg_Call) RunAndReturn(run func(string, uint64, ...natsgo.JSOpt) error) *JetStreamContext_DeleteMsg_Call { +func (_c *JetStreamContext_DeleteMsg_Call) RunAndReturn(run func(string, uint64, ...nats.JSOpt) error) *JetStreamContext_DeleteMsg_Call { _c.Call.Return(run) return _c } @@ -884,6 +972,10 @@ func (_c *JetStreamContext_DeleteMsg_Call) RunAndReturn(run func(string, uint64, func (_m *JetStreamContext) DeleteObjectStore(bucket string) error { ret := _m.Called(bucket) + if len(ret) == 0 { + panic("no return value specified for DeleteObjectStore") + } + var r0 error if rf, ok := ret.Get(0).(func(string) error); ok { r0 = rf(bucket) @@ -923,7 +1015,7 @@ func (_c *JetStreamContext_DeleteObjectStore_Call) RunAndReturn(run func(string) } // DeleteStream provides a mock function with given fields: name, opts -func (_m *JetStreamContext) DeleteStream(name string, opts ...natsgo.JSOpt) error { +func (_m *JetStreamContext) DeleteStream(name string, opts ...nats.JSOpt) error { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -933,8 +1025,12 @@ func (_m *JetStreamContext) DeleteStream(name string, opts ...natsgo.JSOpt) erro _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for DeleteStream") + } + var r0 error - if rf, ok := ret.Get(0).(func(string, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(0).(func(string, ...nats.JSOpt) error); ok { r0 = rf(name, opts...) } else { r0 = ret.Error(0) @@ -950,18 +1046,18 @@ type JetStreamContext_DeleteStream_Call struct { // DeleteStream is a helper method to define mock.On call // - name string -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) DeleteStream(name interface{}, opts ...interface{}) *JetStreamContext_DeleteStream_Call { return &JetStreamContext_DeleteStream_Call{Call: _e.mock.On("DeleteStream", append([]interface{}{name}, opts...)...)} } -func (_c *JetStreamContext_DeleteStream_Call) Run(run func(name string, opts ...natsgo.JSOpt)) *JetStreamContext_DeleteStream_Call { +func (_c *JetStreamContext_DeleteStream_Call) Run(run func(name string, opts ...nats.JSOpt)) *JetStreamContext_DeleteStream_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-1) + variadicArgs := make([]nats.JSOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), variadicArgs...) @@ -974,13 +1070,13 @@ func (_c *JetStreamContext_DeleteStream_Call) Return(_a0 error) *JetStreamContex return _c } -func (_c *JetStreamContext_DeleteStream_Call) RunAndReturn(run func(string, ...natsgo.JSOpt) error) *JetStreamContext_DeleteStream_Call { +func (_c *JetStreamContext_DeleteStream_Call) RunAndReturn(run func(string, ...nats.JSOpt) error) *JetStreamContext_DeleteStream_Call { _c.Call.Return(run) return _c } // GetLastMsg provides a mock function with given fields: name, subject, opts -func (_m *JetStreamContext) GetLastMsg(name string, subject string, opts ...natsgo.JSOpt) (*natsgo.RawStreamMsg, error) { +func (_m *JetStreamContext) GetLastMsg(name string, subject string, opts ...nats.JSOpt) (*nats.RawStreamMsg, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -990,20 +1086,24 @@ func (_m *JetStreamContext) GetLastMsg(name string, subject string, opts ...nats _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.RawStreamMsg + if len(ret) == 0 { + panic("no return value specified for GetLastMsg") + } + + var r0 *nats.RawStreamMsg var r1 error - if rf, ok := ret.Get(0).(func(string, string, ...natsgo.JSOpt) (*natsgo.RawStreamMsg, error)); ok { + if rf, ok := ret.Get(0).(func(string, string, ...nats.JSOpt) (*nats.RawStreamMsg, error)); ok { return rf(name, subject, opts...) } - if rf, ok := ret.Get(0).(func(string, string, ...natsgo.JSOpt) *natsgo.RawStreamMsg); ok { + if rf, ok := ret.Get(0).(func(string, string, ...nats.JSOpt) *nats.RawStreamMsg); ok { r0 = rf(name, subject, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.RawStreamMsg) + r0 = ret.Get(0).(*nats.RawStreamMsg) } } - if rf, ok := ret.Get(1).(func(string, string, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, string, ...nats.JSOpt) error); ok { r1 = rf(name, subject, opts...) } else { r1 = ret.Error(1) @@ -1020,18 +1120,18 @@ type JetStreamContext_GetLastMsg_Call struct { // GetLastMsg is a helper method to define mock.On call // - name string // - subject string -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) GetLastMsg(name interface{}, subject interface{}, opts ...interface{}) *JetStreamContext_GetLastMsg_Call { return &JetStreamContext_GetLastMsg_Call{Call: _e.mock.On("GetLastMsg", append([]interface{}{name, subject}, opts...)...)} } -func (_c *JetStreamContext_GetLastMsg_Call) Run(run func(name string, subject string, opts ...natsgo.JSOpt)) *JetStreamContext_GetLastMsg_Call { +func (_c *JetStreamContext_GetLastMsg_Call) Run(run func(name string, subject string, opts ...nats.JSOpt)) *JetStreamContext_GetLastMsg_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-2) + variadicArgs := make([]nats.JSOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), args[1].(string), variadicArgs...) @@ -1039,18 +1139,18 @@ func (_c *JetStreamContext_GetLastMsg_Call) Run(run func(name string, subject st return _c } -func (_c *JetStreamContext_GetLastMsg_Call) Return(_a0 *natsgo.RawStreamMsg, _a1 error) *JetStreamContext_GetLastMsg_Call { +func (_c *JetStreamContext_GetLastMsg_Call) Return(_a0 *nats.RawStreamMsg, _a1 error) *JetStreamContext_GetLastMsg_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_GetLastMsg_Call) RunAndReturn(run func(string, string, ...natsgo.JSOpt) (*natsgo.RawStreamMsg, error)) *JetStreamContext_GetLastMsg_Call { +func (_c *JetStreamContext_GetLastMsg_Call) RunAndReturn(run func(string, string, ...nats.JSOpt) (*nats.RawStreamMsg, error)) *JetStreamContext_GetLastMsg_Call { _c.Call.Return(run) return _c } // GetMsg provides a mock function with given fields: name, seq, opts -func (_m *JetStreamContext) GetMsg(name string, seq uint64, opts ...natsgo.JSOpt) (*natsgo.RawStreamMsg, error) { +func (_m *JetStreamContext) GetMsg(name string, seq uint64, opts ...nats.JSOpt) (*nats.RawStreamMsg, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -1060,20 +1160,24 @@ func (_m *JetStreamContext) GetMsg(name string, seq uint64, opts ...natsgo.JSOpt _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.RawStreamMsg + if len(ret) == 0 { + panic("no return value specified for GetMsg") + } + + var r0 *nats.RawStreamMsg var r1 error - if rf, ok := ret.Get(0).(func(string, uint64, ...natsgo.JSOpt) (*natsgo.RawStreamMsg, error)); ok { + if rf, ok := ret.Get(0).(func(string, uint64, ...nats.JSOpt) (*nats.RawStreamMsg, error)); ok { return rf(name, seq, opts...) } - if rf, ok := ret.Get(0).(func(string, uint64, ...natsgo.JSOpt) *natsgo.RawStreamMsg); ok { + if rf, ok := ret.Get(0).(func(string, uint64, ...nats.JSOpt) *nats.RawStreamMsg); ok { r0 = rf(name, seq, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.RawStreamMsg) + r0 = ret.Get(0).(*nats.RawStreamMsg) } } - if rf, ok := ret.Get(1).(func(string, uint64, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, uint64, ...nats.JSOpt) error); ok { r1 = rf(name, seq, opts...) } else { r1 = ret.Error(1) @@ -1090,18 +1194,18 @@ type JetStreamContext_GetMsg_Call struct { // GetMsg is a helper method to define mock.On call // - name string // - seq uint64 -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) GetMsg(name interface{}, seq interface{}, opts ...interface{}) *JetStreamContext_GetMsg_Call { return &JetStreamContext_GetMsg_Call{Call: _e.mock.On("GetMsg", append([]interface{}{name, seq}, opts...)...)} } -func (_c *JetStreamContext_GetMsg_Call) Run(run func(name string, seq uint64, opts ...natsgo.JSOpt)) *JetStreamContext_GetMsg_Call { +func (_c *JetStreamContext_GetMsg_Call) Run(run func(name string, seq uint64, opts ...nats.JSOpt)) *JetStreamContext_GetMsg_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-2) + variadicArgs := make([]nats.JSOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), args[1].(uint64), variadicArgs...) @@ -1109,30 +1213,34 @@ func (_c *JetStreamContext_GetMsg_Call) Run(run func(name string, seq uint64, op return _c } -func (_c *JetStreamContext_GetMsg_Call) Return(_a0 *natsgo.RawStreamMsg, _a1 error) *JetStreamContext_GetMsg_Call { +func (_c *JetStreamContext_GetMsg_Call) Return(_a0 *nats.RawStreamMsg, _a1 error) *JetStreamContext_GetMsg_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_GetMsg_Call) RunAndReturn(run func(string, uint64, ...natsgo.JSOpt) (*natsgo.RawStreamMsg, error)) *JetStreamContext_GetMsg_Call { +func (_c *JetStreamContext_GetMsg_Call) RunAndReturn(run func(string, uint64, ...nats.JSOpt) (*nats.RawStreamMsg, error)) *JetStreamContext_GetMsg_Call { _c.Call.Return(run) return _c } // KeyValue provides a mock function with given fields: bucket -func (_m *JetStreamContext) KeyValue(bucket string) (natsgo.KeyValue, error) { +func (_m *JetStreamContext) KeyValue(bucket string) (nats.KeyValue, error) { ret := _m.Called(bucket) - var r0 natsgo.KeyValue + if len(ret) == 0 { + panic("no return value specified for KeyValue") + } + + var r0 nats.KeyValue var r1 error - if rf, ok := ret.Get(0).(func(string) (natsgo.KeyValue, error)); ok { + if rf, ok := ret.Get(0).(func(string) (nats.KeyValue, error)); ok { return rf(bucket) } - if rf, ok := ret.Get(0).(func(string) natsgo.KeyValue); ok { + if rf, ok := ret.Get(0).(func(string) nats.KeyValue); ok { r0 = rf(bucket) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(natsgo.KeyValue) + r0 = ret.Get(0).(nats.KeyValue) } } @@ -1163,20 +1271,24 @@ func (_c *JetStreamContext_KeyValue_Call) Run(run func(bucket string)) *JetStrea return _c } -func (_c *JetStreamContext_KeyValue_Call) Return(_a0 natsgo.KeyValue, _a1 error) *JetStreamContext_KeyValue_Call { +func (_c *JetStreamContext_KeyValue_Call) Return(_a0 nats.KeyValue, _a1 error) *JetStreamContext_KeyValue_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_KeyValue_Call) RunAndReturn(run func(string) (natsgo.KeyValue, error)) *JetStreamContext_KeyValue_Call { +func (_c *JetStreamContext_KeyValue_Call) RunAndReturn(run func(string) (nats.KeyValue, error)) *JetStreamContext_KeyValue_Call { _c.Call.Return(run) return _c } -// KeyValueStoreNames provides a mock function with given fields: +// KeyValueStoreNames provides a mock function with no fields func (_m *JetStreamContext) KeyValueStoreNames() <-chan string { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for KeyValueStoreNames") + } + var r0 <-chan string if rf, ok := ret.Get(0).(func() <-chan string); ok { r0 = rf() @@ -1216,16 +1328,20 @@ func (_c *JetStreamContext_KeyValueStoreNames_Call) RunAndReturn(run func() <-ch return _c } -// KeyValueStores provides a mock function with given fields: -func (_m *JetStreamContext) KeyValueStores() <-chan natsgo.KeyValueStatus { +// KeyValueStores provides a mock function with no fields +func (_m *JetStreamContext) KeyValueStores() <-chan nats.KeyValueStatus { ret := _m.Called() - var r0 <-chan natsgo.KeyValueStatus - if rf, ok := ret.Get(0).(func() <-chan natsgo.KeyValueStatus); ok { + if len(ret) == 0 { + panic("no return value specified for KeyValueStores") + } + + var r0 <-chan nats.KeyValueStatus + if rf, ok := ret.Get(0).(func() <-chan nats.KeyValueStatus); ok { r0 = rf() } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan natsgo.KeyValueStatus) + r0 = ret.Get(0).(<-chan nats.KeyValueStatus) } } @@ -1249,30 +1365,34 @@ func (_c *JetStreamContext_KeyValueStores_Call) Run(run func()) *JetStreamContex return _c } -func (_c *JetStreamContext_KeyValueStores_Call) Return(_a0 <-chan natsgo.KeyValueStatus) *JetStreamContext_KeyValueStores_Call { +func (_c *JetStreamContext_KeyValueStores_Call) Return(_a0 <-chan nats.KeyValueStatus) *JetStreamContext_KeyValueStores_Call { _c.Call.Return(_a0) return _c } -func (_c *JetStreamContext_KeyValueStores_Call) RunAndReturn(run func() <-chan natsgo.KeyValueStatus) *JetStreamContext_KeyValueStores_Call { +func (_c *JetStreamContext_KeyValueStores_Call) RunAndReturn(run func() <-chan nats.KeyValueStatus) *JetStreamContext_KeyValueStores_Call { _c.Call.Return(run) return _c } // ObjectStore provides a mock function with given fields: bucket -func (_m *JetStreamContext) ObjectStore(bucket string) (natsgo.ObjectStore, error) { +func (_m *JetStreamContext) ObjectStore(bucket string) (nats.ObjectStore, error) { ret := _m.Called(bucket) - var r0 natsgo.ObjectStore + if len(ret) == 0 { + panic("no return value specified for ObjectStore") + } + + var r0 nats.ObjectStore var r1 error - if rf, ok := ret.Get(0).(func(string) (natsgo.ObjectStore, error)); ok { + if rf, ok := ret.Get(0).(func(string) (nats.ObjectStore, error)); ok { return rf(bucket) } - if rf, ok := ret.Get(0).(func(string) natsgo.ObjectStore); ok { + if rf, ok := ret.Get(0).(func(string) nats.ObjectStore); ok { r0 = rf(bucket) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(natsgo.ObjectStore) + r0 = ret.Get(0).(nats.ObjectStore) } } @@ -1303,18 +1423,18 @@ func (_c *JetStreamContext_ObjectStore_Call) Run(run func(bucket string)) *JetSt return _c } -func (_c *JetStreamContext_ObjectStore_Call) Return(_a0 natsgo.ObjectStore, _a1 error) *JetStreamContext_ObjectStore_Call { +func (_c *JetStreamContext_ObjectStore_Call) Return(_a0 nats.ObjectStore, _a1 error) *JetStreamContext_ObjectStore_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_ObjectStore_Call) RunAndReturn(run func(string) (natsgo.ObjectStore, error)) *JetStreamContext_ObjectStore_Call { +func (_c *JetStreamContext_ObjectStore_Call) RunAndReturn(run func(string) (nats.ObjectStore, error)) *JetStreamContext_ObjectStore_Call { _c.Call.Return(run) return _c } // ObjectStoreNames provides a mock function with given fields: opts -func (_m *JetStreamContext) ObjectStoreNames(opts ...natsgo.ObjectOpt) <-chan string { +func (_m *JetStreamContext) ObjectStoreNames(opts ...nats.ObjectOpt) <-chan string { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -1323,8 +1443,12 @@ func (_m *JetStreamContext) ObjectStoreNames(opts ...natsgo.ObjectOpt) <-chan st _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for ObjectStoreNames") + } + var r0 <-chan string - if rf, ok := ret.Get(0).(func(...natsgo.ObjectOpt) <-chan string); ok { + if rf, ok := ret.Get(0).(func(...nats.ObjectOpt) <-chan string); ok { r0 = rf(opts...) } else { if ret.Get(0) != nil { @@ -1341,18 +1465,18 @@ type JetStreamContext_ObjectStoreNames_Call struct { } // ObjectStoreNames is a helper method to define mock.On call -// - opts ...natsgo.ObjectOpt +// - opts ...nats.ObjectOpt func (_e *JetStreamContext_Expecter) ObjectStoreNames(opts ...interface{}) *JetStreamContext_ObjectStoreNames_Call { return &JetStreamContext_ObjectStoreNames_Call{Call: _e.mock.On("ObjectStoreNames", append([]interface{}{}, opts...)...)} } -func (_c *JetStreamContext_ObjectStoreNames_Call) Run(run func(opts ...natsgo.ObjectOpt)) *JetStreamContext_ObjectStoreNames_Call { +func (_c *JetStreamContext_ObjectStoreNames_Call) Run(run func(opts ...nats.ObjectOpt)) *JetStreamContext_ObjectStoreNames_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.ObjectOpt, len(args)-0) + variadicArgs := make([]nats.ObjectOpt, len(args)-0) for i, a := range args[0:] { if a != nil { - variadicArgs[i] = a.(natsgo.ObjectOpt) + variadicArgs[i] = a.(nats.ObjectOpt) } } run(variadicArgs...) @@ -1365,13 +1489,13 @@ func (_c *JetStreamContext_ObjectStoreNames_Call) Return(_a0 <-chan string) *Jet return _c } -func (_c *JetStreamContext_ObjectStoreNames_Call) RunAndReturn(run func(...natsgo.ObjectOpt) <-chan string) *JetStreamContext_ObjectStoreNames_Call { +func (_c *JetStreamContext_ObjectStoreNames_Call) RunAndReturn(run func(...nats.ObjectOpt) <-chan string) *JetStreamContext_ObjectStoreNames_Call { _c.Call.Return(run) return _c } // ObjectStores provides a mock function with given fields: opts -func (_m *JetStreamContext) ObjectStores(opts ...natsgo.ObjectOpt) <-chan natsgo.ObjectStoreStatus { +func (_m *JetStreamContext) ObjectStores(opts ...nats.ObjectOpt) <-chan nats.ObjectStoreStatus { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -1380,12 +1504,16 @@ func (_m *JetStreamContext) ObjectStores(opts ...natsgo.ObjectOpt) <-chan natsgo _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 <-chan natsgo.ObjectStoreStatus - if rf, ok := ret.Get(0).(func(...natsgo.ObjectOpt) <-chan natsgo.ObjectStoreStatus); ok { + if len(ret) == 0 { + panic("no return value specified for ObjectStores") + } + + var r0 <-chan nats.ObjectStoreStatus + if rf, ok := ret.Get(0).(func(...nats.ObjectOpt) <-chan nats.ObjectStoreStatus); ok { r0 = rf(opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan natsgo.ObjectStoreStatus) + r0 = ret.Get(0).(<-chan nats.ObjectStoreStatus) } } @@ -1398,18 +1526,18 @@ type JetStreamContext_ObjectStores_Call struct { } // ObjectStores is a helper method to define mock.On call -// - opts ...natsgo.ObjectOpt +// - opts ...nats.ObjectOpt func (_e *JetStreamContext_Expecter) ObjectStores(opts ...interface{}) *JetStreamContext_ObjectStores_Call { return &JetStreamContext_ObjectStores_Call{Call: _e.mock.On("ObjectStores", append([]interface{}{}, opts...)...)} } -func (_c *JetStreamContext_ObjectStores_Call) Run(run func(opts ...natsgo.ObjectOpt)) *JetStreamContext_ObjectStores_Call { +func (_c *JetStreamContext_ObjectStores_Call) Run(run func(opts ...nats.ObjectOpt)) *JetStreamContext_ObjectStores_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.ObjectOpt, len(args)-0) + variadicArgs := make([]nats.ObjectOpt, len(args)-0) for i, a := range args[0:] { if a != nil { - variadicArgs[i] = a.(natsgo.ObjectOpt) + variadicArgs[i] = a.(nats.ObjectOpt) } } run(variadicArgs...) @@ -1417,18 +1545,18 @@ func (_c *JetStreamContext_ObjectStores_Call) Run(run func(opts ...natsgo.Object return _c } -func (_c *JetStreamContext_ObjectStores_Call) Return(_a0 <-chan natsgo.ObjectStoreStatus) *JetStreamContext_ObjectStores_Call { +func (_c *JetStreamContext_ObjectStores_Call) Return(_a0 <-chan nats.ObjectStoreStatus) *JetStreamContext_ObjectStores_Call { _c.Call.Return(_a0) return _c } -func (_c *JetStreamContext_ObjectStores_Call) RunAndReturn(run func(...natsgo.ObjectOpt) <-chan natsgo.ObjectStoreStatus) *JetStreamContext_ObjectStores_Call { +func (_c *JetStreamContext_ObjectStores_Call) RunAndReturn(run func(...nats.ObjectOpt) <-chan nats.ObjectStoreStatus) *JetStreamContext_ObjectStores_Call { _c.Call.Return(run) return _c } // Publish provides a mock function with given fields: subj, data, opts -func (_m *JetStreamContext) Publish(subj string, data []byte, opts ...natsgo.PubOpt) (*natsgo.PubAck, error) { +func (_m *JetStreamContext) Publish(subj string, data []byte, opts ...nats.PubOpt) (*nats.PubAck, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -1438,20 +1566,24 @@ func (_m *JetStreamContext) Publish(subj string, data []byte, opts ...natsgo.Pub _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.PubAck + if len(ret) == 0 { + panic("no return value specified for Publish") + } + + var r0 *nats.PubAck var r1 error - if rf, ok := ret.Get(0).(func(string, []byte, ...natsgo.PubOpt) (*natsgo.PubAck, error)); ok { + if rf, ok := ret.Get(0).(func(string, []byte, ...nats.PubOpt) (*nats.PubAck, error)); ok { return rf(subj, data, opts...) } - if rf, ok := ret.Get(0).(func(string, []byte, ...natsgo.PubOpt) *natsgo.PubAck); ok { + if rf, ok := ret.Get(0).(func(string, []byte, ...nats.PubOpt) *nats.PubAck); ok { r0 = rf(subj, data, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.PubAck) + r0 = ret.Get(0).(*nats.PubAck) } } - if rf, ok := ret.Get(1).(func(string, []byte, ...natsgo.PubOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, []byte, ...nats.PubOpt) error); ok { r1 = rf(subj, data, opts...) } else { r1 = ret.Error(1) @@ -1468,18 +1600,18 @@ type JetStreamContext_Publish_Call struct { // Publish is a helper method to define mock.On call // - subj string // - data []byte -// - opts ...natsgo.PubOpt +// - opts ...nats.PubOpt func (_e *JetStreamContext_Expecter) Publish(subj interface{}, data interface{}, opts ...interface{}) *JetStreamContext_Publish_Call { return &JetStreamContext_Publish_Call{Call: _e.mock.On("Publish", append([]interface{}{subj, data}, opts...)...)} } -func (_c *JetStreamContext_Publish_Call) Run(run func(subj string, data []byte, opts ...natsgo.PubOpt)) *JetStreamContext_Publish_Call { +func (_c *JetStreamContext_Publish_Call) Run(run func(subj string, data []byte, opts ...nats.PubOpt)) *JetStreamContext_Publish_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.PubOpt, len(args)-2) + variadicArgs := make([]nats.PubOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.PubOpt) + variadicArgs[i] = a.(nats.PubOpt) } } run(args[0].(string), args[1].([]byte), variadicArgs...) @@ -1487,18 +1619,18 @@ func (_c *JetStreamContext_Publish_Call) Run(run func(subj string, data []byte, return _c } -func (_c *JetStreamContext_Publish_Call) Return(_a0 *natsgo.PubAck, _a1 error) *JetStreamContext_Publish_Call { +func (_c *JetStreamContext_Publish_Call) Return(_a0 *nats.PubAck, _a1 error) *JetStreamContext_Publish_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_Publish_Call) RunAndReturn(run func(string, []byte, ...natsgo.PubOpt) (*natsgo.PubAck, error)) *JetStreamContext_Publish_Call { +func (_c *JetStreamContext_Publish_Call) RunAndReturn(run func(string, []byte, ...nats.PubOpt) (*nats.PubAck, error)) *JetStreamContext_Publish_Call { _c.Call.Return(run) return _c } // PublishAsync provides a mock function with given fields: subj, data, opts -func (_m *JetStreamContext) PublishAsync(subj string, data []byte, opts ...natsgo.PubOpt) (natsgo.PubAckFuture, error) { +func (_m *JetStreamContext) PublishAsync(subj string, data []byte, opts ...nats.PubOpt) (nats.PubAckFuture, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -1508,20 +1640,24 @@ func (_m *JetStreamContext) PublishAsync(subj string, data []byte, opts ...natsg _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 natsgo.PubAckFuture + if len(ret) == 0 { + panic("no return value specified for PublishAsync") + } + + var r0 nats.PubAckFuture var r1 error - if rf, ok := ret.Get(0).(func(string, []byte, ...natsgo.PubOpt) (natsgo.PubAckFuture, error)); ok { + if rf, ok := ret.Get(0).(func(string, []byte, ...nats.PubOpt) (nats.PubAckFuture, error)); ok { return rf(subj, data, opts...) } - if rf, ok := ret.Get(0).(func(string, []byte, ...natsgo.PubOpt) natsgo.PubAckFuture); ok { + if rf, ok := ret.Get(0).(func(string, []byte, ...nats.PubOpt) nats.PubAckFuture); ok { r0 = rf(subj, data, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(natsgo.PubAckFuture) + r0 = ret.Get(0).(nats.PubAckFuture) } } - if rf, ok := ret.Get(1).(func(string, []byte, ...natsgo.PubOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, []byte, ...nats.PubOpt) error); ok { r1 = rf(subj, data, opts...) } else { r1 = ret.Error(1) @@ -1538,18 +1674,18 @@ type JetStreamContext_PublishAsync_Call struct { // PublishAsync is a helper method to define mock.On call // - subj string // - data []byte -// - opts ...natsgo.PubOpt +// - opts ...nats.PubOpt func (_e *JetStreamContext_Expecter) PublishAsync(subj interface{}, data interface{}, opts ...interface{}) *JetStreamContext_PublishAsync_Call { return &JetStreamContext_PublishAsync_Call{Call: _e.mock.On("PublishAsync", append([]interface{}{subj, data}, opts...)...)} } -func (_c *JetStreamContext_PublishAsync_Call) Run(run func(subj string, data []byte, opts ...natsgo.PubOpt)) *JetStreamContext_PublishAsync_Call { +func (_c *JetStreamContext_PublishAsync_Call) Run(run func(subj string, data []byte, opts ...nats.PubOpt)) *JetStreamContext_PublishAsync_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.PubOpt, len(args)-2) + variadicArgs := make([]nats.PubOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.PubOpt) + variadicArgs[i] = a.(nats.PubOpt) } } run(args[0].(string), args[1].([]byte), variadicArgs...) @@ -1557,20 +1693,24 @@ func (_c *JetStreamContext_PublishAsync_Call) Run(run func(subj string, data []b return _c } -func (_c *JetStreamContext_PublishAsync_Call) Return(_a0 natsgo.PubAckFuture, _a1 error) *JetStreamContext_PublishAsync_Call { +func (_c *JetStreamContext_PublishAsync_Call) Return(_a0 nats.PubAckFuture, _a1 error) *JetStreamContext_PublishAsync_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_PublishAsync_Call) RunAndReturn(run func(string, []byte, ...natsgo.PubOpt) (natsgo.PubAckFuture, error)) *JetStreamContext_PublishAsync_Call { +func (_c *JetStreamContext_PublishAsync_Call) RunAndReturn(run func(string, []byte, ...nats.PubOpt) (nats.PubAckFuture, error)) *JetStreamContext_PublishAsync_Call { _c.Call.Return(run) return _c } -// PublishAsyncComplete provides a mock function with given fields: +// PublishAsyncComplete provides a mock function with no fields func (_m *JetStreamContext) PublishAsyncComplete() <-chan struct{} { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for PublishAsyncComplete") + } + var r0 <-chan struct{} if rf, ok := ret.Get(0).(func() <-chan struct{}); ok { r0 = rf() @@ -1610,10 +1750,14 @@ func (_c *JetStreamContext_PublishAsyncComplete_Call) RunAndReturn(run func() <- return _c } -// PublishAsyncPending provides a mock function with given fields: +// PublishAsyncPending provides a mock function with no fields func (_m *JetStreamContext) PublishAsyncPending() int { ret := _m.Called() + if len(ret) == 0 { + panic("no return value specified for PublishAsyncPending") + } + var r0 int if rf, ok := ret.Get(0).(func() int); ok { r0 = rf() @@ -1652,7 +1796,7 @@ func (_c *JetStreamContext_PublishAsyncPending_Call) RunAndReturn(run func() int } // PublishMsg provides a mock function with given fields: m, opts -func (_m *JetStreamContext) PublishMsg(m *natsgo.Msg, opts ...natsgo.PubOpt) (*natsgo.PubAck, error) { +func (_m *JetStreamContext) PublishMsg(m *nats.Msg, opts ...nats.PubOpt) (*nats.PubAck, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -1662,20 +1806,24 @@ func (_m *JetStreamContext) PublishMsg(m *natsgo.Msg, opts ...natsgo.PubOpt) (*n _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.PubAck + if len(ret) == 0 { + panic("no return value specified for PublishMsg") + } + + var r0 *nats.PubAck var r1 error - if rf, ok := ret.Get(0).(func(*natsgo.Msg, ...natsgo.PubOpt) (*natsgo.PubAck, error)); ok { + if rf, ok := ret.Get(0).(func(*nats.Msg, ...nats.PubOpt) (*nats.PubAck, error)); ok { return rf(m, opts...) } - if rf, ok := ret.Get(0).(func(*natsgo.Msg, ...natsgo.PubOpt) *natsgo.PubAck); ok { + if rf, ok := ret.Get(0).(func(*nats.Msg, ...nats.PubOpt) *nats.PubAck); ok { r0 = rf(m, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.PubAck) + r0 = ret.Get(0).(*nats.PubAck) } } - if rf, ok := ret.Get(1).(func(*natsgo.Msg, ...natsgo.PubOpt) error); ok { + if rf, ok := ret.Get(1).(func(*nats.Msg, ...nats.PubOpt) error); ok { r1 = rf(m, opts...) } else { r1 = ret.Error(1) @@ -1690,38 +1838,38 @@ type JetStreamContext_PublishMsg_Call struct { } // PublishMsg is a helper method to define mock.On call -// - m *natsgo.Msg -// - opts ...natsgo.PubOpt +// - m *nats.Msg +// - opts ...nats.PubOpt func (_e *JetStreamContext_Expecter) PublishMsg(m interface{}, opts ...interface{}) *JetStreamContext_PublishMsg_Call { return &JetStreamContext_PublishMsg_Call{Call: _e.mock.On("PublishMsg", append([]interface{}{m}, opts...)...)} } -func (_c *JetStreamContext_PublishMsg_Call) Run(run func(m *natsgo.Msg, opts ...natsgo.PubOpt)) *JetStreamContext_PublishMsg_Call { +func (_c *JetStreamContext_PublishMsg_Call) Run(run func(m *nats.Msg, opts ...nats.PubOpt)) *JetStreamContext_PublishMsg_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.PubOpt, len(args)-1) + variadicArgs := make([]nats.PubOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.PubOpt) + variadicArgs[i] = a.(nats.PubOpt) } } - run(args[0].(*natsgo.Msg), variadicArgs...) + run(args[0].(*nats.Msg), variadicArgs...) }) return _c } -func (_c *JetStreamContext_PublishMsg_Call) Return(_a0 *natsgo.PubAck, _a1 error) *JetStreamContext_PublishMsg_Call { +func (_c *JetStreamContext_PublishMsg_Call) Return(_a0 *nats.PubAck, _a1 error) *JetStreamContext_PublishMsg_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_PublishMsg_Call) RunAndReturn(run func(*natsgo.Msg, ...natsgo.PubOpt) (*natsgo.PubAck, error)) *JetStreamContext_PublishMsg_Call { +func (_c *JetStreamContext_PublishMsg_Call) RunAndReturn(run func(*nats.Msg, ...nats.PubOpt) (*nats.PubAck, error)) *JetStreamContext_PublishMsg_Call { _c.Call.Return(run) return _c } // PublishMsgAsync provides a mock function with given fields: m, opts -func (_m *JetStreamContext) PublishMsgAsync(m *natsgo.Msg, opts ...natsgo.PubOpt) (natsgo.PubAckFuture, error) { +func (_m *JetStreamContext) PublishMsgAsync(m *nats.Msg, opts ...nats.PubOpt) (nats.PubAckFuture, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -1731,20 +1879,24 @@ func (_m *JetStreamContext) PublishMsgAsync(m *natsgo.Msg, opts ...natsgo.PubOpt _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 natsgo.PubAckFuture + if len(ret) == 0 { + panic("no return value specified for PublishMsgAsync") + } + + var r0 nats.PubAckFuture var r1 error - if rf, ok := ret.Get(0).(func(*natsgo.Msg, ...natsgo.PubOpt) (natsgo.PubAckFuture, error)); ok { + if rf, ok := ret.Get(0).(func(*nats.Msg, ...nats.PubOpt) (nats.PubAckFuture, error)); ok { return rf(m, opts...) } - if rf, ok := ret.Get(0).(func(*natsgo.Msg, ...natsgo.PubOpt) natsgo.PubAckFuture); ok { + if rf, ok := ret.Get(0).(func(*nats.Msg, ...nats.PubOpt) nats.PubAckFuture); ok { r0 = rf(m, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(natsgo.PubAckFuture) + r0 = ret.Get(0).(nats.PubAckFuture) } } - if rf, ok := ret.Get(1).(func(*natsgo.Msg, ...natsgo.PubOpt) error); ok { + if rf, ok := ret.Get(1).(func(*nats.Msg, ...nats.PubOpt) error); ok { r1 = rf(m, opts...) } else { r1 = ret.Error(1) @@ -1759,38 +1911,38 @@ type JetStreamContext_PublishMsgAsync_Call struct { } // PublishMsgAsync is a helper method to define mock.On call -// - m *natsgo.Msg -// - opts ...natsgo.PubOpt +// - m *nats.Msg +// - opts ...nats.PubOpt func (_e *JetStreamContext_Expecter) PublishMsgAsync(m interface{}, opts ...interface{}) *JetStreamContext_PublishMsgAsync_Call { return &JetStreamContext_PublishMsgAsync_Call{Call: _e.mock.On("PublishMsgAsync", append([]interface{}{m}, opts...)...)} } -func (_c *JetStreamContext_PublishMsgAsync_Call) Run(run func(m *natsgo.Msg, opts ...natsgo.PubOpt)) *JetStreamContext_PublishMsgAsync_Call { +func (_c *JetStreamContext_PublishMsgAsync_Call) Run(run func(m *nats.Msg, opts ...nats.PubOpt)) *JetStreamContext_PublishMsgAsync_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.PubOpt, len(args)-1) + variadicArgs := make([]nats.PubOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.PubOpt) + variadicArgs[i] = a.(nats.PubOpt) } } - run(args[0].(*natsgo.Msg), variadicArgs...) + run(args[0].(*nats.Msg), variadicArgs...) }) return _c } -func (_c *JetStreamContext_PublishMsgAsync_Call) Return(_a0 natsgo.PubAckFuture, _a1 error) *JetStreamContext_PublishMsgAsync_Call { +func (_c *JetStreamContext_PublishMsgAsync_Call) Return(_a0 nats.PubAckFuture, _a1 error) *JetStreamContext_PublishMsgAsync_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_PublishMsgAsync_Call) RunAndReturn(run func(*natsgo.Msg, ...natsgo.PubOpt) (natsgo.PubAckFuture, error)) *JetStreamContext_PublishMsgAsync_Call { +func (_c *JetStreamContext_PublishMsgAsync_Call) RunAndReturn(run func(*nats.Msg, ...nats.PubOpt) (nats.PubAckFuture, error)) *JetStreamContext_PublishMsgAsync_Call { _c.Call.Return(run) return _c } // PullSubscribe provides a mock function with given fields: subj, durable, opts -func (_m *JetStreamContext) PullSubscribe(subj string, durable string, opts ...natsgo.SubOpt) (*natsgo.Subscription, error) { +func (_m *JetStreamContext) PullSubscribe(subj string, durable string, opts ...nats.SubOpt) (*nats.Subscription, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -1800,20 +1952,24 @@ func (_m *JetStreamContext) PullSubscribe(subj string, durable string, opts ...n _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.Subscription + if len(ret) == 0 { + panic("no return value specified for PullSubscribe") + } + + var r0 *nats.Subscription var r1 error - if rf, ok := ret.Get(0).(func(string, string, ...natsgo.SubOpt) (*natsgo.Subscription, error)); ok { + if rf, ok := ret.Get(0).(func(string, string, ...nats.SubOpt) (*nats.Subscription, error)); ok { return rf(subj, durable, opts...) } - if rf, ok := ret.Get(0).(func(string, string, ...natsgo.SubOpt) *natsgo.Subscription); ok { + if rf, ok := ret.Get(0).(func(string, string, ...nats.SubOpt) *nats.Subscription); ok { r0 = rf(subj, durable, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.Subscription) + r0 = ret.Get(0).(*nats.Subscription) } } - if rf, ok := ret.Get(1).(func(string, string, ...natsgo.SubOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, string, ...nats.SubOpt) error); ok { r1 = rf(subj, durable, opts...) } else { r1 = ret.Error(1) @@ -1830,18 +1986,18 @@ type JetStreamContext_PullSubscribe_Call struct { // PullSubscribe is a helper method to define mock.On call // - subj string // - durable string -// - opts ...natsgo.SubOpt +// - opts ...nats.SubOpt func (_e *JetStreamContext_Expecter) PullSubscribe(subj interface{}, durable interface{}, opts ...interface{}) *JetStreamContext_PullSubscribe_Call { return &JetStreamContext_PullSubscribe_Call{Call: _e.mock.On("PullSubscribe", append([]interface{}{subj, durable}, opts...)...)} } -func (_c *JetStreamContext_PullSubscribe_Call) Run(run func(subj string, durable string, opts ...natsgo.SubOpt)) *JetStreamContext_PullSubscribe_Call { +func (_c *JetStreamContext_PullSubscribe_Call) Run(run func(subj string, durable string, opts ...nats.SubOpt)) *JetStreamContext_PullSubscribe_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.SubOpt, len(args)-2) + variadicArgs := make([]nats.SubOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.SubOpt) + variadicArgs[i] = a.(nats.SubOpt) } } run(args[0].(string), args[1].(string), variadicArgs...) @@ -1849,18 +2005,18 @@ func (_c *JetStreamContext_PullSubscribe_Call) Run(run func(subj string, durable return _c } -func (_c *JetStreamContext_PullSubscribe_Call) Return(_a0 *natsgo.Subscription, _a1 error) *JetStreamContext_PullSubscribe_Call { +func (_c *JetStreamContext_PullSubscribe_Call) Return(_a0 *nats.Subscription, _a1 error) *JetStreamContext_PullSubscribe_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_PullSubscribe_Call) RunAndReturn(run func(string, string, ...natsgo.SubOpt) (*natsgo.Subscription, error)) *JetStreamContext_PullSubscribe_Call { +func (_c *JetStreamContext_PullSubscribe_Call) RunAndReturn(run func(string, string, ...nats.SubOpt) (*nats.Subscription, error)) *JetStreamContext_PullSubscribe_Call { _c.Call.Return(run) return _c } // PurgeStream provides a mock function with given fields: name, opts -func (_m *JetStreamContext) PurgeStream(name string, opts ...natsgo.JSOpt) error { +func (_m *JetStreamContext) PurgeStream(name string, opts ...nats.JSOpt) error { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -1870,8 +2026,12 @@ func (_m *JetStreamContext) PurgeStream(name string, opts ...natsgo.JSOpt) error _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for PurgeStream") + } + var r0 error - if rf, ok := ret.Get(0).(func(string, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(0).(func(string, ...nats.JSOpt) error); ok { r0 = rf(name, opts...) } else { r0 = ret.Error(0) @@ -1887,18 +2047,18 @@ type JetStreamContext_PurgeStream_Call struct { // PurgeStream is a helper method to define mock.On call // - name string -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) PurgeStream(name interface{}, opts ...interface{}) *JetStreamContext_PurgeStream_Call { return &JetStreamContext_PurgeStream_Call{Call: _e.mock.On("PurgeStream", append([]interface{}{name}, opts...)...)} } -func (_c *JetStreamContext_PurgeStream_Call) Run(run func(name string, opts ...natsgo.JSOpt)) *JetStreamContext_PurgeStream_Call { +func (_c *JetStreamContext_PurgeStream_Call) Run(run func(name string, opts ...nats.JSOpt)) *JetStreamContext_PurgeStream_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-1) + variadicArgs := make([]nats.JSOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), variadicArgs...) @@ -1911,13 +2071,13 @@ func (_c *JetStreamContext_PurgeStream_Call) Return(_a0 error) *JetStreamContext return _c } -func (_c *JetStreamContext_PurgeStream_Call) RunAndReturn(run func(string, ...natsgo.JSOpt) error) *JetStreamContext_PurgeStream_Call { +func (_c *JetStreamContext_PurgeStream_Call) RunAndReturn(run func(string, ...nats.JSOpt) error) *JetStreamContext_PurgeStream_Call { _c.Call.Return(run) return _c } // QueueSubscribe provides a mock function with given fields: subj, queue, cb, opts -func (_m *JetStreamContext) QueueSubscribe(subj string, queue string, cb natsgo.MsgHandler, opts ...natsgo.SubOpt) (*natsgo.Subscription, error) { +func (_m *JetStreamContext) QueueSubscribe(subj string, queue string, cb nats.MsgHandler, opts ...nats.SubOpt) (*nats.Subscription, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -1927,20 +2087,24 @@ func (_m *JetStreamContext) QueueSubscribe(subj string, queue string, cb natsgo. _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.Subscription + if len(ret) == 0 { + panic("no return value specified for QueueSubscribe") + } + + var r0 *nats.Subscription var r1 error - if rf, ok := ret.Get(0).(func(string, string, natsgo.MsgHandler, ...natsgo.SubOpt) (*natsgo.Subscription, error)); ok { + if rf, ok := ret.Get(0).(func(string, string, nats.MsgHandler, ...nats.SubOpt) (*nats.Subscription, error)); ok { return rf(subj, queue, cb, opts...) } - if rf, ok := ret.Get(0).(func(string, string, natsgo.MsgHandler, ...natsgo.SubOpt) *natsgo.Subscription); ok { + if rf, ok := ret.Get(0).(func(string, string, nats.MsgHandler, ...nats.SubOpt) *nats.Subscription); ok { r0 = rf(subj, queue, cb, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.Subscription) + r0 = ret.Get(0).(*nats.Subscription) } } - if rf, ok := ret.Get(1).(func(string, string, natsgo.MsgHandler, ...natsgo.SubOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, string, nats.MsgHandler, ...nats.SubOpt) error); ok { r1 = rf(subj, queue, cb, opts...) } else { r1 = ret.Error(1) @@ -1957,38 +2121,38 @@ type JetStreamContext_QueueSubscribe_Call struct { // QueueSubscribe is a helper method to define mock.On call // - subj string // - queue string -// - cb natsgo.MsgHandler -// - opts ...natsgo.SubOpt +// - cb nats.MsgHandler +// - opts ...nats.SubOpt func (_e *JetStreamContext_Expecter) QueueSubscribe(subj interface{}, queue interface{}, cb interface{}, opts ...interface{}) *JetStreamContext_QueueSubscribe_Call { return &JetStreamContext_QueueSubscribe_Call{Call: _e.mock.On("QueueSubscribe", append([]interface{}{subj, queue, cb}, opts...)...)} } -func (_c *JetStreamContext_QueueSubscribe_Call) Run(run func(subj string, queue string, cb natsgo.MsgHandler, opts ...natsgo.SubOpt)) *JetStreamContext_QueueSubscribe_Call { +func (_c *JetStreamContext_QueueSubscribe_Call) Run(run func(subj string, queue string, cb nats.MsgHandler, opts ...nats.SubOpt)) *JetStreamContext_QueueSubscribe_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.SubOpt, len(args)-3) + variadicArgs := make([]nats.SubOpt, len(args)-3) for i, a := range args[3:] { if a != nil { - variadicArgs[i] = a.(natsgo.SubOpt) + variadicArgs[i] = a.(nats.SubOpt) } } - run(args[0].(string), args[1].(string), args[2].(natsgo.MsgHandler), variadicArgs...) + run(args[0].(string), args[1].(string), args[2].(nats.MsgHandler), variadicArgs...) }) return _c } -func (_c *JetStreamContext_QueueSubscribe_Call) Return(_a0 *natsgo.Subscription, _a1 error) *JetStreamContext_QueueSubscribe_Call { +func (_c *JetStreamContext_QueueSubscribe_Call) Return(_a0 *nats.Subscription, _a1 error) *JetStreamContext_QueueSubscribe_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_QueueSubscribe_Call) RunAndReturn(run func(string, string, natsgo.MsgHandler, ...natsgo.SubOpt) (*natsgo.Subscription, error)) *JetStreamContext_QueueSubscribe_Call { +func (_c *JetStreamContext_QueueSubscribe_Call) RunAndReturn(run func(string, string, nats.MsgHandler, ...nats.SubOpt) (*nats.Subscription, error)) *JetStreamContext_QueueSubscribe_Call { _c.Call.Return(run) return _c } // QueueSubscribeSync provides a mock function with given fields: subj, queue, opts -func (_m *JetStreamContext) QueueSubscribeSync(subj string, queue string, opts ...natsgo.SubOpt) (*natsgo.Subscription, error) { +func (_m *JetStreamContext) QueueSubscribeSync(subj string, queue string, opts ...nats.SubOpt) (*nats.Subscription, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -1998,20 +2162,24 @@ func (_m *JetStreamContext) QueueSubscribeSync(subj string, queue string, opts . _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.Subscription + if len(ret) == 0 { + panic("no return value specified for QueueSubscribeSync") + } + + var r0 *nats.Subscription var r1 error - if rf, ok := ret.Get(0).(func(string, string, ...natsgo.SubOpt) (*natsgo.Subscription, error)); ok { + if rf, ok := ret.Get(0).(func(string, string, ...nats.SubOpt) (*nats.Subscription, error)); ok { return rf(subj, queue, opts...) } - if rf, ok := ret.Get(0).(func(string, string, ...natsgo.SubOpt) *natsgo.Subscription); ok { + if rf, ok := ret.Get(0).(func(string, string, ...nats.SubOpt) *nats.Subscription); ok { r0 = rf(subj, queue, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.Subscription) + r0 = ret.Get(0).(*nats.Subscription) } } - if rf, ok := ret.Get(1).(func(string, string, ...natsgo.SubOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, string, ...nats.SubOpt) error); ok { r1 = rf(subj, queue, opts...) } else { r1 = ret.Error(1) @@ -2028,18 +2196,18 @@ type JetStreamContext_QueueSubscribeSync_Call struct { // QueueSubscribeSync is a helper method to define mock.On call // - subj string // - queue string -// - opts ...natsgo.SubOpt +// - opts ...nats.SubOpt func (_e *JetStreamContext_Expecter) QueueSubscribeSync(subj interface{}, queue interface{}, opts ...interface{}) *JetStreamContext_QueueSubscribeSync_Call { return &JetStreamContext_QueueSubscribeSync_Call{Call: _e.mock.On("QueueSubscribeSync", append([]interface{}{subj, queue}, opts...)...)} } -func (_c *JetStreamContext_QueueSubscribeSync_Call) Run(run func(subj string, queue string, opts ...natsgo.SubOpt)) *JetStreamContext_QueueSubscribeSync_Call { +func (_c *JetStreamContext_QueueSubscribeSync_Call) Run(run func(subj string, queue string, opts ...nats.SubOpt)) *JetStreamContext_QueueSubscribeSync_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.SubOpt, len(args)-2) + variadicArgs := make([]nats.SubOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.SubOpt) + variadicArgs[i] = a.(nats.SubOpt) } } run(args[0].(string), args[1].(string), variadicArgs...) @@ -2047,18 +2215,18 @@ func (_c *JetStreamContext_QueueSubscribeSync_Call) Run(run func(subj string, qu return _c } -func (_c *JetStreamContext_QueueSubscribeSync_Call) Return(_a0 *natsgo.Subscription, _a1 error) *JetStreamContext_QueueSubscribeSync_Call { +func (_c *JetStreamContext_QueueSubscribeSync_Call) Return(_a0 *nats.Subscription, _a1 error) *JetStreamContext_QueueSubscribeSync_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_QueueSubscribeSync_Call) RunAndReturn(run func(string, string, ...natsgo.SubOpt) (*natsgo.Subscription, error)) *JetStreamContext_QueueSubscribeSync_Call { +func (_c *JetStreamContext_QueueSubscribeSync_Call) RunAndReturn(run func(string, string, ...nats.SubOpt) (*nats.Subscription, error)) *JetStreamContext_QueueSubscribeSync_Call { _c.Call.Return(run) return _c } // SecureDeleteMsg provides a mock function with given fields: name, seq, opts -func (_m *JetStreamContext) SecureDeleteMsg(name string, seq uint64, opts ...natsgo.JSOpt) error { +func (_m *JetStreamContext) SecureDeleteMsg(name string, seq uint64, opts ...nats.JSOpt) error { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -2068,8 +2236,12 @@ func (_m *JetStreamContext) SecureDeleteMsg(name string, seq uint64, opts ...nat _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for SecureDeleteMsg") + } + var r0 error - if rf, ok := ret.Get(0).(func(string, uint64, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(0).(func(string, uint64, ...nats.JSOpt) error); ok { r0 = rf(name, seq, opts...) } else { r0 = ret.Error(0) @@ -2086,18 +2258,18 @@ type JetStreamContext_SecureDeleteMsg_Call struct { // SecureDeleteMsg is a helper method to define mock.On call // - name string // - seq uint64 -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) SecureDeleteMsg(name interface{}, seq interface{}, opts ...interface{}) *JetStreamContext_SecureDeleteMsg_Call { return &JetStreamContext_SecureDeleteMsg_Call{Call: _e.mock.On("SecureDeleteMsg", append([]interface{}{name, seq}, opts...)...)} } -func (_c *JetStreamContext_SecureDeleteMsg_Call) Run(run func(name string, seq uint64, opts ...natsgo.JSOpt)) *JetStreamContext_SecureDeleteMsg_Call { +func (_c *JetStreamContext_SecureDeleteMsg_Call) Run(run func(name string, seq uint64, opts ...nats.JSOpt)) *JetStreamContext_SecureDeleteMsg_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-2) + variadicArgs := make([]nats.JSOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), args[1].(uint64), variadicArgs...) @@ -2110,13 +2282,13 @@ func (_c *JetStreamContext_SecureDeleteMsg_Call) Return(_a0 error) *JetStreamCon return _c } -func (_c *JetStreamContext_SecureDeleteMsg_Call) RunAndReturn(run func(string, uint64, ...natsgo.JSOpt) error) *JetStreamContext_SecureDeleteMsg_Call { +func (_c *JetStreamContext_SecureDeleteMsg_Call) RunAndReturn(run func(string, uint64, ...nats.JSOpt) error) *JetStreamContext_SecureDeleteMsg_Call { _c.Call.Return(run) return _c } // StreamInfo provides a mock function with given fields: stream, opts -func (_m *JetStreamContext) StreamInfo(stream string, opts ...natsgo.JSOpt) (*natsgo.StreamInfo, error) { +func (_m *JetStreamContext) StreamInfo(stream string, opts ...nats.JSOpt) (*nats.StreamInfo, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -2126,20 +2298,24 @@ func (_m *JetStreamContext) StreamInfo(stream string, opts ...natsgo.JSOpt) (*na _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.StreamInfo + if len(ret) == 0 { + panic("no return value specified for StreamInfo") + } + + var r0 *nats.StreamInfo var r1 error - if rf, ok := ret.Get(0).(func(string, ...natsgo.JSOpt) (*natsgo.StreamInfo, error)); ok { + if rf, ok := ret.Get(0).(func(string, ...nats.JSOpt) (*nats.StreamInfo, error)); ok { return rf(stream, opts...) } - if rf, ok := ret.Get(0).(func(string, ...natsgo.JSOpt) *natsgo.StreamInfo); ok { + if rf, ok := ret.Get(0).(func(string, ...nats.JSOpt) *nats.StreamInfo); ok { r0 = rf(stream, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.StreamInfo) + r0 = ret.Get(0).(*nats.StreamInfo) } } - if rf, ok := ret.Get(1).(func(string, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, ...nats.JSOpt) error); ok { r1 = rf(stream, opts...) } else { r1 = ret.Error(1) @@ -2155,18 +2331,18 @@ type JetStreamContext_StreamInfo_Call struct { // StreamInfo is a helper method to define mock.On call // - stream string -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) StreamInfo(stream interface{}, opts ...interface{}) *JetStreamContext_StreamInfo_Call { return &JetStreamContext_StreamInfo_Call{Call: _e.mock.On("StreamInfo", append([]interface{}{stream}, opts...)...)} } -func (_c *JetStreamContext_StreamInfo_Call) Run(run func(stream string, opts ...natsgo.JSOpt)) *JetStreamContext_StreamInfo_Call { +func (_c *JetStreamContext_StreamInfo_Call) Run(run func(stream string, opts ...nats.JSOpt)) *JetStreamContext_StreamInfo_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-1) + variadicArgs := make([]nats.JSOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), variadicArgs...) @@ -2174,18 +2350,18 @@ func (_c *JetStreamContext_StreamInfo_Call) Run(run func(stream string, opts ... return _c } -func (_c *JetStreamContext_StreamInfo_Call) Return(_a0 *natsgo.StreamInfo, _a1 error) *JetStreamContext_StreamInfo_Call { +func (_c *JetStreamContext_StreamInfo_Call) Return(_a0 *nats.StreamInfo, _a1 error) *JetStreamContext_StreamInfo_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_StreamInfo_Call) RunAndReturn(run func(string, ...natsgo.JSOpt) (*natsgo.StreamInfo, error)) *JetStreamContext_StreamInfo_Call { +func (_c *JetStreamContext_StreamInfo_Call) RunAndReturn(run func(string, ...nats.JSOpt) (*nats.StreamInfo, error)) *JetStreamContext_StreamInfo_Call { _c.Call.Return(run) return _c } // StreamNameBySubject provides a mock function with given fields: _a0, _a1 -func (_m *JetStreamContext) StreamNameBySubject(_a0 string, _a1 ...natsgo.JSOpt) (string, error) { +func (_m *JetStreamContext) StreamNameBySubject(_a0 string, _a1 ...nats.JSOpt) (string, error) { _va := make([]interface{}, len(_a1)) for _i := range _a1 { _va[_i] = _a1[_i] @@ -2195,18 +2371,22 @@ func (_m *JetStreamContext) StreamNameBySubject(_a0 string, _a1 ...natsgo.JSOpt) _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for StreamNameBySubject") + } + var r0 string var r1 error - if rf, ok := ret.Get(0).(func(string, ...natsgo.JSOpt) (string, error)); ok { + if rf, ok := ret.Get(0).(func(string, ...nats.JSOpt) (string, error)); ok { return rf(_a0, _a1...) } - if rf, ok := ret.Get(0).(func(string, ...natsgo.JSOpt) string); ok { + if rf, ok := ret.Get(0).(func(string, ...nats.JSOpt) string); ok { r0 = rf(_a0, _a1...) } else { r0 = ret.Get(0).(string) } - if rf, ok := ret.Get(1).(func(string, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, ...nats.JSOpt) error); ok { r1 = rf(_a0, _a1...) } else { r1 = ret.Error(1) @@ -2222,18 +2402,18 @@ type JetStreamContext_StreamNameBySubject_Call struct { // StreamNameBySubject is a helper method to define mock.On call // - _a0 string -// - _a1 ...natsgo.JSOpt +// - _a1 ...nats.JSOpt func (_e *JetStreamContext_Expecter) StreamNameBySubject(_a0 interface{}, _a1 ...interface{}) *JetStreamContext_StreamNameBySubject_Call { return &JetStreamContext_StreamNameBySubject_Call{Call: _e.mock.On("StreamNameBySubject", append([]interface{}{_a0}, _a1...)...)} } -func (_c *JetStreamContext_StreamNameBySubject_Call) Run(run func(_a0 string, _a1 ...natsgo.JSOpt)) *JetStreamContext_StreamNameBySubject_Call { +func (_c *JetStreamContext_StreamNameBySubject_Call) Run(run func(_a0 string, _a1 ...nats.JSOpt)) *JetStreamContext_StreamNameBySubject_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-1) + variadicArgs := make([]nats.JSOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(args[0].(string), variadicArgs...) @@ -2246,13 +2426,13 @@ func (_c *JetStreamContext_StreamNameBySubject_Call) Return(_a0 string, _a1 erro return _c } -func (_c *JetStreamContext_StreamNameBySubject_Call) RunAndReturn(run func(string, ...natsgo.JSOpt) (string, error)) *JetStreamContext_StreamNameBySubject_Call { +func (_c *JetStreamContext_StreamNameBySubject_Call) RunAndReturn(run func(string, ...nats.JSOpt) (string, error)) *JetStreamContext_StreamNameBySubject_Call { _c.Call.Return(run) return _c } // StreamNames provides a mock function with given fields: opts -func (_m *JetStreamContext) StreamNames(opts ...natsgo.JSOpt) <-chan string { +func (_m *JetStreamContext) StreamNames(opts ...nats.JSOpt) <-chan string { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -2261,8 +2441,12 @@ func (_m *JetStreamContext) StreamNames(opts ...natsgo.JSOpt) <-chan string { _ca = append(_ca, _va...) ret := _m.Called(_ca...) + if len(ret) == 0 { + panic("no return value specified for StreamNames") + } + var r0 <-chan string - if rf, ok := ret.Get(0).(func(...natsgo.JSOpt) <-chan string); ok { + if rf, ok := ret.Get(0).(func(...nats.JSOpt) <-chan string); ok { r0 = rf(opts...) } else { if ret.Get(0) != nil { @@ -2279,18 +2463,18 @@ type JetStreamContext_StreamNames_Call struct { } // StreamNames is a helper method to define mock.On call -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) StreamNames(opts ...interface{}) *JetStreamContext_StreamNames_Call { return &JetStreamContext_StreamNames_Call{Call: _e.mock.On("StreamNames", append([]interface{}{}, opts...)...)} } -func (_c *JetStreamContext_StreamNames_Call) Run(run func(opts ...natsgo.JSOpt)) *JetStreamContext_StreamNames_Call { +func (_c *JetStreamContext_StreamNames_Call) Run(run func(opts ...nats.JSOpt)) *JetStreamContext_StreamNames_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-0) + variadicArgs := make([]nats.JSOpt, len(args)-0) for i, a := range args[0:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(variadicArgs...) @@ -2303,13 +2487,13 @@ func (_c *JetStreamContext_StreamNames_Call) Return(_a0 <-chan string) *JetStrea return _c } -func (_c *JetStreamContext_StreamNames_Call) RunAndReturn(run func(...natsgo.JSOpt) <-chan string) *JetStreamContext_StreamNames_Call { +func (_c *JetStreamContext_StreamNames_Call) RunAndReturn(run func(...nats.JSOpt) <-chan string) *JetStreamContext_StreamNames_Call { _c.Call.Return(run) return _c } // Streams provides a mock function with given fields: opts -func (_m *JetStreamContext) Streams(opts ...natsgo.JSOpt) <-chan *natsgo.StreamInfo { +func (_m *JetStreamContext) Streams(opts ...nats.JSOpt) <-chan *nats.StreamInfo { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -2318,12 +2502,16 @@ func (_m *JetStreamContext) Streams(opts ...natsgo.JSOpt) <-chan *natsgo.StreamI _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 <-chan *natsgo.StreamInfo - if rf, ok := ret.Get(0).(func(...natsgo.JSOpt) <-chan *natsgo.StreamInfo); ok { + if len(ret) == 0 { + panic("no return value specified for Streams") + } + + var r0 <-chan *nats.StreamInfo + if rf, ok := ret.Get(0).(func(...nats.JSOpt) <-chan *nats.StreamInfo); ok { r0 = rf(opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan *natsgo.StreamInfo) + r0 = ret.Get(0).(<-chan *nats.StreamInfo) } } @@ -2336,18 +2524,18 @@ type JetStreamContext_Streams_Call struct { } // Streams is a helper method to define mock.On call -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) Streams(opts ...interface{}) *JetStreamContext_Streams_Call { return &JetStreamContext_Streams_Call{Call: _e.mock.On("Streams", append([]interface{}{}, opts...)...)} } -func (_c *JetStreamContext_Streams_Call) Run(run func(opts ...natsgo.JSOpt)) *JetStreamContext_Streams_Call { +func (_c *JetStreamContext_Streams_Call) Run(run func(opts ...nats.JSOpt)) *JetStreamContext_Streams_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-0) + variadicArgs := make([]nats.JSOpt, len(args)-0) for i, a := range args[0:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(variadicArgs...) @@ -2355,18 +2543,18 @@ func (_c *JetStreamContext_Streams_Call) Run(run func(opts ...natsgo.JSOpt)) *Je return _c } -func (_c *JetStreamContext_Streams_Call) Return(_a0 <-chan *natsgo.StreamInfo) *JetStreamContext_Streams_Call { +func (_c *JetStreamContext_Streams_Call) Return(_a0 <-chan *nats.StreamInfo) *JetStreamContext_Streams_Call { _c.Call.Return(_a0) return _c } -func (_c *JetStreamContext_Streams_Call) RunAndReturn(run func(...natsgo.JSOpt) <-chan *natsgo.StreamInfo) *JetStreamContext_Streams_Call { +func (_c *JetStreamContext_Streams_Call) RunAndReturn(run func(...nats.JSOpt) <-chan *nats.StreamInfo) *JetStreamContext_Streams_Call { _c.Call.Return(run) return _c } // StreamsInfo provides a mock function with given fields: opts -func (_m *JetStreamContext) StreamsInfo(opts ...natsgo.JSOpt) <-chan *natsgo.StreamInfo { +func (_m *JetStreamContext) StreamsInfo(opts ...nats.JSOpt) <-chan *nats.StreamInfo { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -2375,12 +2563,16 @@ func (_m *JetStreamContext) StreamsInfo(opts ...natsgo.JSOpt) <-chan *natsgo.Str _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 <-chan *natsgo.StreamInfo - if rf, ok := ret.Get(0).(func(...natsgo.JSOpt) <-chan *natsgo.StreamInfo); ok { + if len(ret) == 0 { + panic("no return value specified for StreamsInfo") + } + + var r0 <-chan *nats.StreamInfo + if rf, ok := ret.Get(0).(func(...nats.JSOpt) <-chan *nats.StreamInfo); ok { r0 = rf(opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(<-chan *natsgo.StreamInfo) + r0 = ret.Get(0).(<-chan *nats.StreamInfo) } } @@ -2393,18 +2585,18 @@ type JetStreamContext_StreamsInfo_Call struct { } // StreamsInfo is a helper method to define mock.On call -// - opts ...natsgo.JSOpt +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) StreamsInfo(opts ...interface{}) *JetStreamContext_StreamsInfo_Call { return &JetStreamContext_StreamsInfo_Call{Call: _e.mock.On("StreamsInfo", append([]interface{}{}, opts...)...)} } -func (_c *JetStreamContext_StreamsInfo_Call) Run(run func(opts ...natsgo.JSOpt)) *JetStreamContext_StreamsInfo_Call { +func (_c *JetStreamContext_StreamsInfo_Call) Run(run func(opts ...nats.JSOpt)) *JetStreamContext_StreamsInfo_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-0) + variadicArgs := make([]nats.JSOpt, len(args)-0) for i, a := range args[0:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } run(variadicArgs...) @@ -2412,18 +2604,18 @@ func (_c *JetStreamContext_StreamsInfo_Call) Run(run func(opts ...natsgo.JSOpt)) return _c } -func (_c *JetStreamContext_StreamsInfo_Call) Return(_a0 <-chan *natsgo.StreamInfo) *JetStreamContext_StreamsInfo_Call { +func (_c *JetStreamContext_StreamsInfo_Call) Return(_a0 <-chan *nats.StreamInfo) *JetStreamContext_StreamsInfo_Call { _c.Call.Return(_a0) return _c } -func (_c *JetStreamContext_StreamsInfo_Call) RunAndReturn(run func(...natsgo.JSOpt) <-chan *natsgo.StreamInfo) *JetStreamContext_StreamsInfo_Call { +func (_c *JetStreamContext_StreamsInfo_Call) RunAndReturn(run func(...nats.JSOpt) <-chan *nats.StreamInfo) *JetStreamContext_StreamsInfo_Call { _c.Call.Return(run) return _c } // Subscribe provides a mock function with given fields: subj, cb, opts -func (_m *JetStreamContext) Subscribe(subj string, cb natsgo.MsgHandler, opts ...natsgo.SubOpt) (*natsgo.Subscription, error) { +func (_m *JetStreamContext) Subscribe(subj string, cb nats.MsgHandler, opts ...nats.SubOpt) (*nats.Subscription, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -2433,20 +2625,24 @@ func (_m *JetStreamContext) Subscribe(subj string, cb natsgo.MsgHandler, opts .. _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.Subscription + if len(ret) == 0 { + panic("no return value specified for Subscribe") + } + + var r0 *nats.Subscription var r1 error - if rf, ok := ret.Get(0).(func(string, natsgo.MsgHandler, ...natsgo.SubOpt) (*natsgo.Subscription, error)); ok { + if rf, ok := ret.Get(0).(func(string, nats.MsgHandler, ...nats.SubOpt) (*nats.Subscription, error)); ok { return rf(subj, cb, opts...) } - if rf, ok := ret.Get(0).(func(string, natsgo.MsgHandler, ...natsgo.SubOpt) *natsgo.Subscription); ok { + if rf, ok := ret.Get(0).(func(string, nats.MsgHandler, ...nats.SubOpt) *nats.Subscription); ok { r0 = rf(subj, cb, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.Subscription) + r0 = ret.Get(0).(*nats.Subscription) } } - if rf, ok := ret.Get(1).(func(string, natsgo.MsgHandler, ...natsgo.SubOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, nats.MsgHandler, ...nats.SubOpt) error); ok { r1 = rf(subj, cb, opts...) } else { r1 = ret.Error(1) @@ -2462,38 +2658,38 @@ type JetStreamContext_Subscribe_Call struct { // Subscribe is a helper method to define mock.On call // - subj string -// - cb natsgo.MsgHandler -// - opts ...natsgo.SubOpt +// - cb nats.MsgHandler +// - opts ...nats.SubOpt func (_e *JetStreamContext_Expecter) Subscribe(subj interface{}, cb interface{}, opts ...interface{}) *JetStreamContext_Subscribe_Call { return &JetStreamContext_Subscribe_Call{Call: _e.mock.On("Subscribe", append([]interface{}{subj, cb}, opts...)...)} } -func (_c *JetStreamContext_Subscribe_Call) Run(run func(subj string, cb natsgo.MsgHandler, opts ...natsgo.SubOpt)) *JetStreamContext_Subscribe_Call { +func (_c *JetStreamContext_Subscribe_Call) Run(run func(subj string, cb nats.MsgHandler, opts ...nats.SubOpt)) *JetStreamContext_Subscribe_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.SubOpt, len(args)-2) + variadicArgs := make([]nats.SubOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.SubOpt) + variadicArgs[i] = a.(nats.SubOpt) } } - run(args[0].(string), args[1].(natsgo.MsgHandler), variadicArgs...) + run(args[0].(string), args[1].(nats.MsgHandler), variadicArgs...) }) return _c } -func (_c *JetStreamContext_Subscribe_Call) Return(_a0 *natsgo.Subscription, _a1 error) *JetStreamContext_Subscribe_Call { +func (_c *JetStreamContext_Subscribe_Call) Return(_a0 *nats.Subscription, _a1 error) *JetStreamContext_Subscribe_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_Subscribe_Call) RunAndReturn(run func(string, natsgo.MsgHandler, ...natsgo.SubOpt) (*natsgo.Subscription, error)) *JetStreamContext_Subscribe_Call { +func (_c *JetStreamContext_Subscribe_Call) RunAndReturn(run func(string, nats.MsgHandler, ...nats.SubOpt) (*nats.Subscription, error)) *JetStreamContext_Subscribe_Call { _c.Call.Return(run) return _c } // SubscribeSync provides a mock function with given fields: subj, opts -func (_m *JetStreamContext) SubscribeSync(subj string, opts ...natsgo.SubOpt) (*natsgo.Subscription, error) { +func (_m *JetStreamContext) SubscribeSync(subj string, opts ...nats.SubOpt) (*nats.Subscription, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -2503,20 +2699,24 @@ func (_m *JetStreamContext) SubscribeSync(subj string, opts ...natsgo.SubOpt) (* _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.Subscription + if len(ret) == 0 { + panic("no return value specified for SubscribeSync") + } + + var r0 *nats.Subscription var r1 error - if rf, ok := ret.Get(0).(func(string, ...natsgo.SubOpt) (*natsgo.Subscription, error)); ok { + if rf, ok := ret.Get(0).(func(string, ...nats.SubOpt) (*nats.Subscription, error)); ok { return rf(subj, opts...) } - if rf, ok := ret.Get(0).(func(string, ...natsgo.SubOpt) *natsgo.Subscription); ok { + if rf, ok := ret.Get(0).(func(string, ...nats.SubOpt) *nats.Subscription); ok { r0 = rf(subj, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.Subscription) + r0 = ret.Get(0).(*nats.Subscription) } } - if rf, ok := ret.Get(1).(func(string, ...natsgo.SubOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, ...nats.SubOpt) error); ok { r1 = rf(subj, opts...) } else { r1 = ret.Error(1) @@ -2532,18 +2732,18 @@ type JetStreamContext_SubscribeSync_Call struct { // SubscribeSync is a helper method to define mock.On call // - subj string -// - opts ...natsgo.SubOpt +// - opts ...nats.SubOpt func (_e *JetStreamContext_Expecter) SubscribeSync(subj interface{}, opts ...interface{}) *JetStreamContext_SubscribeSync_Call { return &JetStreamContext_SubscribeSync_Call{Call: _e.mock.On("SubscribeSync", append([]interface{}{subj}, opts...)...)} } -func (_c *JetStreamContext_SubscribeSync_Call) Run(run func(subj string, opts ...natsgo.SubOpt)) *JetStreamContext_SubscribeSync_Call { +func (_c *JetStreamContext_SubscribeSync_Call) Run(run func(subj string, opts ...nats.SubOpt)) *JetStreamContext_SubscribeSync_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.SubOpt, len(args)-1) + variadicArgs := make([]nats.SubOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.SubOpt) + variadicArgs[i] = a.(nats.SubOpt) } } run(args[0].(string), variadicArgs...) @@ -2551,18 +2751,18 @@ func (_c *JetStreamContext_SubscribeSync_Call) Run(run func(subj string, opts .. return _c } -func (_c *JetStreamContext_SubscribeSync_Call) Return(_a0 *natsgo.Subscription, _a1 error) *JetStreamContext_SubscribeSync_Call { +func (_c *JetStreamContext_SubscribeSync_Call) Return(_a0 *nats.Subscription, _a1 error) *JetStreamContext_SubscribeSync_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_SubscribeSync_Call) RunAndReturn(run func(string, ...natsgo.SubOpt) (*natsgo.Subscription, error)) *JetStreamContext_SubscribeSync_Call { +func (_c *JetStreamContext_SubscribeSync_Call) RunAndReturn(run func(string, ...nats.SubOpt) (*nats.Subscription, error)) *JetStreamContext_SubscribeSync_Call { _c.Call.Return(run) return _c } // UpdateConsumer provides a mock function with given fields: stream, cfg, opts -func (_m *JetStreamContext) UpdateConsumer(stream string, cfg *natsgo.ConsumerConfig, opts ...natsgo.JSOpt) (*natsgo.ConsumerInfo, error) { +func (_m *JetStreamContext) UpdateConsumer(stream string, cfg *nats.ConsumerConfig, opts ...nats.JSOpt) (*nats.ConsumerInfo, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -2572,20 +2772,24 @@ func (_m *JetStreamContext) UpdateConsumer(stream string, cfg *natsgo.ConsumerCo _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.ConsumerInfo + if len(ret) == 0 { + panic("no return value specified for UpdateConsumer") + } + + var r0 *nats.ConsumerInfo var r1 error - if rf, ok := ret.Get(0).(func(string, *natsgo.ConsumerConfig, ...natsgo.JSOpt) (*natsgo.ConsumerInfo, error)); ok { + if rf, ok := ret.Get(0).(func(string, *nats.ConsumerConfig, ...nats.JSOpt) (*nats.ConsumerInfo, error)); ok { return rf(stream, cfg, opts...) } - if rf, ok := ret.Get(0).(func(string, *natsgo.ConsumerConfig, ...natsgo.JSOpt) *natsgo.ConsumerInfo); ok { + if rf, ok := ret.Get(0).(func(string, *nats.ConsumerConfig, ...nats.JSOpt) *nats.ConsumerInfo); ok { r0 = rf(stream, cfg, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.ConsumerInfo) + r0 = ret.Get(0).(*nats.ConsumerInfo) } } - if rf, ok := ret.Get(1).(func(string, *natsgo.ConsumerConfig, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(1).(func(string, *nats.ConsumerConfig, ...nats.JSOpt) error); ok { r1 = rf(stream, cfg, opts...) } else { r1 = ret.Error(1) @@ -2601,38 +2805,38 @@ type JetStreamContext_UpdateConsumer_Call struct { // UpdateConsumer is a helper method to define mock.On call // - stream string -// - cfg *natsgo.ConsumerConfig -// - opts ...natsgo.JSOpt +// - cfg *nats.ConsumerConfig +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) UpdateConsumer(stream interface{}, cfg interface{}, opts ...interface{}) *JetStreamContext_UpdateConsumer_Call { return &JetStreamContext_UpdateConsumer_Call{Call: _e.mock.On("UpdateConsumer", append([]interface{}{stream, cfg}, opts...)...)} } -func (_c *JetStreamContext_UpdateConsumer_Call) Run(run func(stream string, cfg *natsgo.ConsumerConfig, opts ...natsgo.JSOpt)) *JetStreamContext_UpdateConsumer_Call { +func (_c *JetStreamContext_UpdateConsumer_Call) Run(run func(stream string, cfg *nats.ConsumerConfig, opts ...nats.JSOpt)) *JetStreamContext_UpdateConsumer_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-2) + variadicArgs := make([]nats.JSOpt, len(args)-2) for i, a := range args[2:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } - run(args[0].(string), args[1].(*natsgo.ConsumerConfig), variadicArgs...) + run(args[0].(string), args[1].(*nats.ConsumerConfig), variadicArgs...) }) return _c } -func (_c *JetStreamContext_UpdateConsumer_Call) Return(_a0 *natsgo.ConsumerInfo, _a1 error) *JetStreamContext_UpdateConsumer_Call { +func (_c *JetStreamContext_UpdateConsumer_Call) Return(_a0 *nats.ConsumerInfo, _a1 error) *JetStreamContext_UpdateConsumer_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_UpdateConsumer_Call) RunAndReturn(run func(string, *natsgo.ConsumerConfig, ...natsgo.JSOpt) (*natsgo.ConsumerInfo, error)) *JetStreamContext_UpdateConsumer_Call { +func (_c *JetStreamContext_UpdateConsumer_Call) RunAndReturn(run func(string, *nats.ConsumerConfig, ...nats.JSOpt) (*nats.ConsumerInfo, error)) *JetStreamContext_UpdateConsumer_Call { _c.Call.Return(run) return _c } // UpdateStream provides a mock function with given fields: cfg, opts -func (_m *JetStreamContext) UpdateStream(cfg *natsgo.StreamConfig, opts ...natsgo.JSOpt) (*natsgo.StreamInfo, error) { +func (_m *JetStreamContext) UpdateStream(cfg *nats.StreamConfig, opts ...nats.JSOpt) (*nats.StreamInfo, error) { _va := make([]interface{}, len(opts)) for _i := range opts { _va[_i] = opts[_i] @@ -2642,20 +2846,24 @@ func (_m *JetStreamContext) UpdateStream(cfg *natsgo.StreamConfig, opts ...natsg _ca = append(_ca, _va...) ret := _m.Called(_ca...) - var r0 *natsgo.StreamInfo + if len(ret) == 0 { + panic("no return value specified for UpdateStream") + } + + var r0 *nats.StreamInfo var r1 error - if rf, ok := ret.Get(0).(func(*natsgo.StreamConfig, ...natsgo.JSOpt) (*natsgo.StreamInfo, error)); ok { + if rf, ok := ret.Get(0).(func(*nats.StreamConfig, ...nats.JSOpt) (*nats.StreamInfo, error)); ok { return rf(cfg, opts...) } - if rf, ok := ret.Get(0).(func(*natsgo.StreamConfig, ...natsgo.JSOpt) *natsgo.StreamInfo); ok { + if rf, ok := ret.Get(0).(func(*nats.StreamConfig, ...nats.JSOpt) *nats.StreamInfo); ok { r0 = rf(cfg, opts...) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*natsgo.StreamInfo) + r0 = ret.Get(0).(*nats.StreamInfo) } } - if rf, ok := ret.Get(1).(func(*natsgo.StreamConfig, ...natsgo.JSOpt) error); ok { + if rf, ok := ret.Get(1).(func(*nats.StreamConfig, ...nats.JSOpt) error); ok { r1 = rf(cfg, opts...) } else { r1 = ret.Error(1) @@ -2670,32 +2878,32 @@ type JetStreamContext_UpdateStream_Call struct { } // UpdateStream is a helper method to define mock.On call -// - cfg *natsgo.StreamConfig -// - opts ...natsgo.JSOpt +// - cfg *nats.StreamConfig +// - opts ...nats.JSOpt func (_e *JetStreamContext_Expecter) UpdateStream(cfg interface{}, opts ...interface{}) *JetStreamContext_UpdateStream_Call { return &JetStreamContext_UpdateStream_Call{Call: _e.mock.On("UpdateStream", append([]interface{}{cfg}, opts...)...)} } -func (_c *JetStreamContext_UpdateStream_Call) Run(run func(cfg *natsgo.StreamConfig, opts ...natsgo.JSOpt)) *JetStreamContext_UpdateStream_Call { +func (_c *JetStreamContext_UpdateStream_Call) Run(run func(cfg *nats.StreamConfig, opts ...nats.JSOpt)) *JetStreamContext_UpdateStream_Call { _c.Call.Run(func(args mock.Arguments) { - variadicArgs := make([]natsgo.JSOpt, len(args)-1) + variadicArgs := make([]nats.JSOpt, len(args)-1) for i, a := range args[1:] { if a != nil { - variadicArgs[i] = a.(natsgo.JSOpt) + variadicArgs[i] = a.(nats.JSOpt) } } - run(args[0].(*natsgo.StreamConfig), variadicArgs...) + run(args[0].(*nats.StreamConfig), variadicArgs...) }) return _c } -func (_c *JetStreamContext_UpdateStream_Call) Return(_a0 *natsgo.StreamInfo, _a1 error) *JetStreamContext_UpdateStream_Call { +func (_c *JetStreamContext_UpdateStream_Call) Return(_a0 *nats.StreamInfo, _a1 error) *JetStreamContext_UpdateStream_Call { _c.Call.Return(_a0, _a1) return _c } -func (_c *JetStreamContext_UpdateStream_Call) RunAndReturn(run func(*natsgo.StreamConfig, ...natsgo.JSOpt) (*natsgo.StreamInfo, error)) *JetStreamContext_UpdateStream_Call { +func (_c *JetStreamContext_UpdateStream_Call) RunAndReturn(run func(*nats.StreamConfig, ...nats.JSOpt) (*nats.StreamInfo, error)) *JetStreamContext_UpdateStream_Call { _c.Call.Return(run) return _c } diff --git a/sec-scanners-config.yaml b/sec-scanners-config.yaml index e0a0e645..d5d13863 100644 --- a/sec-scanners-config.yaml +++ b/sec-scanners-config.yaml @@ -1,7 +1,7 @@ module-name: nats -rc-tag: 1.2.1 +rc-tag: 1.2.2 protecode: - - europe-docker.pkg.dev/kyma-project/prod/nats-manager:1.2.1 + - europe-docker.pkg.dev/kyma-project/prod/nats-manager:1.2.2 - europe-docker.pkg.dev/kyma-project/prod/external/natsio/prometheus-nats-exporter:0.14.0 - europe-docker.pkg.dev/kyma-project/prod/external/natsio/nats-server-config-reloader:0.14.1 - europe-docker.pkg.dev/kyma-project/prod/external/nats:v20240102-2.10.7-alpine3.18