From 5281b90f6d417eaf935b524536315e8f9fd7cfa6 Mon Sep 17 00:00:00 2001 From: Zorian Motso Date: Tue, 11 Nov 2025 12:40:01 +0200 Subject: [PATCH] chore: Update Operator SDK from v1.39.2 to v1.42.0 (#252) --- .github/workflows/codecov.yaml | 2 +- .github/workflows/codeql.yaml | 6 +- .github/workflows/pr.yaml | 2 +- .github/workflows/release.yaml | 2 +- .mockery.yaml | 17 +- Makefile | 28 +- cmd/main.go | 137 +++- .../v2.edp.epam.com_cdstagedeployments.yaml | 2 +- .../v2.edp.epam.com_codebasebranches.yaml | 2 +- .../v2.edp.epam.com_codebaseimagestreams.yaml | 2 +- .../crd/bases/v2.edp.epam.com_codebases.yaml | 2 +- .../crd/bases/v2.edp.epam.com_gitservers.yaml | 2 +- .../v2.edp.epam.com_jiraissuemetadatas.yaml | 2 +- .../bases/v2.edp.epam.com_jiraservers.yaml | 2 +- .../crd/bases/v2.edp.epam.com_quicklinks.yaml | 2 +- .../crd/bases/v2.edp.epam.com_templates.yaml | 2 +- ...cd_stage_deploy_handler_generated.mock.go} | 76 +- ....go => codebase_handler_generated.mock.go} | 77 +- .../codebasebranch_controller_test.go | 43 +- .../codebaseimagestream_controller_test.go | 9 +- .../gitserver/gitserver_controller_test.go | 5 +- .../jiraissuemetadata_controller_test.go | 15 +- .../jiraserver/jiraserver_controller_test.go | 11 +- .../v2.edp.epam.com_cdstagedeployments.yaml | 2 +- .../v2.edp.epam.com_codebasebranches.yaml | 2 +- .../v2.edp.epam.com_codebaseimagestreams.yaml | 2 +- .../crds/v2.edp.epam.com_codebases.yaml | 2 +- .../crds/v2.edp.epam.com_gitservers.yaml | 2 +- .../v2.edp.epam.com_jiraissuemetadatas.yaml | 2 +- .../crds/v2.edp.epam.com_jiraservers.yaml | 2 +- .../crds/v2.edp.epam.com_quicklinks.yaml | 2 +- .../crds/v2.edp.epam.com_templates.yaml | 2 +- go.mod | 133 ++-- go.sum | 285 ++++--- ...ager_mock.go => manager_generated.mock.go} | 133 ++-- .../mocks/client_factory_generated.mock.go | 100 +++ ...lient_mock.go => client_generated.mock.go} | 327 +++++--- ...lient_mock.go => client_generated.mock.go} | 198 +++-- .../{git_mock.go => git_generated.mock.go} | 622 +++++++++++----- ...=> git_project_provider_generated.mock.go} | 175 +++-- .../mocks/git_provider_generated.mock.go | 704 ++++++++++++++++++ .../git_web_hook_provider_generated.mock.go | 476 ++++++++++++ ...rigger_template_manager_generated.mock.go} | 198 +++-- pkg/testutils/envtest.go | 34 + pkg/webhook/webhook_suite_test.go | 6 +- sonar-project.properties | 2 +- 46 files changed, 2998 insertions(+), 861 deletions(-) rename controllers/cdstagedeploy/chain/mocks/{cdstagedeployhandler_mock.go => cd_stage_deploy_handler_generated.mock.go} (55%) rename controllers/codebase/service/chain/handler/mocks/{codebasehandler_mock.go => codebase_handler_generated.mock.go} (54%) rename pkg/autodeploy/mocks/{manager_mock.go => manager_generated.mock.go} (53%) create mode 100644 pkg/client/jira/mocks/client_factory_generated.mock.go rename pkg/client/jira/mocks/{client_mock.go => client_generated.mock.go} (56%) rename pkg/gerrit/mocks/{client_mock.go => client_generated.mock.go} (52%) rename pkg/git/mocks/{git_mock.go => git_generated.mock.go} (55%) rename pkg/gitprovider/mocks/{gitprojectprovider_mock.go => git_project_provider_generated.mock.go} (54%) create mode 100644 pkg/gitprovider/mocks/git_provider_generated.mock.go create mode 100644 pkg/gitprovider/mocks/git_web_hook_provider_generated.mock.go rename pkg/tektoncd/mocks/{triggertemplatemanager_mock.go => trigger_template_manager_generated.mock.go} (56%) create mode 100644 pkg/testutils/envtest.go diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml index 07792845..888d1cac 100644 --- a/.github/workflows/codecov.yaml +++ b/.github/workflows/codecov.yaml @@ -11,7 +11,7 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v5 + - uses: actions/checkout@v6 - name: Set up Go uses: actions/setup-go@v6 diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml index c81410e6..281ef53c 100644 --- a/.github/workflows/codeql.yaml +++ b/.github/workflows/codeql.yaml @@ -29,11 +29,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@v4 with: languages: ${{ matrix.language }} build-mode: manual @@ -44,6 +44,6 @@ jobs: make build - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@v4 with: category: "/language:${{ matrix.language }}" diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index b3468cbd..c140bb57 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -17,7 +17,7 @@ jobs: steps: - name: Check out code into the Go module directory - uses: actions/checkout@v5 + uses: actions/checkout@v6 - name: Set up Go uses: actions/setup-go@v6 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 63f170f8..2d52f9b5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -16,7 +16,7 @@ jobs: SOURCE_TAG: ${{ github.ref }} steps: - name: Checkout code - uses: actions/checkout@v5 + uses: actions/checkout@v6 with: fetch-depth: '0' diff --git a/.mockery.yaml b/.mockery.yaml index fe00407b..546cba3e 100644 --- a/.mockery.yaml +++ b/.mockery.yaml @@ -1,12 +1,11 @@ -with-expecter: True -inpackage: False -dir: "{{.InterfaceDir}}/mocks" -mockname: "Mock{{.InterfaceName}}" -outpkg: "mocks" -filename: "{{.InterfaceName | lower}}_mock.go" -issue-845-fix: True -disable-version-string: True -resolve-type-alias: False +all: true +dir: '{{.InterfaceDir}}/mocks' +structname: Mock{{.InterfaceName}} +pkgname: mocks +template: testify +filename: "{{ .InterfaceName | snakecase }}_generated.mock.go" +template-data: + unroll-variadic: true packages: github.com/epam/edp-codebase-operator/v2/controllers/cdstagedeploy/chain: interfaces: diff --git a/Makefile b/Makefile index 9bd420c8..c7157e9e 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ validate-docs: api-docs helm-docs ## Validate helm and api docs @git diff -s --exit-code docs/api.md || (echo " Run 'make api-docs' to address the issue." && git diff && exit 1) # Run tests -test: fmt vet envtest +test: fmt vet setup-envtest KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" \ KUBECONFIG=${CURRENT_DIR}/hack/kubecfg-stub.yaml go test ./... -coverprofile=coverage.out @@ -142,16 +142,16 @@ install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~ ##@ Build Dependencies ## Tool Versions -KUSTOMIZE_VERSION ?= v5.4.3 -CONTROLLER_TOOLS_VERSION ?= v0.16.5 -ENVTEST_VERSION ?= release-0.19 +KUSTOMIZE_VERSION ?= v5.6.0 +CONTROLLER_TOOLS_VERSION ?= v0.18.0 +ENVTEST_VERSION ?= $(shell go list -m -f "{{ .Version }}" sigs.k8s.io/controller-runtime | awk -F'[v.]' '{printf "release-%d.%d", $$2, $$3}') +ENVTEST_K8S_VERSION ?= $(shell go list -m -f "{{ .Version }}" k8s.io/api | awk -F'[v.]' '{printf "1.%d", $$3}') GOLANGCI_LINT_VERSION ?= v1.64.7 -MOCKERY_VERSION ?= v2.53.2 +MOCKERY_VERSION ?= v3.6.2 HELMDOCS_VERSION ?= v1.14.2 GITCHGLOG_VERSION ?= v0.15.4 CRDOC_VERSION ?= v0.6.4 -ENVTEST_K8S_VERSION = 1.31.0 -OPERATOR_SDK_VERSION ?= v1.39.2 +OPERATOR_SDK_VERSION ?= v1.42.0 KUSTOMIZE ?= $(LOCALBIN)/kustomize .PHONY: kustomize @@ -202,9 +202,17 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) $(OPERATOR_SDK) bundle validate ./bundle -ENVTEST=$(LOCALBIN)/setup-envtest +.PHONY: setup-envtest +setup-envtest: envtest ## Download the binaries required for ENVTEST in the local bin directory. + @echo "Setting up envtest binaries for Kubernetes version $(ENVTEST_K8S_VERSION)..." + @$(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path || { \ + echo "Error: Failed to set up envtest binaries for version $(ENVTEST_K8S_VERSION)."; \ + exit 1; \ + } + +ENVTEST ?= $(LOCALBIN)/setup-envtest .PHONY: envtest -envtest: $(ENVTEST) ## Download envtest-setup locally if necessary. +envtest: $(ENVTEST) ## Download setup-envtest locally if necessary. $(ENVTEST): $(LOCALBIN) $(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest,$(ENVTEST_VERSION)) @@ -214,7 +222,7 @@ mocks: mockery MOCKERY = $(LOCALBIN)/mockery .PHONY: mockery mockery: ## Download mockery locally if necessary. - $(call go-install-tool,$(MOCKERY),github.com/vektra/mockery/v2,$(MOCKERY_VERSION)) + $(call go-install-tool,$(MOCKERY),github.com/vektra/mockery/v3,$(MOCKERY_VERSION)) .PHONY: operator-sdk OPERATOR_SDK ?= $(LOCALBIN)/operator-sdk diff --git a/cmd/main.go b/cmd/main.go index dbca9e39..587653c1 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -5,6 +5,7 @@ import ( "crypto/tls" "flag" "os" + "path/filepath" "strconv" "time" @@ -21,9 +22,12 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/cache" + "sigs.k8s.io/controller-runtime/pkg/certwatcher" "sigs.k8s.io/controller-runtime/pkg/healthz" "sigs.k8s.io/controller-runtime/pkg/log/zap" + "sigs.k8s.io/controller-runtime/pkg/metrics/filters" metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" + ctrlwebhook "sigs.k8s.io/controller-runtime/pkg/webhook" cdPipeApi "github.com/epam/edp-cd-pipeline-operator/v2/api/v1" buildInfo "github.com/epam/edp-common/pkg/config" @@ -59,20 +63,31 @@ const ( func main() { var ( - metricsAddr string - enableLeaderElection bool - probeAddr string - secureMetrics bool - enableHTTP2 bool + metricsAddr string + metricsCertPath, metricsCertName, metricsCertKey string + webhookCertPath, webhookCertName, webhookCertKey string + enableLeaderElection bool + probeAddr string + secureMetrics bool + enableHTTP2 bool + tlsOpts []func(*tls.Config) ) - flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.") + flag.StringVar(&metricsAddr, "metrics-bind-address", "0", "The address the metrics endpoint binds to. "+ + "Use :8443 for HTTPS or :8080 for HTTP, or leave as 0 to disable the metrics service.") flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.") flag.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") - flag.BoolVar(&secureMetrics, "metrics-secure", false, - "If set the metrics endpoint is served securely") + flag.BoolVar(&secureMetrics, "metrics-secure", true, + "If set, the metrics endpoint is served securely via HTTPS. Use --metrics-secure=false to use HTTP instead.") + flag.StringVar(&webhookCertPath, "webhook-cert-path", "", "The directory that contains the webhook certificate.") + flag.StringVar(&webhookCertName, "webhook-cert-name", "tls.crt", "The name of the webhook certificate file.") + flag.StringVar(&webhookCertKey, "webhook-cert-key", "tls.key", "The name of the webhook key file.") + flag.StringVar(&metricsCertPath, "metrics-cert-path", "", + "The directory that contains the metrics server certificate.") + flag.StringVar(&metricsCertName, "metrics-cert-name", "tls.crt", "The name of the metrics server certificate file.") + flag.StringVar(&metricsCertKey, "metrics-cert-key", "tls.key", "The name of the metrics server key file.") flag.BoolVar(&enableHTTP2, "enable-http2", false, "If set, HTTP/2 will be enabled for the metrics and webhook servers") @@ -90,7 +105,7 @@ func main() { // if the enable-http2 flag is false (the default), http/2 should be disabled // due to its vulnerabilities. More specifically, disabling http/2 will - // prevent from being vulnerable to the HTTP/2 Stream Cancelation and + // prevent from being vulnerable to the HTTP/2 Stream Cancellation and // Rapid Reset CVEs. For more information see: // - https://github.com/advisories/GHSA-qppj-fm5r-hxr3 // - https://github.com/advisories/GHSA-4374-p667-p6c8 @@ -100,11 +115,86 @@ func main() { c.NextProtos = []string{"http/1.1"} } - var tlsOpts []func(*tls.Config) if !enableHTTP2 { tlsOpts = append(tlsOpts, disableHTTP2) } + // Create watchers for metrics and webhooks certificates + var metricsCertWatcher, webhookCertWatcher *certwatcher.CertWatcher + + // Initial webhook TLS options + webhookTLSOpts := tlsOpts + + if len(webhookCertPath) > 0 { + setupLog.Info("Initializing webhook certificate watcher using provided certificates", + "webhook-cert-path", webhookCertPath, "webhook-cert-name", webhookCertName, "webhook-cert-key", webhookCertKey) + + var err error + + webhookCertWatcher, err = certwatcher.New( + filepath.Join(webhookCertPath, webhookCertName), + filepath.Join(webhookCertPath, webhookCertKey), + ) + if err != nil { + setupLog.Error(err, "Failed to initialize webhook certificate watcher") + os.Exit(1) + } + + webhookTLSOpts = append(webhookTLSOpts, func(config *tls.Config) { + config.GetCertificate = webhookCertWatcher.GetCertificate + }) + } + + webhookServer := ctrlwebhook.NewServer(ctrlwebhook.Options{ + TLSOpts: webhookTLSOpts, + }) + + // Metrics endpoint is enabled in 'config/default/kustomization.yaml'. The Metrics options configure the server. + // More info: + // - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.21.0/pkg/metrics/server + // - https://book.kubebuilder.io/reference/metrics.html + metricsServerOptions := metricsserver.Options{ + BindAddress: metricsAddr, + SecureServing: secureMetrics, + TLSOpts: tlsOpts, + } + + if secureMetrics { + // FilterProvider is used to protect the metrics endpoint with authn/authz. + // These configurations ensure that only authorized users and service accounts + // can access the metrics endpoint. The RBAC are configured in 'config/rbac/kustomization.yaml'. More info: + // https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.21.0/pkg/metrics/filters#WithAuthenticationAndAuthorization + metricsServerOptions.FilterProvider = filters.WithAuthenticationAndAuthorization + } + + // If the certificate is not specified, controller-runtime will automatically + // generate self-signed certificates for the metrics server. While convenient for development and testing, + // this setup is not recommended for production. + // + // TODO(user): If you enable certManager, uncomment the following lines: + // - [METRICS-WITH-CERTS] at config/default/kustomization.yaml to generate and use certificates + // managed by cert-manager for the metrics server. + // - [PROMETHEUS-WITH-CERTS] at config/prometheus/kustomization.yaml for TLS certification. + if len(metricsCertPath) > 0 { + setupLog.Info("Initializing metrics certificate watcher using provided certificates", + "metrics-cert-path", metricsCertPath, "metrics-cert-name", metricsCertName, "metrics-cert-key", metricsCertKey) + + var err error + + metricsCertWatcher, err = certwatcher.New( + filepath.Join(metricsCertPath, metricsCertName), + filepath.Join(metricsCertPath, metricsCertKey), + ) + if err != nil { + setupLog.Error(err, "to initialize metrics certificate watcher", "error", err) + os.Exit(1) + } + + metricsServerOptions.TLSOpts = append(metricsServerOptions.TLSOpts, func(config *tls.Config) { + config.GetCertificate = metricsCertWatcher.GetCertificate + }) + } + setupLog.Info("Starting the Codebase Operator", "version", v.Version, "git-commit", v.GitCommit, @@ -132,12 +222,9 @@ func main() { cfg := ctrl.GetConfigOrDie() mgr, err := ctrl.NewManager(cfg, ctrl.Options{ - Scheme: scheme, - Metrics: metricsserver.Options{ - BindAddress: metricsAddr, - SecureServing: secureMetrics, - TLSOpts: tlsOpts, - }, + Scheme: scheme, + Metrics: metricsServerOptions, + WebhookServer: webhookServer, HealthProbeBindAddress: probeAddr, LeaderElection: enableLeaderElection, LeaderElectionID: codebaseOperatorLock, @@ -208,6 +295,24 @@ func main() { // +kubebuilder:scaffold:builder + if metricsCertWatcher != nil { + setupLog.Info("Adding metrics certificate watcher to manager") + + if err := mgr.Add(metricsCertWatcher); err != nil { + setupLog.Error(err, "Unable to add metrics certificate watcher to manager") + os.Exit(1) + } + } + + if webhookCertWatcher != nil { + setupLog.Info("Adding webhook certificate watcher to manager") + + if err := mgr.Add(webhookCertWatcher); err != nil { + setupLog.Error(err, "Unable to add webhook certificate watcher to manager") + os.Exit(1) + } + } + if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil { setupLog.Error(err, "failed to set up health check") os.Exit(1) diff --git a/config/crd/bases/v2.edp.epam.com_cdstagedeployments.yaml b/config/crd/bases/v2.edp.epam.com_cdstagedeployments.yaml index 5460e64e..24da9dc1 100644 --- a/config/crd/bases/v2.edp.epam.com_cdstagedeployments.yaml +++ b/config/crd/bases/v2.edp.epam.com_cdstagedeployments.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: cdstagedeployments.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml b/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml index 8c6cc87b..e5314455 100644 --- a/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml +++ b/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: codebasebranches.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/config/crd/bases/v2.edp.epam.com_codebaseimagestreams.yaml b/config/crd/bases/v2.edp.epam.com_codebaseimagestreams.yaml index 6013aa39..601079f0 100644 --- a/config/crd/bases/v2.edp.epam.com_codebaseimagestreams.yaml +++ b/config/crd/bases/v2.edp.epam.com_codebaseimagestreams.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: codebaseimagestreams.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/config/crd/bases/v2.edp.epam.com_codebases.yaml b/config/crd/bases/v2.edp.epam.com_codebases.yaml index 1ad2996b..bf56fb48 100644 --- a/config/crd/bases/v2.edp.epam.com_codebases.yaml +++ b/config/crd/bases/v2.edp.epam.com_codebases.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: codebases.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/config/crd/bases/v2.edp.epam.com_gitservers.yaml b/config/crd/bases/v2.edp.epam.com_gitservers.yaml index 7fba3638..18d40313 100644 --- a/config/crd/bases/v2.edp.epam.com_gitservers.yaml +++ b/config/crd/bases/v2.edp.epam.com_gitservers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: gitservers.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/config/crd/bases/v2.edp.epam.com_jiraissuemetadatas.yaml b/config/crd/bases/v2.edp.epam.com_jiraissuemetadatas.yaml index 7995b3bc..2c5f80f4 100644 --- a/config/crd/bases/v2.edp.epam.com_jiraissuemetadatas.yaml +++ b/config/crd/bases/v2.edp.epam.com_jiraissuemetadatas.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: jiraissuemetadatas.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/config/crd/bases/v2.edp.epam.com_jiraservers.yaml b/config/crd/bases/v2.edp.epam.com_jiraservers.yaml index 327eac70..6dab51f8 100644 --- a/config/crd/bases/v2.edp.epam.com_jiraservers.yaml +++ b/config/crd/bases/v2.edp.epam.com_jiraservers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: jiraservers.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/config/crd/bases/v2.edp.epam.com_quicklinks.yaml b/config/crd/bases/v2.edp.epam.com_quicklinks.yaml index df5e8f9e..b8dd944b 100644 --- a/config/crd/bases/v2.edp.epam.com_quicklinks.yaml +++ b/config/crd/bases/v2.edp.epam.com_quicklinks.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: quicklinks.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/config/crd/bases/v2.edp.epam.com_templates.yaml b/config/crd/bases/v2.edp.epam.com_templates.yaml index 8339350a..586f453e 100644 --- a/config/crd/bases/v2.edp.epam.com_templates.yaml +++ b/config/crd/bases/v2.edp.epam.com_templates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: templates.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/controllers/cdstagedeploy/chain/mocks/cdstagedeployhandler_mock.go b/controllers/cdstagedeploy/chain/mocks/cd_stage_deploy_handler_generated.mock.go similarity index 55% rename from controllers/cdstagedeploy/chain/mocks/cdstagedeployhandler_mock.go rename to controllers/cdstagedeploy/chain/mocks/cd_stage_deploy_handler_generated.mock.go index 953169e1..486f0e12 100644 --- a/controllers/cdstagedeploy/chain/mocks/cdstagedeployhandler_mock.go +++ b/controllers/cdstagedeploy/chain/mocks/cd_stage_deploy_handler_generated.mock.go @@ -1,14 +1,30 @@ -// Code generated by mockery. DO NOT EDIT. +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify package mocks import ( - context "context" + "context" - v1 "github.com/epam/edp-codebase-operator/v2/api/v1" + "github.com/epam/edp-codebase-operator/v2/api/v1" mock "github.com/stretchr/testify/mock" ) +// NewMockCDStageDeployHandler creates a new instance of MockCDStageDeployHandler. 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 NewMockCDStageDeployHandler(t interface { + mock.TestingT + Cleanup(func()) +}) *MockCDStageDeployHandler { + mock := &MockCDStageDeployHandler{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} + // MockCDStageDeployHandler is an autogenerated mock type for the CDStageDeployHandler type type MockCDStageDeployHandler struct { mock.Mock @@ -22,21 +38,20 @@ func (_m *MockCDStageDeployHandler) EXPECT() *MockCDStageDeployHandler_Expecter return &MockCDStageDeployHandler_Expecter{mock: &_m.Mock} } -// ServeRequest provides a mock function with given fields: _a0, _a1 -func (_m *MockCDStageDeployHandler) ServeRequest(_a0 context.Context, _a1 *v1.CDStageDeploy) error { - ret := _m.Called(_a0, _a1) +// ServeRequest provides a mock function for the type MockCDStageDeployHandler +func (_mock *MockCDStageDeployHandler) ServeRequest(context1 context.Context, cDStageDeploy *v1.CDStageDeploy) error { + ret := _mock.Called(context1, cDStageDeploy) if len(ret) == 0 { panic("no return value specified for ServeRequest") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *v1.CDStageDeploy) error); ok { - r0 = rf(_a0, _a1) + if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.CDStageDeploy) error); ok { + r0 = returnFunc(context1, cDStageDeploy) } else { r0 = ret.Error(0) } - return r0 } @@ -46,39 +61,36 @@ type MockCDStageDeployHandler_ServeRequest_Call struct { } // ServeRequest is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *v1.CDStageDeploy -func (_e *MockCDStageDeployHandler_Expecter) ServeRequest(_a0 interface{}, _a1 interface{}) *MockCDStageDeployHandler_ServeRequest_Call { - return &MockCDStageDeployHandler_ServeRequest_Call{Call: _e.mock.On("ServeRequest", _a0, _a1)} +// - context1 context.Context +// - cDStageDeploy *v1.CDStageDeploy +func (_e *MockCDStageDeployHandler_Expecter) ServeRequest(context1 interface{}, cDStageDeploy interface{}) *MockCDStageDeployHandler_ServeRequest_Call { + return &MockCDStageDeployHandler_ServeRequest_Call{Call: _e.mock.On("ServeRequest", context1, cDStageDeploy)} } -func (_c *MockCDStageDeployHandler_ServeRequest_Call) Run(run func(_a0 context.Context, _a1 *v1.CDStageDeploy)) *MockCDStageDeployHandler_ServeRequest_Call { +func (_c *MockCDStageDeployHandler_ServeRequest_Call) Run(run func(context1 context.Context, cDStageDeploy *v1.CDStageDeploy)) *MockCDStageDeployHandler_ServeRequest_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(*v1.CDStageDeploy)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *v1.CDStageDeploy + if args[1] != nil { + arg1 = args[1].(*v1.CDStageDeploy) + } + run( + arg0, + arg1, + ) }) return _c } -func (_c *MockCDStageDeployHandler_ServeRequest_Call) Return(_a0 error) *MockCDStageDeployHandler_ServeRequest_Call { - _c.Call.Return(_a0) +func (_c *MockCDStageDeployHandler_ServeRequest_Call) Return(err error) *MockCDStageDeployHandler_ServeRequest_Call { + _c.Call.Return(err) return _c } -func (_c *MockCDStageDeployHandler_ServeRequest_Call) RunAndReturn(run func(context.Context, *v1.CDStageDeploy) error) *MockCDStageDeployHandler_ServeRequest_Call { +func (_c *MockCDStageDeployHandler_ServeRequest_Call) RunAndReturn(run func(context1 context.Context, cDStageDeploy *v1.CDStageDeploy) error) *MockCDStageDeployHandler_ServeRequest_Call { _c.Call.Return(run) return _c } - -// NewMockCDStageDeployHandler creates a new instance of MockCDStageDeployHandler. 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 NewMockCDStageDeployHandler(t interface { - mock.TestingT - Cleanup(func()) -}) *MockCDStageDeployHandler { - mock := &MockCDStageDeployHandler{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/controllers/codebase/service/chain/handler/mocks/codebasehandler_mock.go b/controllers/codebase/service/chain/handler/mocks/codebase_handler_generated.mock.go similarity index 54% rename from controllers/codebase/service/chain/handler/mocks/codebasehandler_mock.go rename to controllers/codebase/service/chain/handler/mocks/codebase_handler_generated.mock.go index 2aee8112..6b82047b 100644 --- a/controllers/codebase/service/chain/handler/mocks/codebasehandler_mock.go +++ b/controllers/codebase/service/chain/handler/mocks/codebase_handler_generated.mock.go @@ -1,15 +1,30 @@ -// Code generated by mockery. DO NOT EDIT. +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify package mocks import ( - context "context" + "context" + "github.com/epam/edp-codebase-operator/v2/api/v1" mock "github.com/stretchr/testify/mock" - - v1 "github.com/epam/edp-codebase-operator/v2/api/v1" ) +// NewMockCodebaseHandler creates a new instance of MockCodebaseHandler. 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 NewMockCodebaseHandler(t interface { + mock.TestingT + Cleanup(func()) +}) *MockCodebaseHandler { + mock := &MockCodebaseHandler{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} + // MockCodebaseHandler is an autogenerated mock type for the CodebaseHandler type type MockCodebaseHandler struct { mock.Mock @@ -23,21 +38,20 @@ func (_m *MockCodebaseHandler) EXPECT() *MockCodebaseHandler_Expecter { return &MockCodebaseHandler_Expecter{mock: &_m.Mock} } -// ServeRequest provides a mock function with given fields: _a0, _a1 -func (_m *MockCodebaseHandler) ServeRequest(_a0 context.Context, _a1 *v1.Codebase) error { - ret := _m.Called(_a0, _a1) +// ServeRequest provides a mock function for the type MockCodebaseHandler +func (_mock *MockCodebaseHandler) ServeRequest(context1 context.Context, codebase *v1.Codebase) error { + ret := _mock.Called(context1, codebase) if len(ret) == 0 { panic("no return value specified for ServeRequest") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, *v1.Codebase) error); ok { - r0 = rf(_a0, _a1) + if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.Codebase) error); ok { + r0 = returnFunc(context1, codebase) } else { r0 = ret.Error(0) } - return r0 } @@ -47,39 +61,36 @@ type MockCodebaseHandler_ServeRequest_Call struct { } // ServeRequest is a helper method to define mock.On call -// - _a0 context.Context -// - _a1 *v1.Codebase -func (_e *MockCodebaseHandler_Expecter) ServeRequest(_a0 interface{}, _a1 interface{}) *MockCodebaseHandler_ServeRequest_Call { - return &MockCodebaseHandler_ServeRequest_Call{Call: _e.mock.On("ServeRequest", _a0, _a1)} +// - context1 context.Context +// - codebase *v1.Codebase +func (_e *MockCodebaseHandler_Expecter) ServeRequest(context1 interface{}, codebase interface{}) *MockCodebaseHandler_ServeRequest_Call { + return &MockCodebaseHandler_ServeRequest_Call{Call: _e.mock.On("ServeRequest", context1, codebase)} } -func (_c *MockCodebaseHandler_ServeRequest_Call) Run(run func(_a0 context.Context, _a1 *v1.Codebase)) *MockCodebaseHandler_ServeRequest_Call { +func (_c *MockCodebaseHandler_ServeRequest_Call) Run(run func(context1 context.Context, codebase *v1.Codebase)) *MockCodebaseHandler_ServeRequest_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(*v1.Codebase)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *v1.Codebase + if args[1] != nil { + arg1 = args[1].(*v1.Codebase) + } + run( + arg0, + arg1, + ) }) return _c } -func (_c *MockCodebaseHandler_ServeRequest_Call) Return(_a0 error) *MockCodebaseHandler_ServeRequest_Call { - _c.Call.Return(_a0) +func (_c *MockCodebaseHandler_ServeRequest_Call) Return(err error) *MockCodebaseHandler_ServeRequest_Call { + _c.Call.Return(err) return _c } -func (_c *MockCodebaseHandler_ServeRequest_Call) RunAndReturn(run func(context.Context, *v1.Codebase) error) *MockCodebaseHandler_ServeRequest_Call { +func (_c *MockCodebaseHandler_ServeRequest_Call) RunAndReturn(run func(context1 context.Context, codebase *v1.Codebase) error) *MockCodebaseHandler_ServeRequest_Call { _c.Call.Return(run) return _c } - -// NewMockCodebaseHandler creates a new instance of MockCodebaseHandler. 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 NewMockCodebaseHandler(t interface { - mock.TestingT - Cleanup(func()) -}) *MockCodebaseHandler { - mock := &MockCodebaseHandler{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/controllers/codebasebranch/codebasebranch_controller_test.go b/controllers/codebasebranch/codebasebranch_controller_test.go index 661c75de..e263b680 100644 --- a/controllers/codebasebranch/codebasebranch_controller_test.go +++ b/controllers/codebasebranch/codebasebranch_controller_test.go @@ -47,7 +47,7 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldPassNotFoundCR(t *testing.T) { res, err := r.Reconcile(context.TODO(), req) assert.NoError(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileCodebaseBranch_Reconcile_ShouldFailNotFound(t *testing.T) { @@ -76,7 +76,7 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldFailNotFound(t *testing.T) { t.Fatalf("wrong error returned: %s", err.Error()) } - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileCodebaseBranch_Reconcile_ShouldFailGetCodebase(t *testing.T) { @@ -116,7 +116,7 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldFailGetCodebase(t *testing.T) { res, err := r.Reconcile(context.TODO(), req) require.Error(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) assert.Contains(t, err.Error(), "failed to get Codebase") } @@ -174,7 +174,7 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldPassDeleteCodebasebranch(t *tes res, err := r.Reconcile(context.Background(), req) assert.NoError(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileCodebaseBranch_Reconcile_ShouldPassWithCreatingCIS(t *testing.T) { @@ -254,7 +254,7 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldPassWithCreatingCIS(t *testing. res, err := r.Reconcile(context.TODO(), req) assert.NoError(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) cisTocehck, err := codebaseimagestream.GetCodebaseImageStreamByCodebaseBaseBranchName(context.Background(), fakeCl, cb.Name, cb.Namespace) require.NoError(t, err) @@ -331,8 +331,7 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldRequeueWithCodebaseNotReady(t * res, err := r.Reconcile(context.TODO(), req) assert.NoError(t, err) - assert.False(t, res.Requeue) - assert.Equal(t, res.RequeueAfter, 5*time.Second) + assert.Equal(t, 5*time.Second, res.RequeueAfter) gotCodebaseBranch := &codebaseApi.CodebaseBranch{} @@ -357,6 +356,7 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldInitBuildForEDPVersioning(t *te t.Parallel() namespace := "test-namespace" + version := "1.0.0" cb := &codebaseApi.CodebaseBranch{ ObjectMeta: metaV1.ObjectMeta{ Name: "NewCodebaseBranch", @@ -364,11 +364,16 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldInitBuildForEDPVersioning(t *te }, Spec: codebaseApi.CodebaseBranchSpec{ CodebaseName: "NewCodebase", + BranchName: "master", + Version: &version, Pipelines: map[string]string{ "review": "review-pipeline", "build": "build-pipeline", }, }, + Status: codebaseApi.CodebaseBranchStatus{ + Git: codebaseApi.CodebaseBranchGitStatusBranchCreated, + }, } c := &codebaseApi.Codebase{ ObjectMeta: metaV1.ObjectMeta{ @@ -380,13 +385,27 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldInitBuildForEDPVersioning(t *te Type: codebaseApi.VersioningTypeSemver, }, }, + Status: codebaseApi.CodebaseStatus{ + Available: true, + }, + } + config := &coreV1.ConfigMap{ + ObjectMeta: metaV1.ObjectMeta{ + Name: platform.KrciConfigMap, + Namespace: namespace, + }, + Data: map[string]string{ + platform.KrciConfigContainerRegistryHost: "stub-url", + platform.KrciConfigContainerRegistrySpace: "stub-space", + }, } scheme := runtime.NewScheme() - scheme.AddKnownTypes(codebaseApi.GroupVersion, c, cb) + require.NoError(t, codebaseApi.AddToScheme(scheme)) + require.NoError(t, coreV1.AddToScheme(scheme)) fakeCl := fake.NewClientBuilder(). WithScheme(scheme). - WithRuntimeObjects(c, cb). + WithObjects(c, cb, config). WithStatusSubresource(cb). Build() @@ -407,7 +426,7 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldInitBuildForEDPVersioning(t *te res, err := r.Reconcile(context.Background(), req) require.NoError(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) gotCodebaseBranch := codebaseApi.CodebaseBranch{} err = fakeCl.Get(context.Background(), types.NamespacedName{ @@ -473,7 +492,7 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldHaveFailStatus(t *testing.T) { res, err := r.Reconcile(context.Background(), req) assert.Error(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, 10*time.Second, res.RequeueAfter) br := &codebaseApi.CodebaseBranch{} @@ -543,7 +562,7 @@ func TestReconcileCodebaseBranch_Reconcile_ShouldSetPipelines(t *testing.T) { res, err := controller.Reconcile(context.Background(), req) require.NoError(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) updatedCb := &codebaseApi.CodebaseBranch{} err = fakeCl.Get( diff --git a/controllers/codebaseimagestream/codebaseimagestream_controller_test.go b/controllers/codebaseimagestream/codebaseimagestream_controller_test.go index 3d84e25a..28c334ea 100644 --- a/controllers/codebaseimagestream/codebaseimagestream_controller_test.go +++ b/controllers/codebaseimagestream/codebaseimagestream_controller_test.go @@ -4,6 +4,7 @@ import ( "context" "strings" "testing" + "time" "github.com/go-logr/logr" "github.com/stretchr/testify/assert" @@ -39,7 +40,7 @@ func TestReconcileCodebaseImageStream_Reconcile_ShouldPassNotFound(t *testing.T) res, err := r.Reconcile(context.TODO(), req) assert.NoError(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileCodebaseImageStream_Reconcile_ShouldFailNotFound(t *testing.T) { @@ -67,7 +68,7 @@ func TestReconcileCodebaseImageStream_Reconcile_ShouldFailNotFound(t *testing.T) t.Fatalf("wrong error returned: %s", err.Error()) } - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileCodebaseImageStream_Reconcile_ShouldPass(t *testing.T) { @@ -98,7 +99,7 @@ func TestReconcileCodebaseImageStream_Reconcile_ShouldPass(t *testing.T) { res, err := r.Reconcile(context.TODO(), req) assert.NoError(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileCodebaseImageStream_Reconcile_ShouldFail(t *testing.T) { @@ -132,7 +133,7 @@ func TestReconcileCodebaseImageStream_Reconcile_ShouldFail(t *testing.T) { res, err := r.Reconcile(context.TODO(), req) assert.Error(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) if !strings.Contains(err.Error(), "failed to handle NewCIS codebase image stream") { t.Fatalf("wrong error returned: %s", err.Error()) diff --git a/controllers/gitserver/gitserver_controller_test.go b/controllers/gitserver/gitserver_controller_test.go index ee9103a0..adc98f75 100644 --- a/controllers/gitserver/gitserver_controller_test.go +++ b/controllers/gitserver/gitserver_controller_test.go @@ -4,6 +4,7 @@ import ( "context" "strings" "testing" + "time" "github.com/go-logr/logr" "github.com/stretchr/testify/assert" @@ -43,7 +44,7 @@ func TestReconcileGitServer_Reconcile_ShouldPassNotFound(t *testing.T) { res, err := r.Reconcile(ctrl.LoggerInto(context.Background(), logr.Discard()), req) assert.NoError(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileGitServer_Reconcile_ShouldFailNotFound(t *testing.T) { @@ -69,7 +70,7 @@ func TestReconcileGitServer_Reconcile_ShouldFailNotFound(t *testing.T) { t.Fatalf("wrong error returned: %s", err.Error()) } - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileGitServer_Reconcile_ShouldFailToGetSecret(t *testing.T) { diff --git a/controllers/jiraissuemetadata/jiraissuemetadata_controller_test.go b/controllers/jiraissuemetadata/jiraissuemetadata_controller_test.go index 60c117d9..ab51ad89 100644 --- a/controllers/jiraissuemetadata/jiraissuemetadata_controller_test.go +++ b/controllers/jiraissuemetadata/jiraissuemetadata_controller_test.go @@ -44,7 +44,7 @@ func TestReconcileJiraIssueMetadata_Reconcile_ShouldPassNotFound(t *testing.T) { res, err := r.Reconcile(context.TODO(), req) assert.NoError(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileJiraIssueMetadata_Reconcile_ShouldFailNotFound(t *testing.T) { @@ -72,7 +72,7 @@ func TestReconcileJiraIssueMetadata_Reconcile_ShouldFailNotFound(t *testing.T) { t.Fatalf("wrong error returned: %s", err.Error()) } - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileJiraIssueMetadata_Reconcile_ShouldFailToSetOwnerReference(t *testing.T) { @@ -108,7 +108,7 @@ func TestReconcileJiraIssueMetadata_Reconcile_ShouldFailToSetOwnerReference(t *t t.Fatalf("wrong error returned: %s", err.Error()) } - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileJiraIssueMetadata_Reconcile_ShouldFailJiraISDisabled(t *testing.T) { @@ -158,7 +158,7 @@ func TestReconcileJiraIssueMetadata_Reconcile_ShouldFailJiraISDisabled(t *testin t.Fatalf("wrong error returned: %s", err.Error()) } - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileJiraIssueMetadata_Reconcile_ShouldFailGetJira(t *testing.T) { @@ -211,7 +211,7 @@ func TestReconcileJiraIssueMetadata_Reconcile_ShouldFailGetJira(t *testing.T) { t.Fatalf("wrong error returned: %s", err.Error()) } - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileJiraIssueMetadata_Reconcile_ShouldPassJiraFoundButUnavailable(t *testing.T) { @@ -324,7 +324,7 @@ func TestReconcileJiraIssueMetadata_Reconcile_ShouldFailInitJiraClient(t *testin res, err := r.Reconcile(context.TODO(), req) assert.Error(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) if !strings.Contains(err.Error(), "failed to get secret jira-sercret") { t.Fatalf("wrong error returned: %s", err.Error()) @@ -397,7 +397,7 @@ func TestReconcileJiraIssueMetadata_Reconcile_ShouldFailToCreateChain(t *testing res, err := r.Reconcile(context.TODO(), req) assert.Error(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) if !strings.Contains(err.Error(), "unexpected end of JSON input") { t.Fatalf("wrong error returned: %s", err.Error()) @@ -588,7 +588,6 @@ func TestReconcileJiraIssueMetadata_Reconcile_ShouldPass(t *testing.T) { rec, err := r.Reconcile(context.TODO(), req) assert.NoError(t, err) - assert.False(t, rec.Requeue) duration, err := time.ParseDuration(defaultReconcilePeriod + "m") if err != nil { diff --git a/controllers/jiraserver/jiraserver_controller_test.go b/controllers/jiraserver/jiraserver_controller_test.go index 9555ea6c..d03c9060 100644 --- a/controllers/jiraserver/jiraserver_controller_test.go +++ b/controllers/jiraserver/jiraserver_controller_test.go @@ -4,6 +4,7 @@ import ( "context" "strings" "testing" + "time" "github.com/andygrunwald/go-jira" "github.com/go-logr/logr" @@ -44,7 +45,7 @@ func TestReconcileJiraServer_Reconcile_ShouldPassNotFound(t *testing.T) { res, err := r.Reconcile(context.TODO(), req) assert.NoError(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileJiraServer_Reconcile_ShouldFailNotFound(t *testing.T) { @@ -73,7 +74,7 @@ func TestReconcileJiraServer_Reconcile_ShouldFailNotFound(t *testing.T) { t.Fatalf("wrong error returned: %s", err.Error()) } - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) } func TestReconcileJiraServer_Reconcile_ShouldFailInitJiraClientWithSecretNotFound(t *testing.T) { @@ -108,7 +109,7 @@ func TestReconcileJiraServer_Reconcile_ShouldFailInitJiraClientWithSecretNotFoun res, err := r.Reconcile(context.TODO(), req) assert.Error(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) if !strings.Contains(err.Error(), "failed to get secret jira-secret") { t.Fatalf("wrong error returned: %s", err.Error()) @@ -159,7 +160,7 @@ func TestReconcileJiraServer_Reconcile_ShouldFailToCreateNewJiraClient(t *testin res, err := r.Reconcile(context.TODO(), req) assert.Error(t, err) - assert.False(t, res.Requeue) + assert.Equal(t, time.Duration(0), res.RequeueAfter) if !strings.Contains(err.Error(), "failed to create Jira client") { t.Fatalf("wrong error returned: %s", err.Error()) @@ -221,7 +222,7 @@ func TestReconcileJiraServer_Reconcile_ShouldPass(t *testing.T) { res, err := r.Reconcile(context.TODO(), req) require.NoError(t, err) - require.False(t, res.Requeue) + require.Equal(t, time.Duration(0), res.RequeueAfter) jiraServer := &codebaseApi.JiraServer{} err = fakeCl.Get(context.Background(), types.NamespacedName{ diff --git a/deploy-templates/crds/v2.edp.epam.com_cdstagedeployments.yaml b/deploy-templates/crds/v2.edp.epam.com_cdstagedeployments.yaml index 5460e64e..24da9dc1 100644 --- a/deploy-templates/crds/v2.edp.epam.com_cdstagedeployments.yaml +++ b/deploy-templates/crds/v2.edp.epam.com_cdstagedeployments.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: cdstagedeployments.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/deploy-templates/crds/v2.edp.epam.com_codebasebranches.yaml b/deploy-templates/crds/v2.edp.epam.com_codebasebranches.yaml index 8c6cc87b..e5314455 100644 --- a/deploy-templates/crds/v2.edp.epam.com_codebasebranches.yaml +++ b/deploy-templates/crds/v2.edp.epam.com_codebasebranches.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: codebasebranches.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/deploy-templates/crds/v2.edp.epam.com_codebaseimagestreams.yaml b/deploy-templates/crds/v2.edp.epam.com_codebaseimagestreams.yaml index 6013aa39..601079f0 100644 --- a/deploy-templates/crds/v2.edp.epam.com_codebaseimagestreams.yaml +++ b/deploy-templates/crds/v2.edp.epam.com_codebaseimagestreams.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: codebaseimagestreams.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/deploy-templates/crds/v2.edp.epam.com_codebases.yaml b/deploy-templates/crds/v2.edp.epam.com_codebases.yaml index 1ad2996b..bf56fb48 100644 --- a/deploy-templates/crds/v2.edp.epam.com_codebases.yaml +++ b/deploy-templates/crds/v2.edp.epam.com_codebases.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: codebases.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/deploy-templates/crds/v2.edp.epam.com_gitservers.yaml b/deploy-templates/crds/v2.edp.epam.com_gitservers.yaml index 7fba3638..18d40313 100644 --- a/deploy-templates/crds/v2.edp.epam.com_gitservers.yaml +++ b/deploy-templates/crds/v2.edp.epam.com_gitservers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: gitservers.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/deploy-templates/crds/v2.edp.epam.com_jiraissuemetadatas.yaml b/deploy-templates/crds/v2.edp.epam.com_jiraissuemetadatas.yaml index 7995b3bc..2c5f80f4 100644 --- a/deploy-templates/crds/v2.edp.epam.com_jiraissuemetadatas.yaml +++ b/deploy-templates/crds/v2.edp.epam.com_jiraissuemetadatas.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: jiraissuemetadatas.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/deploy-templates/crds/v2.edp.epam.com_jiraservers.yaml b/deploy-templates/crds/v2.edp.epam.com_jiraservers.yaml index 327eac70..6dab51f8 100644 --- a/deploy-templates/crds/v2.edp.epam.com_jiraservers.yaml +++ b/deploy-templates/crds/v2.edp.epam.com_jiraservers.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: jiraservers.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/deploy-templates/crds/v2.edp.epam.com_quicklinks.yaml b/deploy-templates/crds/v2.edp.epam.com_quicklinks.yaml index df5e8f9e..b8dd944b 100644 --- a/deploy-templates/crds/v2.edp.epam.com_quicklinks.yaml +++ b/deploy-templates/crds/v2.edp.epam.com_quicklinks.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: quicklinks.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/deploy-templates/crds/v2.edp.epam.com_templates.yaml b/deploy-templates/crds/v2.edp.epam.com_templates.yaml index 8339350a..586f453e 100644 --- a/deploy-templates/crds/v2.edp.epam.com_templates.yaml +++ b/deploy-templates/crds/v2.edp.epam.com_templates.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.18.0 name: templates.v2.edp.epam.com spec: group: v2.edp.epam.com diff --git a/go.mod b/go.mod index 806ae698..1e5a4dca 100644 --- a/go.mod +++ b/go.mod @@ -2,62 +2,62 @@ module github.com/epam/edp-codebase-operator/v2 go 1.24.0 -replace ( - github.com/kubernetes-incubator/reference-docs => github.com/kubernetes-sigs/reference-docs v0.0.0-20170929004150-fcf65347b256 - github.com/markbates/inflect => github.com/markbates/inflect v1.0.4 - github.com/openshift/api => github.com/openshift/api v0.0.0-20231118005202-0f638a8a4705 -) +replace github.com/openshift/api => github.com/openshift/api v0.0.0-20260107143020-50517c6f4bfd require ( - github.com/andygrunwald/go-jira v1.16.0 + github.com/andygrunwald/go-jira v1.17.0 github.com/cespare/xxhash/v2 v2.3.0 - github.com/epam/edp-cd-pipeline-operator/v2 v2.25.1 + github.com/epam/edp-cd-pipeline-operator/v2 v2.26.0 github.com/epam/edp-common v0.0.0-20230710145648-344bbce4120e - github.com/go-git/go-git/v5 v5.16.2 - github.com/go-logr/logr v1.4.2 - github.com/go-resty/resty/v2 v2.16.5 - github.com/jarcoal/httpmock v1.4.0 - github.com/oapi-codegen/runtime v1.1.1 + github.com/go-git/go-git/v5 v5.16.4 + github.com/go-logr/logr v1.4.3 + github.com/go-resty/resty/v2 v2.17.1 + github.com/jarcoal/httpmock v1.4.1 + github.com/oapi-codegen/runtime v1.1.2 github.com/onsi/ginkgo/v2 v2.23.4 github.com/onsi/gomega v1.37.0 github.com/openshift/api v3.9.0+incompatible - github.com/stretchr/testify v1.10.0 - github.com/tektoncd/pipeline v0.70.0 - github.com/tektoncd/triggers v0.31.0 - golang.org/x/crypto v0.45.0 - k8s.io/api v0.31.6 - k8s.io/apimachinery v0.31.6 - k8s.io/client-go v0.31.6 - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - knative.dev/pkg v0.0.0-20250117084104-c43477f0052b - sigs.k8s.io/controller-runtime v0.19.7 + github.com/stretchr/testify v1.11.1 + github.com/tektoncd/pipeline v1.6.0 + github.com/tektoncd/triggers v0.34.0 + golang.org/x/crypto v0.47.0 + k8s.io/api v0.33.7 + k8s.io/apimachinery v0.33.7 + k8s.io/client-go v0.33.7 + k8s.io/utils v0.0.0-20241210054802-24370beab758 + knative.dev/pkg v0.0.0-20250415155312-ed3e2158b883 + sigs.k8s.io/controller-runtime v0.21.0 ) require ( - cel.dev/expr v0.19.1 // indirect + cel.dev/expr v0.24.0 // indirect contrib.go.opencensus.io/exporter/ocagent v0.7.1-0.20200907061046-05415f1de66d // indirect contrib.go.opencensus.io/exporter/prometheus v0.4.2 // indirect - dario.cat/mergo v1.0.0 // indirect + dario.cat/mergo v1.0.1 // indirect github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.1.6 // indirect github.com/antlr4-go/antlr/v4 v4.13.0 // indirect github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/semver/v4 v4.0.0 // indirect github.com/blendle/zapdriver v1.3.1 // indirect + github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect github.com/cloudflare/circl v1.6.1 // indirect github.com/cyphar/filepath-securejoin v0.4.1 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/emicklei/go-restful/v3 v3.12.1 // indirect github.com/emirpasic/gods v1.18.1 // indirect - github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/evanphx/json-patch/v5 v5.9.11 // indirect github.com/fatih/structs v1.1.0 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/fxamacker/cbor/v2 v2.7.0 // indirect github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect github.com/go-git/go-billy/v5 v5.6.2 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // 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.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect @@ -67,75 +67,88 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.2 // indirect github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/google/cel-go v0.24.1 // indirect - github.com/google/gnostic-models v0.6.8 // indirect + github.com/google/btree v1.1.3 // indirect + github.com/google/cel-go v0.26.1 // indirect + github.com/google/gnostic-models v0.6.9 // indirect github.com/google/go-cmp v0.7.0 // indirect github.com/google/go-querystring v1.1.0 // indirect - github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect - github.com/hashicorp/errwrap v1.1.0 // indirect - github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect - github.com/imdario/mergo v0.3.16 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/kelseyhightower/envconfig v1.4.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect - github.com/mailru/easyjson v0.7.7 // indirect + github.com/mailru/easyjson v0.9.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/pjbgf/sha1cd v0.3.2 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_golang v1.19.1 // 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/prometheus/client_golang v1.23.2 // indirect + github.com/prometheus/client_model v0.6.2 // indirect + github.com/prometheus/common v0.66.1 // indirect + github.com/prometheus/procfs v0.17.0 // indirect github.com/prometheus/statsd_exporter v0.22.7 // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/skeema/knownhosts v1.3.1 // indirect - github.com/spf13/pflag v1.0.5 // indirect - github.com/stoewer/go-strcase v1.2.0 // indirect + github.com/spf13/cobra v1.10.1 // indirect + github.com/spf13/pflag v1.0.10 // indirect + github.com/stoewer/go-strcase v1.3.0 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tidwall/gjson v1.14.4 // indirect github.com/trivago/tgo v1.0.7 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect + go.opentelemetry.io/otel v1.38.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect + go.opentelemetry.io/otel/metric v1.38.0 // indirect + go.opentelemetry.io/otel/sdk v1.37.0 // indirect + go.opentelemetry.io/otel/trace v1.38.0 // indirect + go.opentelemetry.io/proto/otlp v1.7.0 // indirect go.uber.org/automaxprocs v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa // indirect - golang.org/x/net v0.47.0 // indirect - golang.org/x/oauth2 v0.27.0 // indirect - golang.org/x/sync v0.18.0 // indirect - golang.org/x/sys v0.38.0 // indirect - golang.org/x/term v0.37.0 // indirect - golang.org/x/text v0.31.0 // indirect - golang.org/x/time v0.9.0 // indirect - golang.org/x/tools v0.38.0 // indirect + go.yaml.in/yaml/v2 v2.4.2 // indirect + golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect + golang.org/x/net v0.48.0 // indirect + golang.org/x/oauth2 v0.32.0 // indirect + golang.org/x/sync v0.19.0 // indirect + golang.org/x/sys v0.40.0 // indirect + golang.org/x/term v0.39.0 // indirect + golang.org/x/text v0.33.0 // indirect + golang.org/x/time v0.12.0 // indirect + golang.org/x/tools v0.40.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect - gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect - google.golang.org/api v0.217.0 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect - google.golang.org/grpc v1.70.0 // indirect - google.golang.org/protobuf v1.36.5 // indirect + gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect + google.golang.org/api v0.233.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect + google.golang.org/grpc v1.76.0 // indirect + google.golang.org/protobuf v1.36.10 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.31.4 // indirect + k8s.io/apiextensions-apiserver v0.33.5 // indirect + k8s.io/apiserver v0.33.5 // indirect + k8s.io/component-base v0.33.5 // indirect k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 // indirect + k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect knative.dev/eventing v0.30.3 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect - sigs.k8s.io/yaml v1.4.0 // indirect + sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect + sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect + sigs.k8s.io/randfill v1.0.0 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect + sigs.k8s.io/yaml v1.6.0 // indirect ) diff --git a/go.sum b/go.sum index e35f7626..7a77dd6b 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cel.dev/expr v0.19.1 h1:NciYrtDRIR0lNCnH1LFJegdjspNx9fI59O7TWcua/W4= -cel.dev/expr v0.19.1/go.mod h1:MrpN08Q+lEBs+bGYdLxxHkZoUSsCp0nSKTs0nTymJgw= +cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY= +cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -53,8 +53,8 @@ contrib.go.opencensus.io/exporter/prometheus v0.4.0/go.mod h1:o7cosnyfuPVK0tB8q0 contrib.go.opencensus.io/exporter/prometheus v0.4.2 h1:sqfsYl5GIY/L570iT+l93ehxaWJs2/OwXtiWwew3oAg= contrib.go.opencensus.io/exporter/prometheus v0.4.2/go.mod h1:dvEHbiKmgvbr5pjaF9fpw1KeYcjrnC1J8B+JKjsZyRQ= contrib.go.opencensus.io/exporter/zipkin v0.1.2/go.mod h1:mP5xM3rrgOjpn79MM8fZbj3gsxcuytSqtH0dxSWW1RE= -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= github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= @@ -92,8 +92,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= -github.com/andygrunwald/go-jira v1.16.0 h1:PU7C7Fkk5L96JvPc6vDVIrd99vdPnYudHu4ju2c2ikQ= -github.com/andygrunwald/go-jira v1.16.0/go.mod h1:UQH4IBVxIYWbgagc0LF/k9FRs9xjIiQ8hIcC6HfLwFU= +github.com/andygrunwald/go-jira v1.17.0 h1:bbu5H676l6MaNcV6A7VDIAjIOQVgzNGEhNAwNI/Cjgo= +github.com/andygrunwald/go-jira v1.17.0/go.mod h1:tiZsPUu9824bwcI2BUXatE4hJbs9rUOif0nv1lkq1hQ= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -118,12 +118,15 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= +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/blendle/zapdriver v1.3.1 h1:C3dydBOWYRiOk+B8X9IVZ5IOe+7cl+tGOexN4QqHfpE= github.com/blendle/zapdriver v1.3.1/go.mod h1:mdXfREi6u5MArG4j9fewC+FGnXaBR+T4Ox4J2u4eHCc= github.com/bmatcuk/doublestar v1.1.1/go.mod h1:UD6OnuiIn0yFxxA2le/rnRU1G4RaI4UvFv1sNto9p6w= github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= github.com/c2h5oh/datasize v0.0.0-20171227191756-4eba002a5eae/go.mod h1:S/7n9copUssQ56c7aAgHqftWO4LTf4xY6CGWt8Bc+3M= +github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8= +github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1 h1:iKLQ0xPNFxR/2hzXZMrBo8f1j86j5WHzznCCQxV/b8g= @@ -144,8 +147,8 @@ github.com/cloudevents/sdk-go/observability/opencensus/v2 v2.4.1/go.mod h1:lhEpx github.com/cloudevents/sdk-go/sql/v2 v2.8.0/go.mod h1:u9acNJbhmi1wnDJro4PEAqbr4N1LTCyEUClErxbPS1A= github.com/cloudevents/sdk-go/v2 v2.4.1/go.mod h1:MZiMwmAh5tGj+fPFvtHv9hKurKqXtdB9haJYMJ/7GJY= github.com/cloudevents/sdk-go/v2 v2.8.0/go.mod h1:GpCBmUj7DIRiDhVvsK5d6WCbgTWs8DxAWTRtAwQmIXs= -github.com/cloudevents/sdk-go/v2 v2.15.2 h1:54+I5xQEnI73RBhWHxbI1XJcqOFOVJN85vb41+8mHUc= -github.com/cloudevents/sdk-go/v2 v2.15.2/go.mod h1:lL7kSWAE/V8VI4Wh0jbL2v/jvqsm6tjmaQBSvxcv4uE= +github.com/cloudevents/sdk-go/v2 v2.16.2 h1:ZYDFrYke4FD+jM8TZTJJO6JhKHzOQl2oqpFK1D+NnQM= +github.com/cloudevents/sdk-go/v2 v2.16.2/go.mod h1:laOcGImm4nVJEU+PHnUrKL56CKmRL65RlQF0kRmW/kg= github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0= github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= @@ -172,6 +175,7 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.4.1 h1:JyxxyPEaktOD+GAnqIqTf9A8tHyAG22rowi7HkoSU1s= @@ -211,8 +215,8 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.m github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/epam/edp-cd-pipeline-operator/v2 v2.25.1 h1:k1qBj3rf7G4JLVFlYBQslaiC/ofB15VZRk4e4HJbDiY= -github.com/epam/edp-cd-pipeline-operator/v2 v2.25.1/go.mod h1:vk4iGPmD0jmjLpywzrBtMz87AZLSkE51mPt6FI7i9rM= +github.com/epam/edp-cd-pipeline-operator/v2 v2.26.0 h1:ykvE2eAh7tacXNJrUm08om16zV3Z9FuicFZsLH8NZyM= +github.com/epam/edp-cd-pipeline-operator/v2 v2.26.0/go.mod h1:nIXTzr9Yo12KQ3Xbs6ZqWQxw2l8KEJlxq+lZTy844X0= github.com/epam/edp-common v0.0.0-20230710145648-344bbce4120e h1:cr/PBxX6OCbfETuIOkl9MbkJoJZhltUJS0dNBioqmHU= github.com/epam/edp-common v0.0.0-20230710145648-344bbce4120e/go.mod h1:0SJsges/ohFjnJ5W59QpuQtkEzlOngYXULajmfnM6rw= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= @@ -221,20 +225,22 @@ github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL 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.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= -github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= -github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/evanphx/json-patch/v5 v5.9.11 h1:/8HVnzMq13/3x9TPvjG08wUGqBTmZBsCWzjTM0wiaDU= +github.com/evanphx/json-patch/v5 v5.9.11/go.mod h1:3j+LviiESTElxA4p3EMKAB9HXj3/XEtnUf6OZxqIQTM= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/structs v1.1.0 h1:Q7juDM0QtcnhCpeyLGQKyg4TOIghuNXrkL32pHAUMxo= github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= +github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -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/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= +github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= @@ -248,8 +254,8 @@ github.com/go-git/go-billy/v5 v5.6.2 h1:6Q86EsPXMa7c3YZ3aLAQsMA0VlWmy43r6FHqa/UN github.com/go-git/go-billy/v5 v5.6.2/go.mod h1:rcFC2rAsp/erv7CMz9GczHcuD0D32fWzH+MJAU+jaUU= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4= github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII= -github.com/go-git/go-git/v5 v5.16.2 h1:fT6ZIOjE5iEnkzKyxTHK1W4HGAsPhqEqiSAssSO77hM= -github.com/go-git/go-git/v5 v5.16.2/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8= +github.com/go-git/go-git/v5 v5.16.4 h1:7ajIEZHZJULcyJebDLo99bGgS0jRrOxzZG4uCk2Yb2Y= +github.com/go-git/go-git/v5 v5.16.4/go.mod h1:4Ge4alE/5gPs30F2H1esi2gPd69R0C39lolkucHBOp8= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -269,8 +275,8 @@ github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTg github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -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/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/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= @@ -292,8 +298,8 @@ github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/ github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= 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-resty/resty/v2 v2.16.5 h1:hBKqmWrr7uRc3euHVqmh1HTHcKn99Smr7o5spptdhTM= -github.com/go-resty/resty/v2 v2.16.5/go.mod h1:hkJtXbA2iKHzJheXYvQ8snQES5ZLGKMwQ07xAwp/fiA= +github.com/go-resty/resty/v2 v2.17.1 h1:x3aMpHK1YM9e4va/TMDRlusDDoZiQ+ViDu/WpA6xTM4= +github.com/go-resty/resty/v2 v2.17.1/go.mod h1:kCKZ3wWmwJaNc7S29BRtUhJwy7iqmn+2mLtQrOyQlVA= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= @@ -307,7 +313,6 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v4 v4.4.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI= github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -361,10 +366,12 @@ github.com/gonum/stat v0.0.0-20181125101827-41a0da705a5b/go.mod h1:Z4GIJBJO3Wa4g github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.24.1 h1:jsBCtxG8mM5wiUJDSGUqU0K7Mtr3w7Eyv00rw4DiZxI= -github.com/google/cel-go v0.24.1/go.mod h1:Hdf9TqOaTNSFQA1ybQaRqATVoK7m/zcf7IMhGXP5zI8= -github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I= -github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U= +github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg= +github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4= +github.com/google/cel-go v0.26.1 h1:iPbVVEdkhTX++hpe3lzSk7D3G3QSYqLGoHOcEio+UXQ= +github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM= +github.com/google/gnostic-models v0.6.9 h1:MU/8wDLif2qCXZmzncUQ/BOfxWfthHi63KqpoNbWqVw= +github.com/google/gnostic-models v0.6.9/go.mod h1:CiWsm0s6BSQd1hRn8/QmxqB6BesYcbSZxsz9b0KuDBw= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -381,8 +388,8 @@ github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= -github.com/google/go-containerregistry v0.20.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo= -github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8= +github.com/google/go-containerregistry v0.20.6 h1:cvWX87UxxLgaH76b4hIvya6Dzz9qHB31qAwjAohdSTU= +github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y= github.com/google/go-github/v27 v27.0.6/go.mod h1:/0Gr8pJ55COkmv+S/yPKCczSkUPIM/LnFyubufRNIS0= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= @@ -439,20 +446,16 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= 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= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= -github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= github.com/hashicorp/go-retryablehttp v0.6.7/go.mod h1:vAew36LZh98gCBJNLH42IQ1ER/9wtLZZ8meHqQvEYWY= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= @@ -477,13 +480,13 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1: github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -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.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/tdigest v0.0.0-20180711151920-a7d76c6f093a/go.mod h1:9GkyshztGufsdPQWjH+ifgnIr3xNUL5syI70g2dzU1o= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= -github.com/jarcoal/httpmock v1.4.0 h1:BvhqnH0JAYbNudL2GMJKgOHe2CtKlzJ/5rWKyp+hc2k= -github.com/jarcoal/httpmock v1.4.0/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0= +github.com/jarcoal/httpmock v1.4.1 h1:0Ju+VCFuARfFlhVXFc2HxlcQkfB+Xq12/EotHko+x2A= +github.com/jarcoal/httpmock v1.4.1/go.mod h1:ftW1xULwo+j0R0JJkJIIi7UKigZUXCLLanykgjwBXL0= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= github.com/jcmturner/aescts/v2 v2.0.0/go.mod h1:AiaICIRyfYg35RUkr8yESTqvSy7csK90qZ5xfvvsoNs= @@ -518,6 +521,8 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL 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.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -530,6 +535,8 @@ 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/lightstep/tracecontext.go v0.0.0-20181129014701-1757c391b1ac/go.mod h1:Frd2bnT3w5FB5q49ENTfVlztJES+1k/7lyWX2+9gq/M= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -539,8 +546,9 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= +github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4= +github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= @@ -576,8 +584,8 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro= -github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= +github.com/oapi-codegen/runtime v1.1.2 h1:P2+CubHq8fO4Q6fV1tqDBZHCwpVpvPg7oKiYzQgXIyI= +github.com/oapi-codegen/runtime v1.1.2/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -601,8 +609,8 @@ github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y= github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0= 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/openshift/api v0.0.0-20231118005202-0f638a8a4705 h1:GwpCt0VhL9GjVGJhdF+96RoUkGTf/d+7ICL/3jKWRkA= -github.com/openshift/api v0.0.0-20231118005202-0f638a8a4705/go.mod h1:ctXNyWanKEjGj8sss1KjjHQ3ENKFm33FFnS5BKaIPh4= +github.com/openshift/api v0.0.0-20260107143020-50517c6f4bfd h1:PM4lWhDEE90mjP9dAYGWGs25mhKhjv3BrRGdqKdz8NA= +github.com/openshift/api v0.0.0-20260107143020-50517c6f4bfd/go.mod h1:SPLf21TYPipzCO67BURkCfK6dcIIxx0oNRVWaOyRcXM= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.3.0/go.mod h1:4c3sLeE8xjNqehmF5RpAFLPLJxXscc0R4l6Zg0P1tTQ= @@ -637,14 +645,14 @@ github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqr github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_golang v1.13.0/go.mod h1:vTeo+zgvILHsnnj/39Ou/1fPN5nJFOEMgftOUOmlvYQ= -github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE= -github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho= +github.com/prometheus/client_golang v1.23.2 h1:Je96obch5RDVy3FDMndoUsjAhG5Edi49h0RJWRi/o0o= +github.com/prometheus/client_golang v1.23.2/go.mod h1:Tb1a6LWHB3/SPIzCoaDXI4I8UHKeFTEQ1YCr+0Gyqmg= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/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/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk= +github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= @@ -654,8 +662,8 @@ github.com/prometheus/common v0.28.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+ github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.35.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= -github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs= +github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= @@ -663,8 +671,8 @@ github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -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/prometheus/procfs v0.17.0 h1:FuLQ+05u4ZI+SS/w9+BWEM2TXiHKsUQ9TADiRH7DuK0= +github.com/prometheus/procfs v0.17.0/go.mod h1:oPQLaDAMRbA+u8H5Pbfq+dl3VDAvHxMUOVhe0wYB2zw= github.com/prometheus/statsd_exporter v0.21.0/go.mod h1:rbT83sZq2V+p73lHhPZfMc3MLCHmSHelCh9hSGYNLTQ= github.com/prometheus/statsd_exporter v0.22.7 h1:7Pji/i2GuhK6Lu7DHrtTkFmNBCudCPT1pX2CziuyQR0= github.com/prometheus/statsd_exporter v0.22.7/go.mod h1:N/TevpjkIh9ccs6nuzY3jQn9dFqnUakOjnEuMPJJJnI= @@ -682,6 +690,7 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= @@ -706,17 +715,22 @@ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= +github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s= +github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.10 h1:4EBh2KAYBwaONj6b2Ye1GiHfwjqyROoF4RwYO+vPwFk= +github.com/spf13/pflag v1.0.10/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spkg/bom v0.0.0-20160624110644-59b7046e48ad/go.mod h1:qLr4V1qq6nMqFKkMo8ZTx3f+BZEkzsRUY10Xsm2mwU0= github.com/sqs/goreturns v0.0.0-20181028201513-538ac6014518/go.mod h1:CKI4AZ4XmGV240rTHfO0hfE83S6/a3/Q1siZJ/vXf7A= -github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs= +github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/quantile v0.0.0-20150917103942-b0c588724d25/go.mod h1:lbP8tGiBjZ5YWIc2fzuRpTaz0b/53vT6PEs3QuAWzuU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -734,14 +748,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.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/stvp/go-udp-testing v0.0.0-20201019212854-469649b16807/go.mod h1:7jxmlfBCDBXRzr0eAQJ48XC1hBu1np4CS5+cHEYfwpc= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tektoncd/pipeline v0.70.0 h1:aJHIGuevkyLIVW0J1LEXSE6BQ+BYRs896sQGNSW4Xfs= -github.com/tektoncd/pipeline v0.70.0/go.mod h1:sfoEd7VHC6w6PHhI7TD+6tLa7UuUO7FUC4CNHLMFlMw= -github.com/tektoncd/triggers v0.31.0 h1:UiOn9sjavdJDEoAT+FZf+L3I1QQvzI31oJm8+GpNa7s= -github.com/tektoncd/triggers v0.31.0/go.mod h1:Oi+Umveu/vIefYAeS6XOa907tecAvx26sW7J62005tg= +github.com/tektoncd/pipeline v1.6.0 h1:A+D+jzOVl2QNl/yiNT7csVgBUy2wpz6K6+/D4q5lfss= +github.com/tektoncd/pipeline v1.6.0/go.mod h1:5SNoYgRYPQopkv7ApVq5GO3JqPk2AjV+VMMjwBsbJOg= +github.com/tektoncd/triggers v0.34.0 h1:CuhG1moThPGEMlxPUcoBDDplJ3FAczzF8MMAjGScRY0= +github.com/tektoncd/triggers v0.34.0/go.mod h1:iHqwCaS2ElaWt2RuxCbrHNd5lMfRzPxihqEEygkVn1w= github.com/tidwall/gjson v1.14.4 h1:uo0p8EbA09J7RQaflQ1aBRffTR7xedD2bcIVSYxLnkM= github.com/tidwall/gjson v1.14.4/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= @@ -798,25 +812,33 @@ go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 h1:F7Jx+6hwnZ41NSFTO5q4LYDtJRXBf2PD0rNBkeB/lus= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0/go.mod h1:UHB22Z8QsdRDrnAtX4PntOl36ajSxcdUMt1sF7Y6E7Q= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= -go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY= -go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI= +go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= +go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0 h1:Ahq7pZmv87yiyn3jeFz/LekZmPLLdKejuO3NcK9MssM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.37.0/go.mod h1:MJTqhM0im3mRLw1i8uGHnCvUEeS7VwRyxlLC78PA18M= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 h1:5pojmb1U1AogINhN3SurB+zm/nIcusopeBNp42f45QM= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0/go.mod h1:57gTHJSE5S1tqg+EKsLPlTWhpHMsWlVmer+LA926XiA= go.opentelemetry.io/otel/metric v0.20.0/go.mod h1:598I5tYlH1vzBjn+BTuhzTCSb/9debfNp6R3s7Pr1eU= -go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ= -go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE= +go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= +go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= go.opentelemetry.io/otel/oteltest v0.20.0/go.mod h1:L7bgKf9ZB7qCwT9Up7i9/pn0PWIa9FqQ2IQ8LoxiGnw= go.opentelemetry.io/otel/sdk v0.20.0/go.mod h1:g/IcepuwNsoiX5Byy2nNV0ySUF1em498m7hBWC279Yc= -go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A= -go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU= +go.opentelemetry.io/otel/sdk v1.37.0 h1:ItB0QUqnjesGRvNcmAcU0LyvkVyGJ2xftD29bWdDvKI= +go.opentelemetry.io/otel/sdk v1.37.0/go.mod h1:VredYzxUvuo2q3WRcDnKDjbdvmO0sCzOvVAiY+yUkAg= go.opentelemetry.io/otel/sdk/export/metric v0.20.0/go.mod h1:h7RBNMsDJ5pmI1zExLi+bJK+Dr8NQCh0qGhm1KDnNlE= go.opentelemetry.io/otel/sdk/metric v0.20.0/go.mod h1:knxiS8Xd4E/N+ZqKmUPf3gTTZ4/0TjTXukfxjzSTpHE= -go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiyYCU9snn1CU= -go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ= +go.opentelemetry.io/otel/sdk/metric v1.37.0 h1:90lI228XrB9jCMuSdA0673aubgRobVZFhbjxHHspCPc= +go.opentelemetry.io/otel/sdk/metric v1.37.0/go.mod h1:cNen4ZWfiD37l5NhS+Keb5RXVWZWpRE+9WyVCpbo5ps= go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16gUEi0Nf1iBdgw= -go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k= -go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE= +go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= +go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os= +go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= @@ -836,6 +858,10 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= +go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= +go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= +go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -851,8 +877,8 @@ golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWP golang.org/x/crypto v0.0.0-20210920023735-84f357641f63/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q= -golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4= +golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8= +golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= 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= @@ -864,8 +890,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-20240808152545-0cdaa3abc0fa h1:ELnwvuAXPNtPk1TJRuGkI9fDTwym6AYBu0qzT8AcHdI= -golang.org/x/exp v0.0.0-20240808152545-0cdaa3abc0fa/go.mod h1:akd2r19cwCdwSwWeIdzYQGa/EZZyqcOdwWiwj5L5eKQ= +golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo7yrN4mVcnkHDYz5vvs= +golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo= 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= @@ -892,8 +918,8 @@ golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= -golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA= -golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w= +golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI= +golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg= 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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -947,8 +973,8 @@ golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= -golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= +golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU= +golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY= 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= @@ -967,8 +993,8 @@ golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M= -golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8= +golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY= +golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA= 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= @@ -981,8 +1007,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I= -golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4= +golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1058,18 +1084,17 @@ golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/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-20220708085239-5a0f0661e09d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= -golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= +golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU= -golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254= +golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY= +golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww= 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= @@ -1079,15 +1104,15 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= -golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM= +golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= +golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= 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.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY= -golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE= +golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1154,8 +1179,8 @@ golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ= -golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs= +golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA= +golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc= 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= @@ -1163,9 +1188,11 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU= golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= -gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= -gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= +gomodules.xyz/jsonpatch/v2 v2.5.0 h1:JELs8RLM12qJGXU4u/TO3V25KW8GreMKl9pdkk14RM0= +gomodules.xyz/jsonpatch/v2 v2.5.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= +gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk= +gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E= gonum.org/v1/netlib v0.0.0-20181029234149-ec6d1f5cefe6/go.mod h1:wa6Ws7BG/ESfp6dHfk7C6KdzKA7wR7u/rKwOGE66zvw= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= @@ -1199,8 +1226,8 @@ google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqiv google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= google.golang.org/api v0.58.0/go.mod h1:cAbP2FsxoGVNwtgNAmmn3y5G1TWAiVYRmg4yku3lv+E= google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.217.0 h1:GYrUtD289o4zl1AhiTZL0jvQGa2RDLyC+kX1N/lfGOU= -google.golang.org/api v0.217.0/go.mod h1:qMc2E8cBAbQlRypBTBWHklNJlaZZJBwDv81B1Iu8oSI= +google.golang.org/api v0.233.0 h1:iGZfjXAJiUFSSaekVB7LzXl6tRfEKhUN7FkZN++07tI= +google.golang.org/api v0.233.0/go.mod h1:TCIVLLlcwunlMpZIhIp7Ltk77W+vUSdUKAAIlbxY44c= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1271,10 +1298,10 @@ google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ6 google.golang.org/genproto v0.0.0-20211016002631-37fc39342514/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1:gap6+3Gk41EItBuyi4XX/bp4oqJ3UwuIMl25yGinuAA= -google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI= -google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50= +google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5 h1:BIRfGDEjiHRrk0QKZe3Xv2ieMhtgRGeLcZQ0mIVn4EY= +google.golang.org/genproto/googleapis/api v0.0.0-20250825161204-c5933d9347a5/go.mod h1:j3QtIyytwqGr1JUDtYXwtMXWPKsEa5LtzIFN1Wn5WvE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 h1:eaY8u2EuxbRv7c3NiGK0/NedzVsCcV6hDuU5qPX5EGE= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5/go.mod h1:M4/wBTSeyLxupu3W3tJtOgB14jILAS/XWPSSa3TAlJc= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1303,8 +1330,8 @@ google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnD google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= -google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ= -google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw= +google.golang.org/grpc v1.76.0 h1:UnVkv1+uMLYXoIz6o7chp59WfQUYA2ex/BXQ9rHZu7A= +google.golang.org/grpc v1.76.0/go.mod h1:Ju12QI8M6iQJtbcsV+awF5a4hfJMLi4X0JLo94ULZ6c= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1321,8 +1348,8 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM= -google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= +google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= 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= @@ -1368,21 +1395,25 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt 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.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs= -k8s.io/api v0.31.6 h1:ocWG/UhC9Mqp5oEfYWy9wCddbZiZyBAFTlBt0LVlhDg= -k8s.io/api v0.31.6/go.mod h1:i16xSiKMgVIVhsJMxfWq0mJbXA+Z7KhjPgYmwT41hl4= +k8s.io/api v0.33.7 h1:Koh06KurzmXwCwe/DOaIiM1A8vEXTZ6B1tTDnmLLfxw= +k8s.io/api v0.33.7/go.mod h1:pu6qwFzTj0ijPbNYAbMgLFDEWgLFu2VUB6PVvQNtswc= k8s.io/apiextensions-apiserver v0.22.5/go.mod h1:tIXeZ0BrDxUb1PoAz+tgOz43Zi1Bp4BEEqVtUccMJbE= -k8s.io/apiextensions-apiserver v0.31.4 h1:FxbqzSvy92Ca9DIs5jqot883G0Ln/PGXfm/07t39LS0= -k8s.io/apiextensions-apiserver v0.31.4/go.mod h1:hIW9YU8UsqZqIWGG99/gsdIU0Ar45Qd3A12QOe/rvpg= +k8s.io/apiextensions-apiserver v0.33.5 h1:93NZh6rmrcamX/tfv/dZrTsMiQX69ufANmDcKPEgSeA= +k8s.io/apiextensions-apiserver v0.33.5/go.mod h1:JIbyQnNlu6nQa7b1vgFi51pmlXOk8mdn0WJwUJnz/7U= k8s.io/apimachinery v0.19.7/go.mod h1:6sRbGRAVY5DOCuZwB5XkqguBqpqLU6q/kOaOdk29z6Q= k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U= -k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY= -k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/apimachinery v0.33.7 h1:f1kF3V+Stdr+2IGB8QhrfZ6J9JkXF6e1gWX2wKP5slU= +k8s.io/apimachinery v0.33.7/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= k8s.io/apiserver v0.22.5/go.mod h1:s2WbtgZAkTKt679sYtSudEQrTGWUSQAPe6MupLnlmaQ= +k8s.io/apiserver v0.33.5 h1:X1Gy33r4YkRLRqTjGjofk7X1/EjSLEVSJ/A+1qjoj60= +k8s.io/apiserver v0.33.5/go.mod h1:Q+b5Btbc8x0PqOCeh/xBTesKk+cXQRN+PF2wdrTKDeg= k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y= -k8s.io/client-go v0.31.6 h1:51HT40qVIZ13BrHKeWxFuU52uoPnFhxTYJnv4+LTgp4= -k8s.io/client-go v0.31.6/go.mod h1:MEq7JQJelUQ0/4fMoPEUrc/OOFyGo/9LmGA38H6O6xY= +k8s.io/client-go v0.33.7 h1:sEcU4syZnbwaiGDctJE6G/IKsuays3wjEWGuyrD7M8c= +k8s.io/client-go v0.33.7/go.mod h1:0MEM10zY5dGdc3FdkyNCTKXiTr8P+2Vj65njzvE0Vhw= k8s.io/code-generator v0.22.5/go.mod h1:sbdWCOVob+KaQ5O7xs8PNNaCTpbWVqNgA6EPwLOmRNk= k8s.io/component-base v0.22.5/go.mod h1:VK3I+TjuF9eaa+Ln67dKxhGar5ynVbwnGrUiNF4MqCI= +k8s.io/component-base v0.33.5 h1:4D3kxjEx1pJRy3WHAZsmX3+LCpmd4ftE+2J4v6naTnQ= +k8s.io/component-base v0.33.5/go.mod h1:Zma1YjBVuuGxIbspj1vGR3/5blzo2ARf1v0QTtog1to= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20201203183100-97869a43a9d9/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= @@ -1397,12 +1428,12 @@ 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-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20211109043538-20434351676c/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= -k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8 h1:1Wof1cGQgA5pqgo8MxKPtf+qN6Sh/0JzznmeGPm1HnE= -k8s.io/kube-openapi v0.0.0-20240808142205-8e686545bdb8/go.mod h1:Os6V6dZwLNii3vxFpxcNaTmH8LJJBkOTg1N0tOA0fvA= +k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUyGcf03XZEP0ZIKgKj35LS4= +k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8= k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20211208161948-7d6a63dca704/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A= -k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0= +k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/eventing v0.30.3 h1:phw3Uw/iSQGo3BJokCbfb0+zpbwwbYdg2w+UKE46lk0= knative.dev/eventing v0.30.3/go.mod h1:JCqC8evTls1WiBTmYhPEGME6OQD8HFnLQjFPImwOEOg= knative.dev/hack v0.0.0-20220224013837-e1785985d364/go.mod h1:PHt8x8yX5Z9pPquBEfIj0X66f8iWkWfR0S/sarACJrI= @@ -1410,8 +1441,8 @@ knative.dev/hack/schema v0.0.0-20220224013837-e1785985d364/go.mod h1:ffjwmdcrH5v knative.dev/networking v0.0.0-20231017124814-2a7676e912b7 h1:6+1icZuxiZO1paFZ4d/ysKWVG2M4WB7OxNJNyLG0P/E= knative.dev/networking v0.0.0-20231017124814-2a7676e912b7/go.mod h1:1gcHoIVG47ekQWjkddqRq+/7tWRh+CB9W4k/NAcdRbk= knative.dev/pkg v0.0.0-20220301181942-2fdd5f232e77/go.mod h1:SsH9J6Gz+CvrHmoL0TELJXmMmohqKSQ5bpJvCv+1+ZI= -knative.dev/pkg v0.0.0-20250117084104-c43477f0052b h1:a+gP7Yzu5NmoX2w1p8nfTgmSKF+aHLKGzqYT82ijJTw= -knative.dev/pkg v0.0.0-20250117084104-c43477f0052b/go.mod h1:bedSpkdLybR6JhL1J7XDLpd+JMKM/x8M5Apr80i5TeE= +knative.dev/pkg v0.0.0-20250415155312-ed3e2158b883 h1:UeOY7009M0EHwdyW3P35Fc1U6FJHzBrj6Gf370do8zY= +knative.dev/pkg v0.0.0-20250415155312-ed3e2158b883/go.mod h1:ptwLYr04MAyeoRvhnhhz0FFkVZTdYJV2QWnw9sZyFSM= knative.dev/reconciler-test v0.0.0-20220303141206-84821d26ed1f/go.mod h1:K5pZJkenonlT9o+MtRaNsBP7BazGwjhqYPepuV1zdnU= knative.dev/serving v0.39.4 h1:9IlFE7GsORKhI92DIZbF88hplQYM73T1l4W50UxZwF8= knative.dev/serving v0.39.4/go.mod h1:bWylSgwnRZeL659qy7m3/TZioYk25TIfusPUEeR695A= @@ -1420,17 +1451,23 @@ 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/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg= -sigs.k8s.io/controller-runtime v0.19.7 h1:DLABZfMr20A+AwCZOHhcbcu+TqBXnJZaVBri9K3EO48= -sigs.k8s.io/controller-runtime v0.19.7/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= -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/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM= +sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= +sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8= +sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= +sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= +sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU= +sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.1.2/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -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/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc= +sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= -sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= +sigs.k8s.io/yaml v1.6.0 h1:G8fkbMSAFqgEFgh4b1wmtzDnioxFCUgTZhlbj5P9QYs= +sigs.k8s.io/yaml v1.6.0/go.mod h1:796bPqUfzR/0jLAl6XjHl3Ck7MiyVv8dbTdyT3/pMf4= diff --git a/pkg/autodeploy/mocks/manager_mock.go b/pkg/autodeploy/mocks/manager_generated.mock.go similarity index 53% rename from pkg/autodeploy/mocks/manager_mock.go rename to pkg/autodeploy/mocks/manager_generated.mock.go index 6a03e4d5..c8455607 100644 --- a/pkg/autodeploy/mocks/manager_mock.go +++ b/pkg/autodeploy/mocks/manager_generated.mock.go @@ -1,18 +1,31 @@ -// Code generated by mockery. DO NOT EDIT. +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify package mocks import ( - apiv1 "github.com/epam/edp-codebase-operator/v2/api/v1" + "context" + "encoding/json" - context "context" + "github.com/epam/edp-cd-pipeline-operator/v2/api/v1" + v10 "github.com/epam/edp-codebase-operator/v2/api/v1" + mock "github.com/stretchr/testify/mock" +) - json "encoding/json" +// NewMockManager creates a new instance of MockManager. 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 NewMockManager(t interface { + mock.TestingT + Cleanup(func()) +}) *MockManager { + mock := &MockManager{} + mock.Mock.Test(t) - mock "github.com/stretchr/testify/mock" + t.Cleanup(func() { mock.AssertExpectations(t) }) - v1 "github.com/epam/edp-cd-pipeline-operator/v2/api/v1" -) + return mock +} // MockManager is an autogenerated mock type for the Manager type type MockManager struct { @@ -27,9 +40,9 @@ func (_m *MockManager) EXPECT() *MockManager_Expecter { return &MockManager_Expecter{mock: &_m.Mock} } -// GetAppPayloadForAllLatestStrategy provides a mock function with given fields: ctx, pipeline -func (_m *MockManager) GetAppPayloadForAllLatestStrategy(ctx context.Context, pipeline *v1.CDPipeline) (json.RawMessage, error) { - ret := _m.Called(ctx, pipeline) +// GetAppPayloadForAllLatestStrategy provides a mock function for the type MockManager +func (_mock *MockManager) GetAppPayloadForAllLatestStrategy(ctx context.Context, pipeline *v1.CDPipeline) (json.RawMessage, error) { + ret := _mock.Called(ctx, pipeline) if len(ret) == 0 { panic("no return value specified for GetAppPayloadForAllLatestStrategy") @@ -37,23 +50,21 @@ func (_m *MockManager) GetAppPayloadForAllLatestStrategy(ctx context.Context, pi var r0 json.RawMessage var r1 error - if rf, ok := ret.Get(0).(func(context.Context, *v1.CDPipeline) (json.RawMessage, error)); ok { - return rf(ctx, pipeline) + if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.CDPipeline) (json.RawMessage, error)); ok { + return returnFunc(ctx, pipeline) } - if rf, ok := ret.Get(0).(func(context.Context, *v1.CDPipeline) json.RawMessage); ok { - r0 = rf(ctx, pipeline) + if returnFunc, ok := ret.Get(0).(func(context.Context, *v1.CDPipeline) json.RawMessage); ok { + r0 = returnFunc(ctx, pipeline) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(json.RawMessage) } } - - if rf, ok := ret.Get(1).(func(context.Context, *v1.CDPipeline) error); ok { - r1 = rf(ctx, pipeline) + if returnFunc, ok := ret.Get(1).(func(context.Context, *v1.CDPipeline) error); ok { + r1 = returnFunc(ctx, pipeline) } else { r1 = ret.Error(1) } - return r0, r1 } @@ -71,24 +82,35 @@ func (_e *MockManager_Expecter) GetAppPayloadForAllLatestStrategy(ctx interface{ func (_c *MockManager_GetAppPayloadForAllLatestStrategy_Call) Run(run func(ctx context.Context, pipeline *v1.CDPipeline)) *MockManager_GetAppPayloadForAllLatestStrategy_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(*v1.CDPipeline)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 *v1.CDPipeline + if args[1] != nil { + arg1 = args[1].(*v1.CDPipeline) + } + run( + arg0, + arg1, + ) }) return _c } -func (_c *MockManager_GetAppPayloadForAllLatestStrategy_Call) Return(_a0 json.RawMessage, _a1 error) *MockManager_GetAppPayloadForAllLatestStrategy_Call { - _c.Call.Return(_a0, _a1) +func (_c *MockManager_GetAppPayloadForAllLatestStrategy_Call) Return(rawMessage json.RawMessage, err error) *MockManager_GetAppPayloadForAllLatestStrategy_Call { + _c.Call.Return(rawMessage, err) return _c } -func (_c *MockManager_GetAppPayloadForAllLatestStrategy_Call) RunAndReturn(run func(context.Context, *v1.CDPipeline) (json.RawMessage, error)) *MockManager_GetAppPayloadForAllLatestStrategy_Call { +func (_c *MockManager_GetAppPayloadForAllLatestStrategy_Call) RunAndReturn(run func(ctx context.Context, pipeline *v1.CDPipeline) (json.RawMessage, error)) *MockManager_GetAppPayloadForAllLatestStrategy_Call { _c.Call.Return(run) return _c } -// GetAppPayloadForCurrentWithStableStrategy provides a mock function with given fields: ctx, current, pipeline, stage -func (_m *MockManager) GetAppPayloadForCurrentWithStableStrategy(ctx context.Context, current apiv1.CodebaseTag, pipeline *v1.CDPipeline, stage *v1.Stage) (json.RawMessage, error) { - ret := _m.Called(ctx, current, pipeline, stage) +// GetAppPayloadForCurrentWithStableStrategy provides a mock function for the type MockManager +func (_mock *MockManager) GetAppPayloadForCurrentWithStableStrategy(ctx context.Context, current v10.CodebaseTag, pipeline *v1.CDPipeline, stage *v1.Stage) (json.RawMessage, error) { + ret := _mock.Called(ctx, current, pipeline, stage) if len(ret) == 0 { panic("no return value specified for GetAppPayloadForCurrentWithStableStrategy") @@ -96,23 +118,21 @@ func (_m *MockManager) GetAppPayloadForCurrentWithStableStrategy(ctx context.Con var r0 json.RawMessage var r1 error - if rf, ok := ret.Get(0).(func(context.Context, apiv1.CodebaseTag, *v1.CDPipeline, *v1.Stage) (json.RawMessage, error)); ok { - return rf(ctx, current, pipeline, stage) + if returnFunc, ok := ret.Get(0).(func(context.Context, v10.CodebaseTag, *v1.CDPipeline, *v1.Stage) (json.RawMessage, error)); ok { + return returnFunc(ctx, current, pipeline, stage) } - if rf, ok := ret.Get(0).(func(context.Context, apiv1.CodebaseTag, *v1.CDPipeline, *v1.Stage) json.RawMessage); ok { - r0 = rf(ctx, current, pipeline, stage) + if returnFunc, ok := ret.Get(0).(func(context.Context, v10.CodebaseTag, *v1.CDPipeline, *v1.Stage) json.RawMessage); ok { + r0 = returnFunc(ctx, current, pipeline, stage) } else { if ret.Get(0) != nil { r0 = ret.Get(0).(json.RawMessage) } } - - if rf, ok := ret.Get(1).(func(context.Context, apiv1.CodebaseTag, *v1.CDPipeline, *v1.Stage) error); ok { - r1 = rf(ctx, current, pipeline, stage) + if returnFunc, ok := ret.Get(1).(func(context.Context, v10.CodebaseTag, *v1.CDPipeline, *v1.Stage) error); ok { + r1 = returnFunc(ctx, current, pipeline, stage) } else { r1 = ret.Error(1) } - return r0, r1 } @@ -123,40 +143,47 @@ type MockManager_GetAppPayloadForCurrentWithStableStrategy_Call struct { // GetAppPayloadForCurrentWithStableStrategy is a helper method to define mock.On call // - ctx context.Context -// - current apiv1.CodebaseTag +// - current v10.CodebaseTag // - pipeline *v1.CDPipeline // - stage *v1.Stage func (_e *MockManager_Expecter) GetAppPayloadForCurrentWithStableStrategy(ctx interface{}, current interface{}, pipeline interface{}, stage interface{}) *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call { return &MockManager_GetAppPayloadForCurrentWithStableStrategy_Call{Call: _e.mock.On("GetAppPayloadForCurrentWithStableStrategy", ctx, current, pipeline, stage)} } -func (_c *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call) Run(run func(ctx context.Context, current apiv1.CodebaseTag, pipeline *v1.CDPipeline, stage *v1.Stage)) *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call { +func (_c *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call) Run(run func(ctx context.Context, current v10.CodebaseTag, pipeline *v1.CDPipeline, stage *v1.Stage)) *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(apiv1.CodebaseTag), args[2].(*v1.CDPipeline), args[3].(*v1.Stage)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 v10.CodebaseTag + if args[1] != nil { + arg1 = args[1].(v10.CodebaseTag) + } + var arg2 *v1.CDPipeline + if args[2] != nil { + arg2 = args[2].(*v1.CDPipeline) + } + var arg3 *v1.Stage + if args[3] != nil { + arg3 = args[3].(*v1.Stage) + } + run( + arg0, + arg1, + arg2, + arg3, + ) }) return _c } -func (_c *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call) Return(_a0 json.RawMessage, _a1 error) *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call { - _c.Call.Return(_a0, _a1) +func (_c *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call) Return(rawMessage json.RawMessage, err error) *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call { + _c.Call.Return(rawMessage, err) return _c } -func (_c *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call) RunAndReturn(run func(context.Context, apiv1.CodebaseTag, *v1.CDPipeline, *v1.Stage) (json.RawMessage, error)) *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call { +func (_c *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call) RunAndReturn(run func(ctx context.Context, current v10.CodebaseTag, pipeline *v1.CDPipeline, stage *v1.Stage) (json.RawMessage, error)) *MockManager_GetAppPayloadForCurrentWithStableStrategy_Call { _c.Call.Return(run) return _c } - -// NewMockManager creates a new instance of MockManager. 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 NewMockManager(t interface { - mock.TestingT - Cleanup(func()) -}) *MockManager { - mock := &MockManager{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/pkg/client/jira/mocks/client_factory_generated.mock.go b/pkg/client/jira/mocks/client_factory_generated.mock.go new file mode 100644 index 00000000..b0cb3a2c --- /dev/null +++ b/pkg/client/jira/mocks/client_factory_generated.mock.go @@ -0,0 +1,100 @@ +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify + +package mocks + +import ( + "github.com/epam/edp-codebase-operator/v2/pkg/client/jira" + "github.com/epam/edp-codebase-operator/v2/pkg/client/jira/dto" + mock "github.com/stretchr/testify/mock" +) + +// NewMockClientFactory creates a new instance of MockClientFactory. 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 NewMockClientFactory(t interface { + mock.TestingT + Cleanup(func()) +}) *MockClientFactory { + mock := &MockClientFactory{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} + +// MockClientFactory is an autogenerated mock type for the ClientFactory type +type MockClientFactory struct { + mock.Mock +} + +type MockClientFactory_Expecter struct { + mock *mock.Mock +} + +func (_m *MockClientFactory) EXPECT() *MockClientFactory_Expecter { + return &MockClientFactory_Expecter{mock: &_m.Mock} +} + +// New provides a mock function for the type MockClientFactory +func (_mock *MockClientFactory) New(jira1 dto.JiraServer) (jira.Client, error) { + ret := _mock.Called(jira1) + + if len(ret) == 0 { + panic("no return value specified for New") + } + + var r0 jira.Client + var r1 error + if returnFunc, ok := ret.Get(0).(func(dto.JiraServer) (jira.Client, error)); ok { + return returnFunc(jira1) + } + if returnFunc, ok := ret.Get(0).(func(dto.JiraServer) jira.Client); ok { + r0 = returnFunc(jira1) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(jira.Client) + } + } + if returnFunc, ok := ret.Get(1).(func(dto.JiraServer) error); ok { + r1 = returnFunc(jira1) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockClientFactory_New_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'New' +type MockClientFactory_New_Call struct { + *mock.Call +} + +// New is a helper method to define mock.On call +// - jira1 dto.JiraServer +func (_e *MockClientFactory_Expecter) New(jira1 interface{}) *MockClientFactory_New_Call { + return &MockClientFactory_New_Call{Call: _e.mock.On("New", jira1)} +} + +func (_c *MockClientFactory_New_Call) Run(run func(jira1 dto.JiraServer)) *MockClientFactory_New_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 dto.JiraServer + if args[0] != nil { + arg0 = args[0].(dto.JiraServer) + } + run( + arg0, + ) + }) + return _c +} + +func (_c *MockClientFactory_New_Call) Return(client jira.Client, err error) *MockClientFactory_New_Call { + _c.Call.Return(client, err) + return _c +} + +func (_c *MockClientFactory_New_Call) RunAndReturn(run func(jira1 dto.JiraServer) (jira.Client, error)) *MockClientFactory_New_Call { + _c.Call.Return(run) + return _c +} diff --git a/pkg/client/jira/mocks/client_mock.go b/pkg/client/jira/mocks/client_generated.mock.go similarity index 56% rename from pkg/client/jira/mocks/client_mock.go rename to pkg/client/jira/mocks/client_generated.mock.go index ac2aade7..deb3e5a9 100644 --- a/pkg/client/jira/mocks/client_mock.go +++ b/pkg/client/jira/mocks/client_generated.mock.go @@ -1,16 +1,31 @@ -// Code generated by mockery. DO NOT EDIT. +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify package mocks import ( - context "context" - - go_jira "github.com/andygrunwald/go-jira" - jira "github.com/epam/edp-codebase-operator/v2/pkg/client/jira" + "context" + "github.com/andygrunwald/go-jira" + jira0 "github.com/epam/edp-codebase-operator/v2/pkg/client/jira" mock "github.com/stretchr/testify/mock" ) +// NewMockClient creates a new instance of MockClient. 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 NewMockClient(t interface { + mock.TestingT + Cleanup(func()) +}) *MockClient { + mock := &MockClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} + // MockClient is an autogenerated mock type for the Client type type MockClient struct { mock.Mock @@ -24,21 +39,20 @@ func (_m *MockClient) EXPECT() *MockClient_Expecter { return &MockClient_Expecter{mock: &_m.Mock} } -// ApplyTagsToIssue provides a mock function with given fields: issue, tags -func (_m *MockClient) ApplyTagsToIssue(issue string, tags map[string]interface{}) error { - ret := _m.Called(issue, tags) +// ApplyTagsToIssue provides a mock function for the type MockClient +func (_mock *MockClient) ApplyTagsToIssue(issue string, tags map[string]interface{}) error { + ret := _mock.Called(issue, tags) if len(ret) == 0 { panic("no return value specified for ApplyTagsToIssue") } var r0 error - if rf, ok := ret.Get(0).(func(string, map[string]interface{}) error); ok { - r0 = rf(issue, tags) + if returnFunc, ok := ret.Get(0).(func(string, map[string]interface{}) error); ok { + r0 = returnFunc(issue, tags) } else { r0 = ret.Error(0) } - return r0 } @@ -56,24 +70,35 @@ func (_e *MockClient_Expecter) ApplyTagsToIssue(issue interface{}, tags interfac func (_c *MockClient_ApplyTagsToIssue_Call) Run(run func(issue string, tags map[string]interface{})) *MockClient_ApplyTagsToIssue_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(string), args[1].(map[string]interface{})) + var arg0 string + if args[0] != nil { + arg0 = args[0].(string) + } + var arg1 map[string]interface{} + if args[1] != nil { + arg1 = args[1].(map[string]interface{}) + } + run( + arg0, + arg1, + ) }) return _c } -func (_c *MockClient_ApplyTagsToIssue_Call) Return(_a0 error) *MockClient_ApplyTagsToIssue_Call { - _c.Call.Return(_a0) +func (_c *MockClient_ApplyTagsToIssue_Call) Return(err error) *MockClient_ApplyTagsToIssue_Call { + _c.Call.Return(err) return _c } -func (_c *MockClient_ApplyTagsToIssue_Call) RunAndReturn(run func(string, map[string]interface{}) error) *MockClient_ApplyTagsToIssue_Call { +func (_c *MockClient_ApplyTagsToIssue_Call) RunAndReturn(run func(issue string, tags map[string]interface{}) error) *MockClient_ApplyTagsToIssue_Call { _c.Call.Return(run) return _c } -// Connected provides a mock function with no fields -func (_m *MockClient) Connected() (bool, error) { - ret := _m.Called() +// Connected provides a mock function for the type MockClient +func (_mock *MockClient) Connected() (bool, error) { + ret := _mock.Called() if len(ret) == 0 { panic("no return value specified for Connected") @@ -81,21 +106,19 @@ func (_m *MockClient) Connected() (bool, error) { var r0 bool var r1 error - if rf, ok := ret.Get(0).(func() (bool, error)); ok { - return rf() + if returnFunc, ok := ret.Get(0).(func() (bool, error)); ok { + return returnFunc() } - if rf, ok := ret.Get(0).(func() bool); ok { - r0 = rf() + if returnFunc, ok := ret.Get(0).(func() bool); ok { + r0 = returnFunc() } else { r0 = ret.Get(0).(bool) } - - if rf, ok := ret.Get(1).(func() error); ok { - r1 = rf() + if returnFunc, ok := ret.Get(1).(func() error); ok { + r1 = returnFunc() } else { r1 = ret.Error(1) } - return r0, r1 } @@ -116,8 +139,8 @@ func (_c *MockClient_Connected_Call) Run(run func()) *MockClient_Connected_Call return _c } -func (_c *MockClient_Connected_Call) Return(_a0 bool, _a1 error) *MockClient_Connected_Call { - _c.Call.Return(_a0, _a1) +func (_c *MockClient_Connected_Call) Return(b bool, err error) *MockClient_Connected_Call { + _c.Call.Return(b, err) return _c } @@ -126,21 +149,20 @@ func (_c *MockClient_Connected_Call) RunAndReturn(run func() (bool, error)) *Moc return _c } -// CreateComponentValue provides a mock function with given fields: ctx, projectId, componentName -func (_m *MockClient) CreateComponentValue(ctx context.Context, projectId int, componentName string) error { - ret := _m.Called(ctx, projectId, componentName) +// CreateComponentValue provides a mock function for the type MockClient +func (_mock *MockClient) CreateComponentValue(ctx context.Context, projectId int, componentName string) error { + ret := _mock.Called(ctx, projectId, componentName) if len(ret) == 0 { panic("no return value specified for CreateComponentValue") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, int, string) error); ok { - r0 = rf(ctx, projectId, componentName) + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) error); ok { + r0 = returnFunc(ctx, projectId, componentName) } else { r0 = ret.Error(0) } - return r0 } @@ -159,36 +181,51 @@ func (_e *MockClient_Expecter) CreateComponentValue(ctx interface{}, projectId i func (_c *MockClient_CreateComponentValue_Call) Run(run func(ctx context.Context, projectId int, componentName string)) *MockClient_CreateComponentValue_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(int), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 int + if args[1] != nil { + arg1 = args[1].(int) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockClient_CreateComponentValue_Call) Return(_a0 error) *MockClient_CreateComponentValue_Call { - _c.Call.Return(_a0) +func (_c *MockClient_CreateComponentValue_Call) Return(err error) *MockClient_CreateComponentValue_Call { + _c.Call.Return(err) return _c } -func (_c *MockClient_CreateComponentValue_Call) RunAndReturn(run func(context.Context, int, string) error) *MockClient_CreateComponentValue_Call { +func (_c *MockClient_CreateComponentValue_Call) RunAndReturn(run func(ctx context.Context, projectId int, componentName string) error) *MockClient_CreateComponentValue_Call { _c.Call.Return(run) return _c } -// CreateFixVersionValue provides a mock function with given fields: ctx, projectId, versionName -func (_m *MockClient) CreateFixVersionValue(ctx context.Context, projectId int, versionName string) error { - ret := _m.Called(ctx, projectId, versionName) +// CreateFixVersionValue provides a mock function for the type MockClient +func (_mock *MockClient) CreateFixVersionValue(ctx context.Context, projectId int, versionName string) error { + ret := _mock.Called(ctx, projectId, versionName) if len(ret) == 0 { panic("no return value specified for CreateFixVersionValue") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, int, string) error); ok { - r0 = rf(ctx, projectId, versionName) + if returnFunc, ok := ret.Get(0).(func(context.Context, int, string) error); ok { + r0 = returnFunc(ctx, projectId, versionName) } else { r0 = ret.Error(0) } - return r0 } @@ -207,36 +244,51 @@ func (_e *MockClient_Expecter) CreateFixVersionValue(ctx interface{}, projectId func (_c *MockClient_CreateFixVersionValue_Call) Run(run func(ctx context.Context, projectId int, versionName string)) *MockClient_CreateFixVersionValue_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(int), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 int + if args[1] != nil { + arg1 = args[1].(int) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockClient_CreateFixVersionValue_Call) Return(_a0 error) *MockClient_CreateFixVersionValue_Call { - _c.Call.Return(_a0) +func (_c *MockClient_CreateFixVersionValue_Call) Return(err error) *MockClient_CreateFixVersionValue_Call { + _c.Call.Return(err) return _c } -func (_c *MockClient_CreateFixVersionValue_Call) RunAndReturn(run func(context.Context, int, string) error) *MockClient_CreateFixVersionValue_Call { +func (_c *MockClient_CreateFixVersionValue_Call) RunAndReturn(run func(ctx context.Context, projectId int, versionName string) error) *MockClient_CreateFixVersionValue_Call { _c.Call.Return(run) return _c } -// CreateIssueLink provides a mock function with given fields: issueId, title, url -func (_m *MockClient) CreateIssueLink(issueId string, title string, url string) error { - ret := _m.Called(issueId, title, url) +// CreateIssueLink provides a mock function for the type MockClient +func (_mock *MockClient) CreateIssueLink(issueId string, title string, url string) error { + ret := _mock.Called(issueId, title, url) if len(ret) == 0 { panic("no return value specified for CreateIssueLink") } var r0 error - if rf, ok := ret.Get(0).(func(string, string, string) error); ok { - r0 = rf(issueId, title, url) + if returnFunc, ok := ret.Get(0).(func(string, string, string) error); ok { + r0 = returnFunc(issueId, title, url) } else { r0 = ret.Error(0) } - return r0 } @@ -255,48 +307,62 @@ func (_e *MockClient_Expecter) CreateIssueLink(issueId interface{}, title interf func (_c *MockClient_CreateIssueLink_Call) Run(run func(issueId string, title string, url string)) *MockClient_CreateIssueLink_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(string), args[1].(string), args[2].(string)) + var arg0 string + if args[0] != nil { + arg0 = args[0].(string) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockClient_CreateIssueLink_Call) Return(_a0 error) *MockClient_CreateIssueLink_Call { - _c.Call.Return(_a0) +func (_c *MockClient_CreateIssueLink_Call) Return(err error) *MockClient_CreateIssueLink_Call { + _c.Call.Return(err) return _c } -func (_c *MockClient_CreateIssueLink_Call) RunAndReturn(run func(string, string, string) error) *MockClient_CreateIssueLink_Call { +func (_c *MockClient_CreateIssueLink_Call) RunAndReturn(run func(issueId string, title string, url string) error) *MockClient_CreateIssueLink_Call { _c.Call.Return(run) return _c } -// GetIssue provides a mock function with given fields: ctx, issueId -func (_m *MockClient) GetIssue(ctx context.Context, issueId string) (*go_jira.Issue, error) { - ret := _m.Called(ctx, issueId) +// GetIssue provides a mock function for the type MockClient +func (_mock *MockClient) GetIssue(ctx context.Context, issueId string) (*jira.Issue, error) { + ret := _mock.Called(ctx, issueId) if len(ret) == 0 { panic("no return value specified for GetIssue") } - var r0 *go_jira.Issue + var r0 *jira.Issue var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string) (*go_jira.Issue, error)); ok { - return rf(ctx, issueId) + if returnFunc, ok := ret.Get(0).(func(context.Context, string) (*jira.Issue, error)); ok { + return returnFunc(ctx, issueId) } - if rf, ok := ret.Get(0).(func(context.Context, string) *go_jira.Issue); ok { - r0 = rf(ctx, issueId) + if returnFunc, ok := ret.Get(0).(func(context.Context, string) *jira.Issue); ok { + r0 = returnFunc(ctx, issueId) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*go_jira.Issue) + r0 = ret.Get(0).(*jira.Issue) } } - - if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { - r1 = rf(ctx, issueId) + if returnFunc, ok := ret.Get(1).(func(context.Context, string) error); ok { + r1 = returnFunc(ctx, issueId) } else { r1 = ret.Error(1) } - return r0, r1 } @@ -314,48 +380,57 @@ func (_e *MockClient_Expecter) GetIssue(ctx interface{}, issueId interface{}) *M func (_c *MockClient_GetIssue_Call) Run(run func(ctx context.Context, issueId string)) *MockClient_GetIssue_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + run( + arg0, + arg1, + ) }) return _c } -func (_c *MockClient_GetIssue_Call) Return(_a0 *go_jira.Issue, _a1 error) *MockClient_GetIssue_Call { - _c.Call.Return(_a0, _a1) +func (_c *MockClient_GetIssue_Call) Return(issue *jira.Issue, err error) *MockClient_GetIssue_Call { + _c.Call.Return(issue, err) return _c } -func (_c *MockClient_GetIssue_Call) RunAndReturn(run func(context.Context, string) (*go_jira.Issue, error)) *MockClient_GetIssue_Call { +func (_c *MockClient_GetIssue_Call) RunAndReturn(run func(ctx context.Context, issueId string) (*jira.Issue, error)) *MockClient_GetIssue_Call { _c.Call.Return(run) return _c } -// GetIssueTypeMeta provides a mock function with given fields: ctx, projectID, issueTypeID -func (_m *MockClient) GetIssueTypeMeta(ctx context.Context, projectID string, issueTypeID string) (map[string]jira.IssueTypeMeta, error) { - ret := _m.Called(ctx, projectID, issueTypeID) +// GetIssueTypeMeta provides a mock function for the type MockClient +func (_mock *MockClient) GetIssueTypeMeta(ctx context.Context, projectID string, issueTypeID string) (map[string]jira0.IssueTypeMeta, error) { + ret := _mock.Called(ctx, projectID, issueTypeID) if len(ret) == 0 { panic("no return value specified for GetIssueTypeMeta") } - var r0 map[string]jira.IssueTypeMeta + var r0 map[string]jira0.IssueTypeMeta var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) (map[string]jira.IssueTypeMeta, error)); ok { - return rf(ctx, projectID, issueTypeID) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) (map[string]jira0.IssueTypeMeta, error)); ok { + return returnFunc(ctx, projectID, issueTypeID) } - if rf, ok := ret.Get(0).(func(context.Context, string, string) map[string]jira.IssueTypeMeta); ok { - r0 = rf(ctx, projectID, issueTypeID) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) map[string]jira0.IssueTypeMeta); ok { + r0 = returnFunc(ctx, projectID, issueTypeID) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(map[string]jira.IssueTypeMeta) + r0 = ret.Get(0).(map[string]jira0.IssueTypeMeta) } } - - if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { - r1 = rf(ctx, projectID, issueTypeID) + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string) error); ok { + r1 = returnFunc(ctx, projectID, issueTypeID) } else { r1 = ret.Error(1) } - return r0, r1 } @@ -374,48 +449,62 @@ func (_e *MockClient_Expecter) GetIssueTypeMeta(ctx interface{}, projectID inter func (_c *MockClient_GetIssueTypeMeta_Call) Run(run func(ctx context.Context, projectID string, issueTypeID string)) *MockClient_GetIssueTypeMeta_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockClient_GetIssueTypeMeta_Call) Return(_a0 map[string]jira.IssueTypeMeta, _a1 error) *MockClient_GetIssueTypeMeta_Call { - _c.Call.Return(_a0, _a1) +func (_c *MockClient_GetIssueTypeMeta_Call) Return(stringToIssueTypeMeta map[string]jira0.IssueTypeMeta, err error) *MockClient_GetIssueTypeMeta_Call { + _c.Call.Return(stringToIssueTypeMeta, err) return _c } -func (_c *MockClient_GetIssueTypeMeta_Call) RunAndReturn(run func(context.Context, string, string) (map[string]jira.IssueTypeMeta, error)) *MockClient_GetIssueTypeMeta_Call { +func (_c *MockClient_GetIssueTypeMeta_Call) RunAndReturn(run func(ctx context.Context, projectID string, issueTypeID string) (map[string]jira0.IssueTypeMeta, error)) *MockClient_GetIssueTypeMeta_Call { _c.Call.Return(run) return _c } -// GetProjectInfo provides a mock function with given fields: issueId -func (_m *MockClient) GetProjectInfo(issueId string) (*go_jira.Project, error) { - ret := _m.Called(issueId) +// GetProjectInfo provides a mock function for the type MockClient +func (_mock *MockClient) GetProjectInfo(issueId string) (*jira.Project, error) { + ret := _mock.Called(issueId) if len(ret) == 0 { panic("no return value specified for GetProjectInfo") } - var r0 *go_jira.Project + var r0 *jira.Project var r1 error - if rf, ok := ret.Get(0).(func(string) (*go_jira.Project, error)); ok { - return rf(issueId) + if returnFunc, ok := ret.Get(0).(func(string) (*jira.Project, error)); ok { + return returnFunc(issueId) } - if rf, ok := ret.Get(0).(func(string) *go_jira.Project); ok { - r0 = rf(issueId) + if returnFunc, ok := ret.Get(0).(func(string) *jira.Project); ok { + r0 = returnFunc(issueId) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(*go_jira.Project) + r0 = ret.Get(0).(*jira.Project) } } - - if rf, ok := ret.Get(1).(func(string) error); ok { - r1 = rf(issueId) + if returnFunc, ok := ret.Get(1).(func(string) error); ok { + r1 = returnFunc(issueId) } else { r1 = ret.Error(1) } - return r0, r1 } @@ -432,31 +521,23 @@ func (_e *MockClient_Expecter) GetProjectInfo(issueId interface{}) *MockClient_G func (_c *MockClient_GetProjectInfo_Call) Run(run func(issueId string)) *MockClient_GetProjectInfo_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(string)) + var arg0 string + if args[0] != nil { + arg0 = args[0].(string) + } + run( + arg0, + ) }) return _c } -func (_c *MockClient_GetProjectInfo_Call) Return(_a0 *go_jira.Project, _a1 error) *MockClient_GetProjectInfo_Call { - _c.Call.Return(_a0, _a1) +func (_c *MockClient_GetProjectInfo_Call) Return(project *jira.Project, err error) *MockClient_GetProjectInfo_Call { + _c.Call.Return(project, err) return _c } -func (_c *MockClient_GetProjectInfo_Call) RunAndReturn(run func(string) (*go_jira.Project, error)) *MockClient_GetProjectInfo_Call { +func (_c *MockClient_GetProjectInfo_Call) RunAndReturn(run func(issueId string) (*jira.Project, error)) *MockClient_GetProjectInfo_Call { _c.Call.Return(run) return _c } - -// NewMockClient creates a new instance of MockClient. 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 NewMockClient(t interface { - mock.TestingT - Cleanup(func()) -}) *MockClient { - mock := &MockClient{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/pkg/gerrit/mocks/client_mock.go b/pkg/gerrit/mocks/client_generated.mock.go similarity index 52% rename from pkg/gerrit/mocks/client_mock.go rename to pkg/gerrit/mocks/client_generated.mock.go index 0bcd6e48..c9807978 100644 --- a/pkg/gerrit/mocks/client_mock.go +++ b/pkg/gerrit/mocks/client_generated.mock.go @@ -1,12 +1,28 @@ -// Code generated by mockery. DO NOT EDIT. +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify package mocks import ( - logr "github.com/go-logr/logr" + "github.com/go-logr/logr" mock "github.com/stretchr/testify/mock" ) +// NewMockClient creates a new instance of MockClient. 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 NewMockClient(t interface { + mock.TestingT + Cleanup(func()) +}) *MockClient { + mock := &MockClient{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} + // MockClient is an autogenerated mock type for the Client type type MockClient struct { mock.Mock @@ -20,9 +36,9 @@ func (_m *MockClient) EXPECT() *MockClient_Expecter { return &MockClient_Expecter{mock: &_m.Mock} } -// CheckProjectExist provides a mock function with given fields: port, sshPrivateKey, host, user, appName, logger -func (_m *MockClient) CheckProjectExist(port int32, sshPrivateKey string, host string, user string, appName string, logger logr.Logger) (bool, error) { - ret := _m.Called(port, sshPrivateKey, host, user, appName, logger) +// CheckProjectExist provides a mock function for the type MockClient +func (_mock *MockClient) CheckProjectExist(port int32, sshPrivateKey string, host string, user string, appName string, logger logr.Logger) (bool, error) { + ret := _mock.Called(port, sshPrivateKey, host, user, appName, logger) if len(ret) == 0 { panic("no return value specified for CheckProjectExist") @@ -30,21 +46,19 @@ func (_m *MockClient) CheckProjectExist(port int32, sshPrivateKey string, host s var r0 bool var r1 error - if rf, ok := ret.Get(0).(func(int32, string, string, string, string, logr.Logger) (bool, error)); ok { - return rf(port, sshPrivateKey, host, user, appName, logger) + if returnFunc, ok := ret.Get(0).(func(int32, string, string, string, string, logr.Logger) (bool, error)); ok { + return returnFunc(port, sshPrivateKey, host, user, appName, logger) } - if rf, ok := ret.Get(0).(func(int32, string, string, string, string, logr.Logger) bool); ok { - r0 = rf(port, sshPrivateKey, host, user, appName, logger) + if returnFunc, ok := ret.Get(0).(func(int32, string, string, string, string, logr.Logger) bool); ok { + r0 = returnFunc(port, sshPrivateKey, host, user, appName, logger) } else { r0 = ret.Get(0).(bool) } - - if rf, ok := ret.Get(1).(func(int32, string, string, string, string, logr.Logger) error); ok { - r1 = rf(port, sshPrivateKey, host, user, appName, logger) + if returnFunc, ok := ret.Get(1).(func(int32, string, string, string, string, logr.Logger) error); ok { + r1 = returnFunc(port, sshPrivateKey, host, user, appName, logger) } else { r1 = ret.Error(1) } - return r0, r1 } @@ -66,36 +80,66 @@ func (_e *MockClient_Expecter) CheckProjectExist(port interface{}, sshPrivateKey func (_c *MockClient_CheckProjectExist_Call) Run(run func(port int32, sshPrivateKey string, host string, user string, appName string, logger logr.Logger)) *MockClient_CheckProjectExist_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(int32), args[1].(string), args[2].(string), args[3].(string), args[4].(string), args[5].(logr.Logger)) + var arg0 int32 + if args[0] != nil { + arg0 = args[0].(int32) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + var arg5 logr.Logger + if args[5] != nil { + arg5 = args[5].(logr.Logger) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + arg5, + ) }) return _c } -func (_c *MockClient_CheckProjectExist_Call) Return(_a0 bool, _a1 error) *MockClient_CheckProjectExist_Call { - _c.Call.Return(_a0, _a1) +func (_c *MockClient_CheckProjectExist_Call) Return(b bool, err error) *MockClient_CheckProjectExist_Call { + _c.Call.Return(b, err) return _c } -func (_c *MockClient_CheckProjectExist_Call) RunAndReturn(run func(int32, string, string, string, string, logr.Logger) (bool, error)) *MockClient_CheckProjectExist_Call { +func (_c *MockClient_CheckProjectExist_Call) RunAndReturn(run func(port int32, sshPrivateKey string, host string, user string, appName string, logger logr.Logger) (bool, error)) *MockClient_CheckProjectExist_Call { _c.Call.Return(run) return _c } -// CreateProject provides a mock function with given fields: port, sshPrivateKey, host, user, appName, logger -func (_m *MockClient) CreateProject(port int32, sshPrivateKey string, host string, user string, appName string, logger logr.Logger) error { - ret := _m.Called(port, sshPrivateKey, host, user, appName, logger) +// CreateProject provides a mock function for the type MockClient +func (_mock *MockClient) CreateProject(port int32, sshPrivateKey string, host string, user string, appName string, logger logr.Logger) error { + ret := _mock.Called(port, sshPrivateKey, host, user, appName, logger) if len(ret) == 0 { panic("no return value specified for CreateProject") } var r0 error - if rf, ok := ret.Get(0).(func(int32, string, string, string, string, logr.Logger) error); ok { - r0 = rf(port, sshPrivateKey, host, user, appName, logger) + if returnFunc, ok := ret.Get(0).(func(int32, string, string, string, string, logr.Logger) error); ok { + r0 = returnFunc(port, sshPrivateKey, host, user, appName, logger) } else { r0 = ret.Error(0) } - return r0 } @@ -117,36 +161,66 @@ func (_e *MockClient_Expecter) CreateProject(port interface{}, sshPrivateKey int func (_c *MockClient_CreateProject_Call) Run(run func(port int32, sshPrivateKey string, host string, user string, appName string, logger logr.Logger)) *MockClient_CreateProject_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(int32), args[1].(string), args[2].(string), args[3].(string), args[4].(string), args[5].(logr.Logger)) + var arg0 int32 + if args[0] != nil { + arg0 = args[0].(int32) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + var arg5 logr.Logger + if args[5] != nil { + arg5 = args[5].(logr.Logger) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + arg5, + ) }) return _c } -func (_c *MockClient_CreateProject_Call) Return(_a0 error) *MockClient_CreateProject_Call { - _c.Call.Return(_a0) +func (_c *MockClient_CreateProject_Call) Return(err error) *MockClient_CreateProject_Call { + _c.Call.Return(err) return _c } -func (_c *MockClient_CreateProject_Call) RunAndReturn(run func(int32, string, string, string, string, logr.Logger) error) *MockClient_CreateProject_Call { +func (_c *MockClient_CreateProject_Call) RunAndReturn(run func(port int32, sshPrivateKey string, host string, user string, appName string, logger logr.Logger) error) *MockClient_CreateProject_Call { _c.Call.Return(run) return _c } -// SetHeadToBranch provides a mock function with given fields: port, sshPrivateKey, host, user, appName, branchName, logger -func (_m *MockClient) SetHeadToBranch(port int32, sshPrivateKey string, host string, user string, appName string, branchName string, logger logr.Logger) error { - ret := _m.Called(port, sshPrivateKey, host, user, appName, branchName, logger) +// SetHeadToBranch provides a mock function for the type MockClient +func (_mock *MockClient) SetHeadToBranch(port int32, sshPrivateKey string, host string, user string, appName string, branchName string, logger logr.Logger) error { + ret := _mock.Called(port, sshPrivateKey, host, user, appName, branchName, logger) if len(ret) == 0 { panic("no return value specified for SetHeadToBranch") } var r0 error - if rf, ok := ret.Get(0).(func(int32, string, string, string, string, string, logr.Logger) error); ok { - r0 = rf(port, sshPrivateKey, host, user, appName, branchName, logger) + if returnFunc, ok := ret.Get(0).(func(int32, string, string, string, string, string, logr.Logger) error); ok { + r0 = returnFunc(port, sshPrivateKey, host, user, appName, branchName, logger) } else { r0 = ret.Error(0) } - return r0 } @@ -169,31 +243,53 @@ func (_e *MockClient_Expecter) SetHeadToBranch(port interface{}, sshPrivateKey i func (_c *MockClient_SetHeadToBranch_Call) Run(run func(port int32, sshPrivateKey string, host string, user string, appName string, branchName string, logger logr.Logger)) *MockClient_SetHeadToBranch_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(int32), args[1].(string), args[2].(string), args[3].(string), args[4].(string), args[5].(string), args[6].(logr.Logger)) + var arg0 int32 + if args[0] != nil { + arg0 = args[0].(int32) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + var arg5 string + if args[5] != nil { + arg5 = args[5].(string) + } + var arg6 logr.Logger + if args[6] != nil { + arg6 = args[6].(logr.Logger) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + arg5, + arg6, + ) }) return _c } -func (_c *MockClient_SetHeadToBranch_Call) Return(_a0 error) *MockClient_SetHeadToBranch_Call { - _c.Call.Return(_a0) +func (_c *MockClient_SetHeadToBranch_Call) Return(err error) *MockClient_SetHeadToBranch_Call { + _c.Call.Return(err) return _c } -func (_c *MockClient_SetHeadToBranch_Call) RunAndReturn(run func(int32, string, string, string, string, string, logr.Logger) error) *MockClient_SetHeadToBranch_Call { +func (_c *MockClient_SetHeadToBranch_Call) RunAndReturn(run func(port int32, sshPrivateKey string, host string, user string, appName string, branchName string, logger logr.Logger) error) *MockClient_SetHeadToBranch_Call { _c.Call.Return(run) return _c } - -// NewMockClient creates a new instance of MockClient. 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 NewMockClient(t interface { - mock.TestingT - Cleanup(func()) -}) *MockClient { - mock := &MockClient{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/pkg/git/mocks/git_mock.go b/pkg/git/mocks/git_generated.mock.go similarity index 55% rename from pkg/git/mocks/git_mock.go rename to pkg/git/mocks/git_generated.mock.go index ba7f78bc..31ce4fb7 100644 --- a/pkg/git/mocks/git_mock.go +++ b/pkg/git/mocks/git_generated.mock.go @@ -1,14 +1,30 @@ -// Code generated by mockery. DO NOT EDIT. +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify package mocks import ( - context "context" + "context" - v2 "github.com/epam/edp-codebase-operator/v2/pkg/git" + "github.com/epam/edp-codebase-operator/v2/pkg/git" mock "github.com/stretchr/testify/mock" ) +// NewMockGit creates a new instance of MockGit. 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 NewMockGit(t interface { + mock.TestingT + Cleanup(func()) +}) *MockGit { + mock := &MockGit{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} + // MockGit is an autogenerated mock type for the Git type type MockGit struct { mock.Mock @@ -22,21 +38,20 @@ func (_m *MockGit) EXPECT() *MockGit_Expecter { return &MockGit_Expecter{mock: &_m.Mock} } -// AddRemoteLink provides a mock function with given fields: ctx, directory, remoteURL -func (_m *MockGit) AddRemoteLink(ctx context.Context, directory string, remoteURL string) error { - ret := _m.Called(ctx, directory, remoteURL) +// AddRemoteLink provides a mock function for the type MockGit +func (_mock *MockGit) AddRemoteLink(ctx context.Context, directory string, remoteURL string) error { + ret := _mock.Called(ctx, directory, remoteURL) if len(ret) == 0 { panic("no return value specified for AddRemoteLink") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) error); ok { - r0 = rf(ctx, directory, remoteURL) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) error); ok { + r0 = returnFunc(ctx, directory, remoteURL) } else { r0 = ret.Error(0) } - return r0 } @@ -55,36 +70,51 @@ func (_e *MockGit_Expecter) AddRemoteLink(ctx interface{}, directory interface{} func (_c *MockGit_AddRemoteLink_Call) Run(run func(ctx context.Context, directory string, remoteURL string)) *MockGit_AddRemoteLink_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockGit_AddRemoteLink_Call) Return(_a0 error) *MockGit_AddRemoteLink_Call { - _c.Call.Return(_a0) +func (_c *MockGit_AddRemoteLink_Call) Return(err error) *MockGit_AddRemoteLink_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_AddRemoteLink_Call) RunAndReturn(run func(context.Context, string, string) error) *MockGit_AddRemoteLink_Call { +func (_c *MockGit_AddRemoteLink_Call) RunAndReturn(run func(ctx context.Context, directory string, remoteURL string) error) *MockGit_AddRemoteLink_Call { _c.Call.Return(run) return _c } -// CheckPermissions provides a mock function with given fields: ctx, repoURL -func (_m *MockGit) CheckPermissions(ctx context.Context, repoURL string) error { - ret := _m.Called(ctx, repoURL) +// CheckPermissions provides a mock function for the type MockGit +func (_mock *MockGit) CheckPermissions(ctx context.Context, repoURL string) error { + ret := _mock.Called(ctx, repoURL) if len(ret) == 0 { panic("no return value specified for CheckPermissions") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string) error); ok { - r0 = rf(ctx, repoURL) + if returnFunc, ok := ret.Get(0).(func(context.Context, string) error); ok { + r0 = returnFunc(ctx, repoURL) } else { r0 = ret.Error(0) } - return r0 } @@ -102,36 +132,46 @@ func (_e *MockGit_Expecter) CheckPermissions(ctx interface{}, repoURL interface{ func (_c *MockGit_CheckPermissions_Call) Run(run func(ctx context.Context, repoURL string)) *MockGit_CheckPermissions_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + run( + arg0, + arg1, + ) }) return _c } -func (_c *MockGit_CheckPermissions_Call) Return(_a0 error) *MockGit_CheckPermissions_Call { - _c.Call.Return(_a0) +func (_c *MockGit_CheckPermissions_Call) Return(err error) *MockGit_CheckPermissions_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_CheckPermissions_Call) RunAndReturn(run func(context.Context, string) error) *MockGit_CheckPermissions_Call { +func (_c *MockGit_CheckPermissions_Call) RunAndReturn(run func(ctx context.Context, repoURL string) error) *MockGit_CheckPermissions_Call { _c.Call.Return(run) return _c } -// CheckReference provides a mock function with given fields: ctx, directory, refName -func (_m *MockGit) CheckReference(ctx context.Context, directory string, refName string) error { - ret := _m.Called(ctx, directory, refName) +// CheckReference provides a mock function for the type MockGit +func (_mock *MockGit) CheckReference(ctx context.Context, directory string, refName string) error { + ret := _mock.Called(ctx, directory, refName) if len(ret) == 0 { panic("no return value specified for CheckReference") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) error); ok { - r0 = rf(ctx, directory, refName) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) error); ok { + r0 = returnFunc(ctx, directory, refName) } else { r0 = ret.Error(0) } - return r0 } @@ -150,36 +190,51 @@ func (_e *MockGit_Expecter) CheckReference(ctx interface{}, directory interface{ func (_c *MockGit_CheckReference_Call) Run(run func(ctx context.Context, directory string, refName string)) *MockGit_CheckReference_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockGit_CheckReference_Call) Return(_a0 error) *MockGit_CheckReference_Call { - _c.Call.Return(_a0) +func (_c *MockGit_CheckReference_Call) Return(err error) *MockGit_CheckReference_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_CheckReference_Call) RunAndReturn(run func(context.Context, string, string) error) *MockGit_CheckReference_Call { +func (_c *MockGit_CheckReference_Call) RunAndReturn(run func(ctx context.Context, directory string, refName string) error) *MockGit_CheckReference_Call { _c.Call.Return(run) return _c } -// Checkout provides a mock function with given fields: ctx, directory, branchName, remote -func (_m *MockGit) Checkout(ctx context.Context, directory string, branchName string, remote bool) error { - ret := _m.Called(ctx, directory, branchName, remote) +// Checkout provides a mock function for the type MockGit +func (_mock *MockGit) Checkout(ctx context.Context, directory string, branchName string, remote bool) error { + ret := _mock.Called(ctx, directory, branchName, remote) if len(ret) == 0 { panic("no return value specified for Checkout") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, bool) error); ok { - r0 = rf(ctx, directory, branchName, remote) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, bool) error); ok { + r0 = returnFunc(ctx, directory, branchName, remote) } else { r0 = ret.Error(0) } - return r0 } @@ -199,36 +254,56 @@ func (_e *MockGit_Expecter) Checkout(ctx interface{}, directory interface{}, bra func (_c *MockGit_Checkout_Call) Run(run func(ctx context.Context, directory string, branchName string, remote bool)) *MockGit_Checkout_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].(bool)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 bool + if args[3] != nil { + arg3 = args[3].(bool) + } + run( + arg0, + arg1, + arg2, + arg3, + ) }) return _c } -func (_c *MockGit_Checkout_Call) Return(_a0 error) *MockGit_Checkout_Call { - _c.Call.Return(_a0) +func (_c *MockGit_Checkout_Call) Return(err error) *MockGit_Checkout_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_Checkout_Call) RunAndReturn(run func(context.Context, string, string, bool) error) *MockGit_Checkout_Call { +func (_c *MockGit_Checkout_Call) RunAndReturn(run func(ctx context.Context, directory string, branchName string, remote bool) error) *MockGit_Checkout_Call { _c.Call.Return(run) return _c } -// CheckoutRemoteBranch provides a mock function with given fields: ctx, directory, branchName -func (_m *MockGit) CheckoutRemoteBranch(ctx context.Context, directory string, branchName string) error { - ret := _m.Called(ctx, directory, branchName) +// CheckoutRemoteBranch provides a mock function for the type MockGit +func (_mock *MockGit) CheckoutRemoteBranch(ctx context.Context, directory string, branchName string) error { + ret := _mock.Called(ctx, directory, branchName) if len(ret) == 0 { panic("no return value specified for CheckoutRemoteBranch") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) error); ok { - r0 = rf(ctx, directory, branchName) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) error); ok { + r0 = returnFunc(ctx, directory, branchName) } else { r0 = ret.Error(0) } - return r0 } @@ -247,36 +322,51 @@ func (_e *MockGit_Expecter) CheckoutRemoteBranch(ctx interface{}, directory inte func (_c *MockGit_CheckoutRemoteBranch_Call) Run(run func(ctx context.Context, directory string, branchName string)) *MockGit_CheckoutRemoteBranch_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockGit_CheckoutRemoteBranch_Call) Return(_a0 error) *MockGit_CheckoutRemoteBranch_Call { - _c.Call.Return(_a0) +func (_c *MockGit_CheckoutRemoteBranch_Call) Return(err error) *MockGit_CheckoutRemoteBranch_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_CheckoutRemoteBranch_Call) RunAndReturn(run func(context.Context, string, string) error) *MockGit_CheckoutRemoteBranch_Call { +func (_c *MockGit_CheckoutRemoteBranch_Call) RunAndReturn(run func(ctx context.Context, directory string, branchName string) error) *MockGit_CheckoutRemoteBranch_Call { _c.Call.Return(run) return _c } -// Clone provides a mock function with given fields: ctx, repoURL, destination -func (_m *MockGit) Clone(ctx context.Context, repoURL string, destination string) error { - ret := _m.Called(ctx, repoURL, destination) +// Clone provides a mock function for the type MockGit +func (_mock *MockGit) Clone(ctx context.Context, repoURL string, destination string) error { + ret := _mock.Called(ctx, repoURL, destination) if len(ret) == 0 { panic("no return value specified for Clone") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) error); ok { - r0 = rf(ctx, repoURL, destination) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) error); ok { + r0 = returnFunc(ctx, repoURL, destination) } else { r0 = ret.Error(0) } - return r0 } @@ -295,23 +385,40 @@ func (_e *MockGit_Expecter) Clone(ctx interface{}, repoURL interface{}, destinat func (_c *MockGit_Clone_Call) Run(run func(ctx context.Context, repoURL string, destination string)) *MockGit_Clone_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockGit_Clone_Call) Return(_a0 error) *MockGit_Clone_Call { - _c.Call.Return(_a0) +func (_c *MockGit_Clone_Call) Return(err error) *MockGit_Clone_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_Clone_Call) RunAndReturn(run func(context.Context, string, string) error) *MockGit_Clone_Call { +func (_c *MockGit_Clone_Call) RunAndReturn(run func(ctx context.Context, repoURL string, destination string) error) *MockGit_Clone_Call { _c.Call.Return(run) return _c } -// Commit provides a mock function with given fields: ctx, directory, message, ops -func (_m *MockGit) Commit(ctx context.Context, directory string, message string, ops ...v2.CommitOps) error { +// Commit provides a mock function for the type MockGit +func (_mock *MockGit) Commit(ctx context.Context, directory string, message string, ops ...v2.CommitOps) error { + // v2.CommitOps _va := make([]interface{}, len(ops)) for _i := range ops { _va[_i] = ops[_i] @@ -319,19 +426,18 @@ func (_m *MockGit) Commit(ctx context.Context, directory string, message string, var _ca []interface{} _ca = append(_ca, ctx, directory, message) _ca = append(_ca, _va...) - ret := _m.Called(_ca...) + ret := _mock.Called(_ca...) if len(ret) == 0 { panic("no return value specified for Commit") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, ...v2.CommitOps) error); ok { - r0 = rf(ctx, directory, message, ops...) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, ...v2.CommitOps) error); ok { + r0 = returnFunc(ctx, directory, message, ops...) } else { r0 = ret.Error(0) } - return r0 } @@ -352,30 +458,49 @@ func (_e *MockGit_Expecter) Commit(ctx interface{}, directory interface{}, messa func (_c *MockGit_Commit_Call) Run(run func(ctx context.Context, directory string, message string, ops ...v2.CommitOps)) *MockGit_Commit_Call { _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 []v2.CommitOps variadicArgs := make([]v2.CommitOps, len(args)-3) for i, a := range args[3:] { if a != nil { variadicArgs[i] = a.(v2.CommitOps) } } - run(args[0].(context.Context), args[1].(string), args[2].(string), variadicArgs...) + arg3 = variadicArgs + run( + arg0, + arg1, + arg2, + arg3..., + ) }) return _c } -func (_c *MockGit_Commit_Call) Return(_a0 error) *MockGit_Commit_Call { - _c.Call.Return(_a0) +func (_c *MockGit_Commit_Call) Return(err error) *MockGit_Commit_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_Commit_Call) RunAndReturn(run func(context.Context, string, string, ...v2.CommitOps) error) *MockGit_Commit_Call { +func (_c *MockGit_Commit_Call) RunAndReturn(run func(ctx context.Context, directory string, message string, ops ...v2.CommitOps) error) *MockGit_Commit_Call { _c.Call.Return(run) return _c } -// CommitExists provides a mock function with given fields: ctx, directory, hash -func (_m *MockGit) CommitExists(ctx context.Context, directory string, hash string) (bool, error) { - ret := _m.Called(ctx, directory, hash) +// CommitExists provides a mock function for the type MockGit +func (_mock *MockGit) CommitExists(ctx context.Context, directory string, hash string) (bool, error) { + ret := _mock.Called(ctx, directory, hash) if len(ret) == 0 { panic("no return value specified for CommitExists") @@ -383,21 +508,19 @@ func (_m *MockGit) CommitExists(ctx context.Context, directory string, hash stri var r0 bool var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) (bool, error)); ok { - return rf(ctx, directory, hash) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) (bool, error)); ok { + return returnFunc(ctx, directory, hash) } - if rf, ok := ret.Get(0).(func(context.Context, string, string) bool); ok { - r0 = rf(ctx, directory, hash) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) bool); ok { + r0 = returnFunc(ctx, directory, hash) } else { r0 = ret.Get(0).(bool) } - - if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { - r1 = rf(ctx, directory, hash) + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string) error); ok { + r1 = returnFunc(ctx, directory, hash) } else { r1 = ret.Error(1) } - return r0, r1 } @@ -416,36 +539,51 @@ func (_e *MockGit_Expecter) CommitExists(ctx interface{}, directory interface{}, func (_c *MockGit_CommitExists_Call) Run(run func(ctx context.Context, directory string, hash string)) *MockGit_CommitExists_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockGit_CommitExists_Call) Return(_a0 bool, _a1 error) *MockGit_CommitExists_Call { - _c.Call.Return(_a0, _a1) +func (_c *MockGit_CommitExists_Call) Return(b bool, err error) *MockGit_CommitExists_Call { + _c.Call.Return(b, err) return _c } -func (_c *MockGit_CommitExists_Call) RunAndReturn(run func(context.Context, string, string) (bool, error)) *MockGit_CommitExists_Call { +func (_c *MockGit_CommitExists_Call) RunAndReturn(run func(ctx context.Context, directory string, hash string) (bool, error)) *MockGit_CommitExists_Call { _c.Call.Return(run) return _c } -// CreateChildBranch provides a mock function with given fields: ctx, directory, parentBranch, newBranch -func (_m *MockGit) CreateChildBranch(ctx context.Context, directory string, parentBranch string, newBranch string) error { - ret := _m.Called(ctx, directory, parentBranch, newBranch) +// CreateChildBranch provides a mock function for the type MockGit +func (_mock *MockGit) CreateChildBranch(ctx context.Context, directory string, parentBranch string, newBranch string) error { + ret := _mock.Called(ctx, directory, parentBranch, newBranch) if len(ret) == 0 { panic("no return value specified for CreateChildBranch") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, string) error); ok { - r0 = rf(ctx, directory, parentBranch, newBranch) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string) error); ok { + r0 = returnFunc(ctx, directory, parentBranch, newBranch) } else { r0 = ret.Error(0) } - return r0 } @@ -465,36 +603,56 @@ func (_e *MockGit_Expecter) CreateChildBranch(ctx interface{}, directory interfa func (_c *MockGit_CreateChildBranch_Call) Run(run func(ctx context.Context, directory string, parentBranch string, newBranch string)) *MockGit_CreateChildBranch_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + ) }) return _c } -func (_c *MockGit_CreateChildBranch_Call) Return(_a0 error) *MockGit_CreateChildBranch_Call { - _c.Call.Return(_a0) +func (_c *MockGit_CreateChildBranch_Call) Return(err error) *MockGit_CreateChildBranch_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_CreateChildBranch_Call) RunAndReturn(run func(context.Context, string, string, string) error) *MockGit_CreateChildBranch_Call { +func (_c *MockGit_CreateChildBranch_Call) RunAndReturn(run func(ctx context.Context, directory string, parentBranch string, newBranch string) error) *MockGit_CreateChildBranch_Call { _c.Call.Return(run) return _c } -// CreateRemoteBranch provides a mock function with given fields: ctx, directory, branchName, fromRef -func (_m *MockGit) CreateRemoteBranch(ctx context.Context, directory string, branchName string, fromRef string) error { - ret := _m.Called(ctx, directory, branchName, fromRef) +// CreateRemoteBranch provides a mock function for the type MockGit +func (_mock *MockGit) CreateRemoteBranch(ctx context.Context, directory string, branchName string, fromRef string) error { + ret := _mock.Called(ctx, directory, branchName, fromRef) if len(ret) == 0 { panic("no return value specified for CreateRemoteBranch") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, string) error); ok { - r0 = rf(ctx, directory, branchName, fromRef) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string) error); ok { + r0 = returnFunc(ctx, directory, branchName, fromRef) } else { r0 = ret.Error(0) } - return r0 } @@ -514,36 +672,56 @@ func (_e *MockGit_Expecter) CreateRemoteBranch(ctx interface{}, directory interf func (_c *MockGit_CreateRemoteBranch_Call) Run(run func(ctx context.Context, directory string, branchName string, fromRef string)) *MockGit_CreateRemoteBranch_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + ) }) return _c } -func (_c *MockGit_CreateRemoteBranch_Call) Return(_a0 error) *MockGit_CreateRemoteBranch_Call { - _c.Call.Return(_a0) +func (_c *MockGit_CreateRemoteBranch_Call) Return(err error) *MockGit_CreateRemoteBranch_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_CreateRemoteBranch_Call) RunAndReturn(run func(context.Context, string, string, string) error) *MockGit_CreateRemoteBranch_Call { +func (_c *MockGit_CreateRemoteBranch_Call) RunAndReturn(run func(ctx context.Context, directory string, branchName string, fromRef string) error) *MockGit_CreateRemoteBranch_Call { _c.Call.Return(run) return _c } -// CreateRemoteTag provides a mock function with given fields: ctx, directory, branchName, tagName -func (_m *MockGit) CreateRemoteTag(ctx context.Context, directory string, branchName string, tagName string) error { - ret := _m.Called(ctx, directory, branchName, tagName) +// CreateRemoteTag provides a mock function for the type MockGit +func (_mock *MockGit) CreateRemoteTag(ctx context.Context, directory string, branchName string, tagName string) error { + ret := _mock.Called(ctx, directory, branchName, tagName) if len(ret) == 0 { panic("no return value specified for CreateRemoteTag") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, string) error); ok { - r0 = rf(ctx, directory, branchName, tagName) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string) error); ok { + r0 = returnFunc(ctx, directory, branchName, tagName) } else { r0 = ret.Error(0) } - return r0 } @@ -563,36 +741,56 @@ func (_e *MockGit_Expecter) CreateRemoteTag(ctx interface{}, directory interface func (_c *MockGit_CreateRemoteTag_Call) Run(run func(ctx context.Context, directory string, branchName string, tagName string)) *MockGit_CreateRemoteTag_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + ) }) return _c } -func (_c *MockGit_CreateRemoteTag_Call) Return(_a0 error) *MockGit_CreateRemoteTag_Call { - _c.Call.Return(_a0) +func (_c *MockGit_CreateRemoteTag_Call) Return(err error) *MockGit_CreateRemoteTag_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_CreateRemoteTag_Call) RunAndReturn(run func(context.Context, string, string, string) error) *MockGit_CreateRemoteTag_Call { +func (_c *MockGit_CreateRemoteTag_Call) RunAndReturn(run func(ctx context.Context, directory string, branchName string, tagName string) error) *MockGit_CreateRemoteTag_Call { _c.Call.Return(run) return _c } -// Fetch provides a mock function with given fields: ctx, directory, branchName -func (_m *MockGit) Fetch(ctx context.Context, directory string, branchName string) error { - ret := _m.Called(ctx, directory, branchName) +// Fetch provides a mock function for the type MockGit +func (_mock *MockGit) Fetch(ctx context.Context, directory string, branchName string) error { + ret := _mock.Called(ctx, directory, branchName) if len(ret) == 0 { panic("no return value specified for Fetch") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) error); ok { - r0 = rf(ctx, directory, branchName) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) error); ok { + r0 = returnFunc(ctx, directory, branchName) } else { r0 = ret.Error(0) } - return r0 } @@ -611,24 +809,40 @@ func (_e *MockGit_Expecter) Fetch(ctx interface{}, directory interface{}, branch func (_c *MockGit_Fetch_Call) Run(run func(ctx context.Context, directory string, branchName string)) *MockGit_Fetch_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockGit_Fetch_Call) Return(_a0 error) *MockGit_Fetch_Call { - _c.Call.Return(_a0) +func (_c *MockGit_Fetch_Call) Return(err error) *MockGit_Fetch_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_Fetch_Call) RunAndReturn(run func(context.Context, string, string) error) *MockGit_Fetch_Call { +func (_c *MockGit_Fetch_Call) RunAndReturn(run func(ctx context.Context, directory string, branchName string) error) *MockGit_Fetch_Call { _c.Call.Return(run) return _c } -// GetCurrentBranchName provides a mock function with given fields: ctx, directory -func (_m *MockGit) GetCurrentBranchName(ctx context.Context, directory string) (string, error) { - ret := _m.Called(ctx, directory) +// GetCurrentBranchName provides a mock function for the type MockGit +func (_mock *MockGit) GetCurrentBranchName(ctx context.Context, directory string) (string, error) { + ret := _mock.Called(ctx, directory) if len(ret) == 0 { panic("no return value specified for GetCurrentBranchName") @@ -636,21 +850,19 @@ func (_m *MockGit) GetCurrentBranchName(ctx context.Context, directory string) ( var r0 string var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string) (string, error)); ok { - return rf(ctx, directory) + if returnFunc, ok := ret.Get(0).(func(context.Context, string) (string, error)); ok { + return returnFunc(ctx, directory) } - if rf, ok := ret.Get(0).(func(context.Context, string) string); ok { - r0 = rf(ctx, directory) + if returnFunc, ok := ret.Get(0).(func(context.Context, string) string); ok { + r0 = returnFunc(ctx, directory) } else { r0 = ret.Get(0).(string) } - - if rf, ok := ret.Get(1).(func(context.Context, string) error); ok { - r1 = rf(ctx, directory) + if returnFunc, ok := ret.Get(1).(func(context.Context, string) error); ok { + r1 = returnFunc(ctx, directory) } else { r1 = ret.Error(1) } - return r0, r1 } @@ -668,36 +880,46 @@ func (_e *MockGit_Expecter) GetCurrentBranchName(ctx interface{}, directory inte func (_c *MockGit_GetCurrentBranchName_Call) Run(run func(ctx context.Context, directory string)) *MockGit_GetCurrentBranchName_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + run( + arg0, + arg1, + ) }) return _c } -func (_c *MockGit_GetCurrentBranchName_Call) Return(_a0 string, _a1 error) *MockGit_GetCurrentBranchName_Call { - _c.Call.Return(_a0, _a1) +func (_c *MockGit_GetCurrentBranchName_Call) Return(s string, err error) *MockGit_GetCurrentBranchName_Call { + _c.Call.Return(s, err) return _c } -func (_c *MockGit_GetCurrentBranchName_Call) RunAndReturn(run func(context.Context, string) (string, error)) *MockGit_GetCurrentBranchName_Call { +func (_c *MockGit_GetCurrentBranchName_Call) RunAndReturn(run func(ctx context.Context, directory string) (string, error)) *MockGit_GetCurrentBranchName_Call { _c.Call.Return(run) return _c } -// Init provides a mock function with given fields: ctx, directory -func (_m *MockGit) Init(ctx context.Context, directory string) error { - ret := _m.Called(ctx, directory) +// Init provides a mock function for the type MockGit +func (_mock *MockGit) Init(ctx context.Context, directory string) error { + ret := _mock.Called(ctx, directory) if len(ret) == 0 { panic("no return value specified for Init") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string) error); ok { - r0 = rf(ctx, directory) + if returnFunc, ok := ret.Get(0).(func(context.Context, string) error); ok { + r0 = returnFunc(ctx, directory) } else { r0 = ret.Error(0) } - return r0 } @@ -715,23 +937,35 @@ func (_e *MockGit_Expecter) Init(ctx interface{}, directory interface{}) *MockGi func (_c *MockGit_Init_Call) Run(run func(ctx context.Context, directory string)) *MockGit_Init_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + run( + arg0, + arg1, + ) }) return _c } -func (_c *MockGit_Init_Call) Return(_a0 error) *MockGit_Init_Call { - _c.Call.Return(_a0) +func (_c *MockGit_Init_Call) Return(err error) *MockGit_Init_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_Init_Call) RunAndReturn(run func(context.Context, string) error) *MockGit_Init_Call { +func (_c *MockGit_Init_Call) RunAndReturn(run func(ctx context.Context, directory string) error) *MockGit_Init_Call { _c.Call.Return(run) return _c } -// Push provides a mock function with given fields: ctx, directory, refspecs -func (_m *MockGit) Push(ctx context.Context, directory string, refspecs ...string) error { +// Push provides a mock function for the type MockGit +func (_mock *MockGit) Push(ctx context.Context, directory string, refspecs ...string) error { + // string _va := make([]interface{}, len(refspecs)) for _i := range refspecs { _va[_i] = refspecs[_i] @@ -739,19 +973,18 @@ func (_m *MockGit) Push(ctx context.Context, directory string, refspecs ...strin var _ca []interface{} _ca = append(_ca, ctx, directory) _ca = append(_ca, _va...) - ret := _m.Called(_ca...) + ret := _mock.Called(_ca...) if len(ret) == 0 { panic("no return value specified for Push") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, ...string) error); ok { - r0 = rf(ctx, directory, refspecs...) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, ...string) error); ok { + r0 = returnFunc(ctx, directory, refspecs...) } else { r0 = ret.Error(0) } - return r0 } @@ -771,42 +1004,55 @@ func (_e *MockGit_Expecter) Push(ctx interface{}, directory interface{}, refspec func (_c *MockGit_Push_Call) Run(run func(ctx context.Context, directory string, refspecs ...string)) *MockGit_Push_Call { _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 []string variadicArgs := make([]string, len(args)-2) for i, a := range args[2:] { if a != nil { variadicArgs[i] = a.(string) } } - run(args[0].(context.Context), args[1].(string), variadicArgs...) + arg2 = variadicArgs + run( + arg0, + arg1, + arg2..., + ) }) return _c } -func (_c *MockGit_Push_Call) Return(_a0 error) *MockGit_Push_Call { - _c.Call.Return(_a0) +func (_c *MockGit_Push_Call) Return(err error) *MockGit_Push_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_Push_Call) RunAndReturn(run func(context.Context, string, ...string) error) *MockGit_Push_Call { +func (_c *MockGit_Push_Call) RunAndReturn(run func(ctx context.Context, directory string, refspecs ...string) error) *MockGit_Push_Call { _c.Call.Return(run) return _c } -// RemoveBranch provides a mock function with given fields: ctx, directory, branchName -func (_m *MockGit) RemoveBranch(ctx context.Context, directory string, branchName string) error { - ret := _m.Called(ctx, directory, branchName) +// RemoveBranch provides a mock function for the type MockGit +func (_mock *MockGit) RemoveBranch(ctx context.Context, directory string, branchName string) error { + ret := _mock.Called(ctx, directory, branchName) if len(ret) == 0 { panic("no return value specified for RemoveBranch") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) error); ok { - r0 = rf(ctx, directory, branchName) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) error); ok { + r0 = returnFunc(ctx, directory, branchName) } else { r0 = ret.Error(0) } - return r0 } @@ -825,31 +1071,33 @@ func (_e *MockGit_Expecter) RemoveBranch(ctx interface{}, directory interface{}, func (_c *MockGit_RemoveBranch_Call) Run(run func(ctx context.Context, directory string, branchName string)) *MockGit_RemoveBranch_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockGit_RemoveBranch_Call) Return(_a0 error) *MockGit_RemoveBranch_Call { - _c.Call.Return(_a0) +func (_c *MockGit_RemoveBranch_Call) Return(err error) *MockGit_RemoveBranch_Call { + _c.Call.Return(err) return _c } -func (_c *MockGit_RemoveBranch_Call) RunAndReturn(run func(context.Context, string, string) error) *MockGit_RemoveBranch_Call { +func (_c *MockGit_RemoveBranch_Call) RunAndReturn(run func(ctx context.Context, directory string, branchName string) error) *MockGit_RemoveBranch_Call { _c.Call.Return(run) return _c } - -// NewMockGit creates a new instance of MockGit. 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 NewMockGit(t interface { - mock.TestingT - Cleanup(func()) -}) *MockGit { - mock := &MockGit{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/pkg/gitprovider/mocks/gitprojectprovider_mock.go b/pkg/gitprovider/mocks/git_project_provider_generated.mock.go similarity index 54% rename from pkg/gitprovider/mocks/gitprojectprovider_mock.go rename to pkg/gitprovider/mocks/git_project_provider_generated.mock.go index f88d900e..aced6e8a 100644 --- a/pkg/gitprovider/mocks/gitprojectprovider_mock.go +++ b/pkg/gitprovider/mocks/git_project_provider_generated.mock.go @@ -1,14 +1,30 @@ -// Code generated by mockery. DO NOT EDIT. +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify package mocks import ( - context "context" + "context" - gitprovider "github.com/epam/edp-codebase-operator/v2/pkg/gitprovider" + "github.com/epam/edp-codebase-operator/v2/pkg/gitprovider" mock "github.com/stretchr/testify/mock" ) +// NewMockGitProjectProvider creates a new instance of MockGitProjectProvider. 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 NewMockGitProjectProvider(t interface { + mock.TestingT + Cleanup(func()) +}) *MockGitProjectProvider { + mock := &MockGitProjectProvider{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} + // MockGitProjectProvider is an autogenerated mock type for the GitProjectProvider type type MockGitProjectProvider struct { mock.Mock @@ -22,21 +38,20 @@ func (_m *MockGitProjectProvider) EXPECT() *MockGitProjectProvider_Expecter { return &MockGitProjectProvider_Expecter{mock: &_m.Mock} } -// CreateProject provides a mock function with given fields: ctx, gitlabURL, token, fullPath, settings -func (_m *MockGitProjectProvider) CreateProject(ctx context.Context, gitlabURL string, token string, fullPath string, settings gitprovider.RepositorySettings) error { - ret := _m.Called(ctx, gitlabURL, token, fullPath, settings) +// CreateProject provides a mock function for the type MockGitProjectProvider +func (_mock *MockGitProjectProvider) CreateProject(ctx context.Context, gitlabURL string, token string, fullPath string, settings gitprovider.RepositorySettings) error { + ret := _mock.Called(ctx, gitlabURL, token, fullPath, settings) if len(ret) == 0 { panic("no return value specified for CreateProject") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, string, gitprovider.RepositorySettings) error); ok { - r0 = rf(ctx, gitlabURL, token, fullPath, settings) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, gitprovider.RepositorySettings) error); ok { + r0 = returnFunc(ctx, gitlabURL, token, fullPath, settings) } else { r0 = ret.Error(0) } - return r0 } @@ -57,24 +72,50 @@ func (_e *MockGitProjectProvider_Expecter) CreateProject(ctx interface{}, gitlab func (_c *MockGitProjectProvider_CreateProject_Call) Run(run func(ctx context.Context, gitlabURL string, token string, fullPath string, settings gitprovider.RepositorySettings)) *MockGitProjectProvider_CreateProject_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].(string), args[4].(gitprovider.RepositorySettings)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 gitprovider.RepositorySettings + if args[4] != nil { + arg4 = args[4].(gitprovider.RepositorySettings) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + ) }) return _c } -func (_c *MockGitProjectProvider_CreateProject_Call) Return(_a0 error) *MockGitProjectProvider_CreateProject_Call { - _c.Call.Return(_a0) +func (_c *MockGitProjectProvider_CreateProject_Call) Return(err error) *MockGitProjectProvider_CreateProject_Call { + _c.Call.Return(err) return _c } -func (_c *MockGitProjectProvider_CreateProject_Call) RunAndReturn(run func(context.Context, string, string, string, gitprovider.RepositorySettings) error) *MockGitProjectProvider_CreateProject_Call { +func (_c *MockGitProjectProvider_CreateProject_Call) RunAndReturn(run func(ctx context.Context, gitlabURL string, token string, fullPath string, settings gitprovider.RepositorySettings) error) *MockGitProjectProvider_CreateProject_Call { _c.Call.Return(run) return _c } -// ProjectExists provides a mock function with given fields: ctx, gitlabURL, token, projectID -func (_m *MockGitProjectProvider) ProjectExists(ctx context.Context, gitlabURL string, token string, projectID string) (bool, error) { - ret := _m.Called(ctx, gitlabURL, token, projectID) +// ProjectExists provides a mock function for the type MockGitProjectProvider +func (_mock *MockGitProjectProvider) ProjectExists(ctx context.Context, gitlabURL string, token string, projectID string) (bool, error) { + ret := _mock.Called(ctx, gitlabURL, token, projectID) if len(ret) == 0 { panic("no return value specified for ProjectExists") @@ -82,21 +123,19 @@ func (_m *MockGitProjectProvider) ProjectExists(ctx context.Context, gitlabURL s var r0 bool var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, string) (bool, error)); ok { - return rf(ctx, gitlabURL, token, projectID) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string) (bool, error)); ok { + return returnFunc(ctx, gitlabURL, token, projectID) } - if rf, ok := ret.Get(0).(func(context.Context, string, string, string) bool); ok { - r0 = rf(ctx, gitlabURL, token, projectID) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string) bool); ok { + r0 = returnFunc(ctx, gitlabURL, token, projectID) } else { r0 = ret.Get(0).(bool) } - - if rf, ok := ret.Get(1).(func(context.Context, string, string, string) error); ok { - r1 = rf(ctx, gitlabURL, token, projectID) + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string, string) error); ok { + r1 = returnFunc(ctx, gitlabURL, token, projectID) } else { r1 = ret.Error(1) } - return r0, r1 } @@ -116,36 +155,56 @@ func (_e *MockGitProjectProvider_Expecter) ProjectExists(ctx interface{}, gitlab func (_c *MockGitProjectProvider_ProjectExists_Call) Run(run func(ctx context.Context, gitlabURL string, token string, projectID string)) *MockGitProjectProvider_ProjectExists_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + ) }) return _c } -func (_c *MockGitProjectProvider_ProjectExists_Call) Return(_a0 bool, _a1 error) *MockGitProjectProvider_ProjectExists_Call { - _c.Call.Return(_a0, _a1) +func (_c *MockGitProjectProvider_ProjectExists_Call) Return(b bool, err error) *MockGitProjectProvider_ProjectExists_Call { + _c.Call.Return(b, err) return _c } -func (_c *MockGitProjectProvider_ProjectExists_Call) RunAndReturn(run func(context.Context, string, string, string) (bool, error)) *MockGitProjectProvider_ProjectExists_Call { +func (_c *MockGitProjectProvider_ProjectExists_Call) RunAndReturn(run func(ctx context.Context, gitlabURL string, token string, projectID string) (bool, error)) *MockGitProjectProvider_ProjectExists_Call { _c.Call.Return(run) return _c } -// SetDefaultBranch provides a mock function with given fields: ctx, githubURL, token, projectID, branch -func (_m *MockGitProjectProvider) SetDefaultBranch(ctx context.Context, githubURL string, token string, projectID string, branch string) error { - ret := _m.Called(ctx, githubURL, token, projectID, branch) +// SetDefaultBranch provides a mock function for the type MockGitProjectProvider +func (_mock *MockGitProjectProvider) SetDefaultBranch(ctx context.Context, githubURL string, token string, projectID string, branch string) error { + ret := _mock.Called(ctx, githubURL, token, projectID, branch) if len(ret) == 0 { panic("no return value specified for SetDefaultBranch") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, string, string) error); ok { - r0 = rf(ctx, githubURL, token, projectID, branch) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string) error); ok { + r0 = returnFunc(ctx, githubURL, token, projectID, branch) } else { r0 = ret.Error(0) } - return r0 } @@ -166,31 +225,43 @@ func (_e *MockGitProjectProvider_Expecter) SetDefaultBranch(ctx interface{}, git func (_c *MockGitProjectProvider_SetDefaultBranch_Call) Run(run func(ctx context.Context, githubURL string, token string, projectID string, branch string)) *MockGitProjectProvider_SetDefaultBranch_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].(string), args[4].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + ) }) return _c } -func (_c *MockGitProjectProvider_SetDefaultBranch_Call) Return(_a0 error) *MockGitProjectProvider_SetDefaultBranch_Call { - _c.Call.Return(_a0) +func (_c *MockGitProjectProvider_SetDefaultBranch_Call) Return(err error) *MockGitProjectProvider_SetDefaultBranch_Call { + _c.Call.Return(err) return _c } -func (_c *MockGitProjectProvider_SetDefaultBranch_Call) RunAndReturn(run func(context.Context, string, string, string, string) error) *MockGitProjectProvider_SetDefaultBranch_Call { +func (_c *MockGitProjectProvider_SetDefaultBranch_Call) RunAndReturn(run func(ctx context.Context, githubURL string, token string, projectID string, branch string) error) *MockGitProjectProvider_SetDefaultBranch_Call { _c.Call.Return(run) return _c } - -// NewMockGitProjectProvider creates a new instance of MockGitProjectProvider. 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 NewMockGitProjectProvider(t interface { - mock.TestingT - Cleanup(func()) -}) *MockGitProjectProvider { - mock := &MockGitProjectProvider{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/pkg/gitprovider/mocks/git_provider_generated.mock.go b/pkg/gitprovider/mocks/git_provider_generated.mock.go new file mode 100644 index 00000000..bffcd4f4 --- /dev/null +++ b/pkg/gitprovider/mocks/git_provider_generated.mock.go @@ -0,0 +1,704 @@ +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify + +package mocks + +import ( + "context" + + "github.com/epam/edp-codebase-operator/v2/pkg/gitprovider" + mock "github.com/stretchr/testify/mock" +) + +// NewMockGitProvider creates a new instance of MockGitProvider. 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 NewMockGitProvider(t interface { + mock.TestingT + Cleanup(func()) +}) *MockGitProvider { + mock := &MockGitProvider{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} + +// MockGitProvider is an autogenerated mock type for the GitProvider type +type MockGitProvider struct { + mock.Mock +} + +type MockGitProvider_Expecter struct { + mock *mock.Mock +} + +func (_m *MockGitProvider) EXPECT() *MockGitProvider_Expecter { + return &MockGitProvider_Expecter{mock: &_m.Mock} +} + +// CreateProject provides a mock function for the type MockGitProvider +func (_mock *MockGitProvider) CreateProject(ctx context.Context, gitlabURL string, token string, fullPath string, settings gitprovider.RepositorySettings) error { + ret := _mock.Called(ctx, gitlabURL, token, fullPath, settings) + + if len(ret) == 0 { + panic("no return value specified for CreateProject") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, gitprovider.RepositorySettings) error); ok { + r0 = returnFunc(ctx, gitlabURL, token, fullPath, settings) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// MockGitProvider_CreateProject_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateProject' +type MockGitProvider_CreateProject_Call struct { + *mock.Call +} + +// CreateProject is a helper method to define mock.On call +// - ctx context.Context +// - gitlabURL string +// - token string +// - fullPath string +// - settings gitprovider.RepositorySettings +func (_e *MockGitProvider_Expecter) CreateProject(ctx interface{}, gitlabURL interface{}, token interface{}, fullPath interface{}, settings interface{}) *MockGitProvider_CreateProject_Call { + return &MockGitProvider_CreateProject_Call{Call: _e.mock.On("CreateProject", ctx, gitlabURL, token, fullPath, settings)} +} + +func (_c *MockGitProvider_CreateProject_Call) Run(run func(ctx context.Context, gitlabURL string, token string, fullPath string, settings gitprovider.RepositorySettings)) *MockGitProvider_CreateProject_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 gitprovider.RepositorySettings + if args[4] != nil { + arg4 = args[4].(gitprovider.RepositorySettings) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + ) + }) + return _c +} + +func (_c *MockGitProvider_CreateProject_Call) Return(err error) *MockGitProvider_CreateProject_Call { + _c.Call.Return(err) + return _c +} + +func (_c *MockGitProvider_CreateProject_Call) RunAndReturn(run func(ctx context.Context, gitlabURL string, token string, fullPath string, settings gitprovider.RepositorySettings) error) *MockGitProvider_CreateProject_Call { + _c.Call.Return(run) + return _c +} + +// CreateWebHook provides a mock function for the type MockGitProvider +func (_mock *MockGitProvider) CreateWebHook(ctx context.Context, gitProviderURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool) (*gitprovider.WebHook, error) { + ret := _mock.Called(ctx, gitProviderURL, token, projectID, webHookSecret, webHookURL, skipTLS) + + if len(ret) == 0 { + panic("no return value specified for CreateWebHook") + } + + var r0 *gitprovider.WebHook + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, bool) (*gitprovider.WebHook, error)); ok { + return returnFunc(ctx, gitProviderURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, bool) *gitprovider.WebHook); ok { + r0 = returnFunc(ctx, gitProviderURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*gitprovider.WebHook) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string, string, string, string, bool) error); ok { + r1 = returnFunc(ctx, gitProviderURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockGitProvider_CreateWebHook_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateWebHook' +type MockGitProvider_CreateWebHook_Call struct { + *mock.Call +} + +// CreateWebHook is a helper method to define mock.On call +// - ctx context.Context +// - gitProviderURL string +// - token string +// - projectID string +// - webHookSecret string +// - webHookURL string +// - skipTLS bool +func (_e *MockGitProvider_Expecter) CreateWebHook(ctx interface{}, gitProviderURL interface{}, token interface{}, projectID interface{}, webHookSecret interface{}, webHookURL interface{}, skipTLS interface{}) *MockGitProvider_CreateWebHook_Call { + return &MockGitProvider_CreateWebHook_Call{Call: _e.mock.On("CreateWebHook", ctx, gitProviderURL, token, projectID, webHookSecret, webHookURL, skipTLS)} +} + +func (_c *MockGitProvider_CreateWebHook_Call) Run(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool)) *MockGitProvider_CreateWebHook_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + var arg5 string + if args[5] != nil { + arg5 = args[5].(string) + } + var arg6 bool + if args[6] != nil { + arg6 = args[6].(bool) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + arg5, + arg6, + ) + }) + return _c +} + +func (_c *MockGitProvider_CreateWebHook_Call) Return(webHook *gitprovider.WebHook, err error) *MockGitProvider_CreateWebHook_Call { + _c.Call.Return(webHook, err) + return _c +} + +func (_c *MockGitProvider_CreateWebHook_Call) RunAndReturn(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool) (*gitprovider.WebHook, error)) *MockGitProvider_CreateWebHook_Call { + _c.Call.Return(run) + return _c +} + +// CreateWebHookIfNotExists provides a mock function for the type MockGitProvider +func (_mock *MockGitProvider) CreateWebHookIfNotExists(ctx context.Context, githubURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool) (*gitprovider.WebHook, error) { + ret := _mock.Called(ctx, githubURL, token, projectID, webHookSecret, webHookURL, skipTLS) + + if len(ret) == 0 { + panic("no return value specified for CreateWebHookIfNotExists") + } + + var r0 *gitprovider.WebHook + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, bool) (*gitprovider.WebHook, error)); ok { + return returnFunc(ctx, githubURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, bool) *gitprovider.WebHook); ok { + r0 = returnFunc(ctx, githubURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*gitprovider.WebHook) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string, string, string, string, bool) error); ok { + r1 = returnFunc(ctx, githubURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockGitProvider_CreateWebHookIfNotExists_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateWebHookIfNotExists' +type MockGitProvider_CreateWebHookIfNotExists_Call struct { + *mock.Call +} + +// CreateWebHookIfNotExists is a helper method to define mock.On call +// - ctx context.Context +// - githubURL string +// - token string +// - projectID string +// - webHookSecret string +// - webHookURL string +// - skipTLS bool +func (_e *MockGitProvider_Expecter) CreateWebHookIfNotExists(ctx interface{}, githubURL interface{}, token interface{}, projectID interface{}, webHookSecret interface{}, webHookURL interface{}, skipTLS interface{}) *MockGitProvider_CreateWebHookIfNotExists_Call { + return &MockGitProvider_CreateWebHookIfNotExists_Call{Call: _e.mock.On("CreateWebHookIfNotExists", ctx, githubURL, token, projectID, webHookSecret, webHookURL, skipTLS)} +} + +func (_c *MockGitProvider_CreateWebHookIfNotExists_Call) Run(run func(ctx context.Context, githubURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool)) *MockGitProvider_CreateWebHookIfNotExists_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + var arg5 string + if args[5] != nil { + arg5 = args[5].(string) + } + var arg6 bool + if args[6] != nil { + arg6 = args[6].(bool) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + arg5, + arg6, + ) + }) + return _c +} + +func (_c *MockGitProvider_CreateWebHookIfNotExists_Call) Return(webHook *gitprovider.WebHook, err error) *MockGitProvider_CreateWebHookIfNotExists_Call { + _c.Call.Return(webHook, err) + return _c +} + +func (_c *MockGitProvider_CreateWebHookIfNotExists_Call) RunAndReturn(run func(ctx context.Context, githubURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool) (*gitprovider.WebHook, error)) *MockGitProvider_CreateWebHookIfNotExists_Call { + _c.Call.Return(run) + return _c +} + +// DeleteWebHook provides a mock function for the type MockGitProvider +func (_mock *MockGitProvider) DeleteWebHook(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string) error { + ret := _mock.Called(ctx, gitProviderURL, token, projectID, webHookRef) + + if len(ret) == 0 { + panic("no return value specified for DeleteWebHook") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string) error); ok { + r0 = returnFunc(ctx, gitProviderURL, token, projectID, webHookRef) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// MockGitProvider_DeleteWebHook_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteWebHook' +type MockGitProvider_DeleteWebHook_Call struct { + *mock.Call +} + +// DeleteWebHook is a helper method to define mock.On call +// - ctx context.Context +// - gitProviderURL string +// - token string +// - projectID string +// - webHookRef string +func (_e *MockGitProvider_Expecter) DeleteWebHook(ctx interface{}, gitProviderURL interface{}, token interface{}, projectID interface{}, webHookRef interface{}) *MockGitProvider_DeleteWebHook_Call { + return &MockGitProvider_DeleteWebHook_Call{Call: _e.mock.On("DeleteWebHook", ctx, gitProviderURL, token, projectID, webHookRef)} +} + +func (_c *MockGitProvider_DeleteWebHook_Call) Run(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string)) *MockGitProvider_DeleteWebHook_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + ) + }) + return _c +} + +func (_c *MockGitProvider_DeleteWebHook_Call) Return(err error) *MockGitProvider_DeleteWebHook_Call { + _c.Call.Return(err) + return _c +} + +func (_c *MockGitProvider_DeleteWebHook_Call) RunAndReturn(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string) error) *MockGitProvider_DeleteWebHook_Call { + _c.Call.Return(run) + return _c +} + +// GetWebHook provides a mock function for the type MockGitProvider +func (_mock *MockGitProvider) GetWebHook(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string) (*gitprovider.WebHook, error) { + ret := _mock.Called(ctx, gitProviderURL, token, projectID, webHookRef) + + if len(ret) == 0 { + panic("no return value specified for GetWebHook") + } + + var r0 *gitprovider.WebHook + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string) (*gitprovider.WebHook, error)); ok { + return returnFunc(ctx, gitProviderURL, token, projectID, webHookRef) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string) *gitprovider.WebHook); ok { + r0 = returnFunc(ctx, gitProviderURL, token, projectID, webHookRef) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*gitprovider.WebHook) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string, string, string) error); ok { + r1 = returnFunc(ctx, gitProviderURL, token, projectID, webHookRef) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockGitProvider_GetWebHook_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetWebHook' +type MockGitProvider_GetWebHook_Call struct { + *mock.Call +} + +// GetWebHook is a helper method to define mock.On call +// - ctx context.Context +// - gitProviderURL string +// - token string +// - projectID string +// - webHookRef string +func (_e *MockGitProvider_Expecter) GetWebHook(ctx interface{}, gitProviderURL interface{}, token interface{}, projectID interface{}, webHookRef interface{}) *MockGitProvider_GetWebHook_Call { + return &MockGitProvider_GetWebHook_Call{Call: _e.mock.On("GetWebHook", ctx, gitProviderURL, token, projectID, webHookRef)} +} + +func (_c *MockGitProvider_GetWebHook_Call) Run(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string)) *MockGitProvider_GetWebHook_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + ) + }) + return _c +} + +func (_c *MockGitProvider_GetWebHook_Call) Return(webHook *gitprovider.WebHook, err error) *MockGitProvider_GetWebHook_Call { + _c.Call.Return(webHook, err) + return _c +} + +func (_c *MockGitProvider_GetWebHook_Call) RunAndReturn(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string) (*gitprovider.WebHook, error)) *MockGitProvider_GetWebHook_Call { + _c.Call.Return(run) + return _c +} + +// GetWebHooks provides a mock function for the type MockGitProvider +func (_mock *MockGitProvider) GetWebHooks(ctx context.Context, githubURL string, token string, projectID string) ([]*gitprovider.WebHook, error) { + ret := _mock.Called(ctx, githubURL, token, projectID) + + if len(ret) == 0 { + panic("no return value specified for GetWebHooks") + } + + var r0 []*gitprovider.WebHook + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string) ([]*gitprovider.WebHook, error)); ok { + return returnFunc(ctx, githubURL, token, projectID) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string) []*gitprovider.WebHook); ok { + r0 = returnFunc(ctx, githubURL, token, projectID) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]*gitprovider.WebHook) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string, string) error); ok { + r1 = returnFunc(ctx, githubURL, token, projectID) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockGitProvider_GetWebHooks_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetWebHooks' +type MockGitProvider_GetWebHooks_Call struct { + *mock.Call +} + +// GetWebHooks is a helper method to define mock.On call +// - ctx context.Context +// - githubURL string +// - token string +// - projectID string +func (_e *MockGitProvider_Expecter) GetWebHooks(ctx interface{}, githubURL interface{}, token interface{}, projectID interface{}) *MockGitProvider_GetWebHooks_Call { + return &MockGitProvider_GetWebHooks_Call{Call: _e.mock.On("GetWebHooks", ctx, githubURL, token, projectID)} +} + +func (_c *MockGitProvider_GetWebHooks_Call) Run(run func(ctx context.Context, githubURL string, token string, projectID string)) *MockGitProvider_GetWebHooks_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + ) + }) + return _c +} + +func (_c *MockGitProvider_GetWebHooks_Call) Return(webHooks []*gitprovider.WebHook, err error) *MockGitProvider_GetWebHooks_Call { + _c.Call.Return(webHooks, err) + return _c +} + +func (_c *MockGitProvider_GetWebHooks_Call) RunAndReturn(run func(ctx context.Context, githubURL string, token string, projectID string) ([]*gitprovider.WebHook, error)) *MockGitProvider_GetWebHooks_Call { + _c.Call.Return(run) + return _c +} + +// ProjectExists provides a mock function for the type MockGitProvider +func (_mock *MockGitProvider) ProjectExists(ctx context.Context, gitlabURL string, token string, projectID string) (bool, error) { + ret := _mock.Called(ctx, gitlabURL, token, projectID) + + if len(ret) == 0 { + panic("no return value specified for ProjectExists") + } + + var r0 bool + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string) (bool, error)); ok { + return returnFunc(ctx, gitlabURL, token, projectID) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string) bool); ok { + r0 = returnFunc(ctx, gitlabURL, token, projectID) + } else { + r0 = ret.Get(0).(bool) + } + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string, string) error); ok { + r1 = returnFunc(ctx, gitlabURL, token, projectID) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockGitProvider_ProjectExists_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ProjectExists' +type MockGitProvider_ProjectExists_Call struct { + *mock.Call +} + +// ProjectExists is a helper method to define mock.On call +// - ctx context.Context +// - gitlabURL string +// - token string +// - projectID string +func (_e *MockGitProvider_Expecter) ProjectExists(ctx interface{}, gitlabURL interface{}, token interface{}, projectID interface{}) *MockGitProvider_ProjectExists_Call { + return &MockGitProvider_ProjectExists_Call{Call: _e.mock.On("ProjectExists", ctx, gitlabURL, token, projectID)} +} + +func (_c *MockGitProvider_ProjectExists_Call) Run(run func(ctx context.Context, gitlabURL string, token string, projectID string)) *MockGitProvider_ProjectExists_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + ) + }) + return _c +} + +func (_c *MockGitProvider_ProjectExists_Call) Return(b bool, err error) *MockGitProvider_ProjectExists_Call { + _c.Call.Return(b, err) + return _c +} + +func (_c *MockGitProvider_ProjectExists_Call) RunAndReturn(run func(ctx context.Context, gitlabURL string, token string, projectID string) (bool, error)) *MockGitProvider_ProjectExists_Call { + _c.Call.Return(run) + return _c +} + +// SetDefaultBranch provides a mock function for the type MockGitProvider +func (_mock *MockGitProvider) SetDefaultBranch(ctx context.Context, githubURL string, token string, projectID string, branch string) error { + ret := _mock.Called(ctx, githubURL, token, projectID, branch) + + if len(ret) == 0 { + panic("no return value specified for SetDefaultBranch") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string) error); ok { + r0 = returnFunc(ctx, githubURL, token, projectID, branch) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// MockGitProvider_SetDefaultBranch_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'SetDefaultBranch' +type MockGitProvider_SetDefaultBranch_Call struct { + *mock.Call +} + +// SetDefaultBranch is a helper method to define mock.On call +// - ctx context.Context +// - githubURL string +// - token string +// - projectID string +// - branch string +func (_e *MockGitProvider_Expecter) SetDefaultBranch(ctx interface{}, githubURL interface{}, token interface{}, projectID interface{}, branch interface{}) *MockGitProvider_SetDefaultBranch_Call { + return &MockGitProvider_SetDefaultBranch_Call{Call: _e.mock.On("SetDefaultBranch", ctx, githubURL, token, projectID, branch)} +} + +func (_c *MockGitProvider_SetDefaultBranch_Call) Run(run func(ctx context.Context, githubURL string, token string, projectID string, branch string)) *MockGitProvider_SetDefaultBranch_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + ) + }) + return _c +} + +func (_c *MockGitProvider_SetDefaultBranch_Call) Return(err error) *MockGitProvider_SetDefaultBranch_Call { + _c.Call.Return(err) + return _c +} + +func (_c *MockGitProvider_SetDefaultBranch_Call) RunAndReturn(run func(ctx context.Context, githubURL string, token string, projectID string, branch string) error) *MockGitProvider_SetDefaultBranch_Call { + _c.Call.Return(run) + return _c +} diff --git a/pkg/gitprovider/mocks/git_web_hook_provider_generated.mock.go b/pkg/gitprovider/mocks/git_web_hook_provider_generated.mock.go new file mode 100644 index 00000000..0d718fb0 --- /dev/null +++ b/pkg/gitprovider/mocks/git_web_hook_provider_generated.mock.go @@ -0,0 +1,476 @@ +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify + +package mocks + +import ( + "context" + + "github.com/epam/edp-codebase-operator/v2/pkg/gitprovider" + mock "github.com/stretchr/testify/mock" +) + +// NewMockGitWebHookProvider creates a new instance of MockGitWebHookProvider. 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 NewMockGitWebHookProvider(t interface { + mock.TestingT + Cleanup(func()) +}) *MockGitWebHookProvider { + mock := &MockGitWebHookProvider{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} + +// MockGitWebHookProvider is an autogenerated mock type for the GitWebHookProvider type +type MockGitWebHookProvider struct { + mock.Mock +} + +type MockGitWebHookProvider_Expecter struct { + mock *mock.Mock +} + +func (_m *MockGitWebHookProvider) EXPECT() *MockGitWebHookProvider_Expecter { + return &MockGitWebHookProvider_Expecter{mock: &_m.Mock} +} + +// CreateWebHook provides a mock function for the type MockGitWebHookProvider +func (_mock *MockGitWebHookProvider) CreateWebHook(ctx context.Context, gitProviderURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool) (*gitprovider.WebHook, error) { + ret := _mock.Called(ctx, gitProviderURL, token, projectID, webHookSecret, webHookURL, skipTLS) + + if len(ret) == 0 { + panic("no return value specified for CreateWebHook") + } + + var r0 *gitprovider.WebHook + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, bool) (*gitprovider.WebHook, error)); ok { + return returnFunc(ctx, gitProviderURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, bool) *gitprovider.WebHook); ok { + r0 = returnFunc(ctx, gitProviderURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*gitprovider.WebHook) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string, string, string, string, bool) error); ok { + r1 = returnFunc(ctx, gitProviderURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockGitWebHookProvider_CreateWebHook_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateWebHook' +type MockGitWebHookProvider_CreateWebHook_Call struct { + *mock.Call +} + +// CreateWebHook is a helper method to define mock.On call +// - ctx context.Context +// - gitProviderURL string +// - token string +// - projectID string +// - webHookSecret string +// - webHookURL string +// - skipTLS bool +func (_e *MockGitWebHookProvider_Expecter) CreateWebHook(ctx interface{}, gitProviderURL interface{}, token interface{}, projectID interface{}, webHookSecret interface{}, webHookURL interface{}, skipTLS interface{}) *MockGitWebHookProvider_CreateWebHook_Call { + return &MockGitWebHookProvider_CreateWebHook_Call{Call: _e.mock.On("CreateWebHook", ctx, gitProviderURL, token, projectID, webHookSecret, webHookURL, skipTLS)} +} + +func (_c *MockGitWebHookProvider_CreateWebHook_Call) Run(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool)) *MockGitWebHookProvider_CreateWebHook_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + var arg5 string + if args[5] != nil { + arg5 = args[5].(string) + } + var arg6 bool + if args[6] != nil { + arg6 = args[6].(bool) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + arg5, + arg6, + ) + }) + return _c +} + +func (_c *MockGitWebHookProvider_CreateWebHook_Call) Return(webHook *gitprovider.WebHook, err error) *MockGitWebHookProvider_CreateWebHook_Call { + _c.Call.Return(webHook, err) + return _c +} + +func (_c *MockGitWebHookProvider_CreateWebHook_Call) RunAndReturn(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool) (*gitprovider.WebHook, error)) *MockGitWebHookProvider_CreateWebHook_Call { + _c.Call.Return(run) + return _c +} + +// CreateWebHookIfNotExists provides a mock function for the type MockGitWebHookProvider +func (_mock *MockGitWebHookProvider) CreateWebHookIfNotExists(ctx context.Context, githubURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool) (*gitprovider.WebHook, error) { + ret := _mock.Called(ctx, githubURL, token, projectID, webHookSecret, webHookURL, skipTLS) + + if len(ret) == 0 { + panic("no return value specified for CreateWebHookIfNotExists") + } + + var r0 *gitprovider.WebHook + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, bool) (*gitprovider.WebHook, error)); ok { + return returnFunc(ctx, githubURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string, string, bool) *gitprovider.WebHook); ok { + r0 = returnFunc(ctx, githubURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*gitprovider.WebHook) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string, string, string, string, bool) error); ok { + r1 = returnFunc(ctx, githubURL, token, projectID, webHookSecret, webHookURL, skipTLS) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockGitWebHookProvider_CreateWebHookIfNotExists_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateWebHookIfNotExists' +type MockGitWebHookProvider_CreateWebHookIfNotExists_Call struct { + *mock.Call +} + +// CreateWebHookIfNotExists is a helper method to define mock.On call +// - ctx context.Context +// - githubURL string +// - token string +// - projectID string +// - webHookSecret string +// - webHookURL string +// - skipTLS bool +func (_e *MockGitWebHookProvider_Expecter) CreateWebHookIfNotExists(ctx interface{}, githubURL interface{}, token interface{}, projectID interface{}, webHookSecret interface{}, webHookURL interface{}, skipTLS interface{}) *MockGitWebHookProvider_CreateWebHookIfNotExists_Call { + return &MockGitWebHookProvider_CreateWebHookIfNotExists_Call{Call: _e.mock.On("CreateWebHookIfNotExists", ctx, githubURL, token, projectID, webHookSecret, webHookURL, skipTLS)} +} + +func (_c *MockGitWebHookProvider_CreateWebHookIfNotExists_Call) Run(run func(ctx context.Context, githubURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool)) *MockGitWebHookProvider_CreateWebHookIfNotExists_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + var arg5 string + if args[5] != nil { + arg5 = args[5].(string) + } + var arg6 bool + if args[6] != nil { + arg6 = args[6].(bool) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + arg5, + arg6, + ) + }) + return _c +} + +func (_c *MockGitWebHookProvider_CreateWebHookIfNotExists_Call) Return(webHook *gitprovider.WebHook, err error) *MockGitWebHookProvider_CreateWebHookIfNotExists_Call { + _c.Call.Return(webHook, err) + return _c +} + +func (_c *MockGitWebHookProvider_CreateWebHookIfNotExists_Call) RunAndReturn(run func(ctx context.Context, githubURL string, token string, projectID string, webHookSecret string, webHookURL string, skipTLS bool) (*gitprovider.WebHook, error)) *MockGitWebHookProvider_CreateWebHookIfNotExists_Call { + _c.Call.Return(run) + return _c +} + +// DeleteWebHook provides a mock function for the type MockGitWebHookProvider +func (_mock *MockGitWebHookProvider) DeleteWebHook(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string) error { + ret := _mock.Called(ctx, gitProviderURL, token, projectID, webHookRef) + + if len(ret) == 0 { + panic("no return value specified for DeleteWebHook") + } + + var r0 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string) error); ok { + r0 = returnFunc(ctx, gitProviderURL, token, projectID, webHookRef) + } else { + r0 = ret.Error(0) + } + return r0 +} + +// MockGitWebHookProvider_DeleteWebHook_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteWebHook' +type MockGitWebHookProvider_DeleteWebHook_Call struct { + *mock.Call +} + +// DeleteWebHook is a helper method to define mock.On call +// - ctx context.Context +// - gitProviderURL string +// - token string +// - projectID string +// - webHookRef string +func (_e *MockGitWebHookProvider_Expecter) DeleteWebHook(ctx interface{}, gitProviderURL interface{}, token interface{}, projectID interface{}, webHookRef interface{}) *MockGitWebHookProvider_DeleteWebHook_Call { + return &MockGitWebHookProvider_DeleteWebHook_Call{Call: _e.mock.On("DeleteWebHook", ctx, gitProviderURL, token, projectID, webHookRef)} +} + +func (_c *MockGitWebHookProvider_DeleteWebHook_Call) Run(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string)) *MockGitWebHookProvider_DeleteWebHook_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + ) + }) + return _c +} + +func (_c *MockGitWebHookProvider_DeleteWebHook_Call) Return(err error) *MockGitWebHookProvider_DeleteWebHook_Call { + _c.Call.Return(err) + return _c +} + +func (_c *MockGitWebHookProvider_DeleteWebHook_Call) RunAndReturn(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string) error) *MockGitWebHookProvider_DeleteWebHook_Call { + _c.Call.Return(run) + return _c +} + +// GetWebHook provides a mock function for the type MockGitWebHookProvider +func (_mock *MockGitWebHookProvider) GetWebHook(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string) (*gitprovider.WebHook, error) { + ret := _mock.Called(ctx, gitProviderURL, token, projectID, webHookRef) + + if len(ret) == 0 { + panic("no return value specified for GetWebHook") + } + + var r0 *gitprovider.WebHook + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string) (*gitprovider.WebHook, error)); ok { + return returnFunc(ctx, gitProviderURL, token, projectID, webHookRef) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string, string) *gitprovider.WebHook); ok { + r0 = returnFunc(ctx, gitProviderURL, token, projectID, webHookRef) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).(*gitprovider.WebHook) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string, string, string) error); ok { + r1 = returnFunc(ctx, gitProviderURL, token, projectID, webHookRef) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockGitWebHookProvider_GetWebHook_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetWebHook' +type MockGitWebHookProvider_GetWebHook_Call struct { + *mock.Call +} + +// GetWebHook is a helper method to define mock.On call +// - ctx context.Context +// - gitProviderURL string +// - token string +// - projectID string +// - webHookRef string +func (_e *MockGitWebHookProvider_Expecter) GetWebHook(ctx interface{}, gitProviderURL interface{}, token interface{}, projectID interface{}, webHookRef interface{}) *MockGitWebHookProvider_GetWebHook_Call { + return &MockGitWebHookProvider_GetWebHook_Call{Call: _e.mock.On("GetWebHook", ctx, gitProviderURL, token, projectID, webHookRef)} +} + +func (_c *MockGitWebHookProvider_GetWebHook_Call) Run(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string)) *MockGitWebHookProvider_GetWebHook_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + var arg4 string + if args[4] != nil { + arg4 = args[4].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + ) + }) + return _c +} + +func (_c *MockGitWebHookProvider_GetWebHook_Call) Return(webHook *gitprovider.WebHook, err error) *MockGitWebHookProvider_GetWebHook_Call { + _c.Call.Return(webHook, err) + return _c +} + +func (_c *MockGitWebHookProvider_GetWebHook_Call) RunAndReturn(run func(ctx context.Context, gitProviderURL string, token string, projectID string, webHookRef string) (*gitprovider.WebHook, error)) *MockGitWebHookProvider_GetWebHook_Call { + _c.Call.Return(run) + return _c +} + +// GetWebHooks provides a mock function for the type MockGitWebHookProvider +func (_mock *MockGitWebHookProvider) GetWebHooks(ctx context.Context, githubURL string, token string, projectID string) ([]*gitprovider.WebHook, error) { + ret := _mock.Called(ctx, githubURL, token, projectID) + + if len(ret) == 0 { + panic("no return value specified for GetWebHooks") + } + + var r0 []*gitprovider.WebHook + var r1 error + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string) ([]*gitprovider.WebHook, error)); ok { + return returnFunc(ctx, githubURL, token, projectID) + } + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, string) []*gitprovider.WebHook); ok { + r0 = returnFunc(ctx, githubURL, token, projectID) + } else { + if ret.Get(0) != nil { + r0 = ret.Get(0).([]*gitprovider.WebHook) + } + } + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string, string) error); ok { + r1 = returnFunc(ctx, githubURL, token, projectID) + } else { + r1 = ret.Error(1) + } + return r0, r1 +} + +// MockGitWebHookProvider_GetWebHooks_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetWebHooks' +type MockGitWebHookProvider_GetWebHooks_Call struct { + *mock.Call +} + +// GetWebHooks is a helper method to define mock.On call +// - ctx context.Context +// - githubURL string +// - token string +// - projectID string +func (_e *MockGitWebHookProvider_Expecter) GetWebHooks(ctx interface{}, githubURL interface{}, token interface{}, projectID interface{}) *MockGitWebHookProvider_GetWebHooks_Call { + return &MockGitWebHookProvider_GetWebHooks_Call{Call: _e.mock.On("GetWebHooks", ctx, githubURL, token, projectID)} +} + +func (_c *MockGitWebHookProvider_GetWebHooks_Call) Run(run func(ctx context.Context, githubURL string, token string, projectID string)) *MockGitWebHookProvider_GetWebHooks_Call { + _c.Call.Run(func(args mock.Arguments) { + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 string + if args[3] != nil { + arg3 = args[3].(string) + } + run( + arg0, + arg1, + arg2, + arg3, + ) + }) + return _c +} + +func (_c *MockGitWebHookProvider_GetWebHooks_Call) Return(webHooks []*gitprovider.WebHook, err error) *MockGitWebHookProvider_GetWebHooks_Call { + _c.Call.Return(webHooks, err) + return _c +} + +func (_c *MockGitWebHookProvider_GetWebHooks_Call) RunAndReturn(run func(ctx context.Context, githubURL string, token string, projectID string) ([]*gitprovider.WebHook, error)) *MockGitWebHookProvider_GetWebHooks_Call { + _c.Call.Return(run) + return _c +} diff --git a/pkg/tektoncd/mocks/triggertemplatemanager_mock.go b/pkg/tektoncd/mocks/trigger_template_manager_generated.mock.go similarity index 56% rename from pkg/tektoncd/mocks/triggertemplatemanager_mock.go rename to pkg/tektoncd/mocks/trigger_template_manager_generated.mock.go index 7bfd9f80..f3b1da64 100644 --- a/pkg/tektoncd/mocks/triggertemplatemanager_mock.go +++ b/pkg/tektoncd/mocks/trigger_template_manager_generated.mock.go @@ -1,13 +1,29 @@ -// Code generated by mockery. DO NOT EDIT. +// Code generated by mockery; DO NOT EDIT. +// github.com/vektra/mockery +// template: testify package mocks import ( - context "context" + "context" mock "github.com/stretchr/testify/mock" ) +// NewMockTriggerTemplateManager creates a new instance of MockTriggerTemplateManager. 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 NewMockTriggerTemplateManager(t interface { + mock.TestingT + Cleanup(func()) +}) *MockTriggerTemplateManager { + mock := &MockTriggerTemplateManager{} + mock.Mock.Test(t) + + t.Cleanup(func() { mock.AssertExpectations(t) }) + + return mock +} + // MockTriggerTemplateManager is an autogenerated mock type for the TriggerTemplateManager type type MockTriggerTemplateManager struct { mock.Mock @@ -21,21 +37,20 @@ func (_m *MockTriggerTemplateManager) EXPECT() *MockTriggerTemplateManager_Expec return &MockTriggerTemplateManager_Expecter{mock: &_m.Mock} } -// CreatePendingPipelineRun provides a mock function with given fields: ctx, ns, cdStageDeployName, rawPipeRun, appPayload, stage, pipeline, clusterSecret -func (_m *MockTriggerTemplateManager) CreatePendingPipelineRun(ctx context.Context, ns string, cdStageDeployName string, rawPipeRun []byte, appPayload []byte, stage []byte, pipeline []byte, clusterSecret []byte) error { - ret := _m.Called(ctx, ns, cdStageDeployName, rawPipeRun, appPayload, stage, pipeline, clusterSecret) +// CreatePendingPipelineRun provides a mock function for the type MockTriggerTemplateManager +func (_mock *MockTriggerTemplateManager) CreatePendingPipelineRun(ctx context.Context, ns string, cdStageDeployName string, rawPipeRun []byte, appPayload []byte, stage []byte, pipeline []byte, clusterSecret []byte) error { + ret := _mock.Called(ctx, ns, cdStageDeployName, rawPipeRun, appPayload, stage, pipeline, clusterSecret) if len(ret) == 0 { panic("no return value specified for CreatePendingPipelineRun") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, []byte, []byte, []byte, []byte, []byte) error); ok { - r0 = rf(ctx, ns, cdStageDeployName, rawPipeRun, appPayload, stage, pipeline, clusterSecret) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, []byte, []byte, []byte, []byte, []byte) error); ok { + r0 = returnFunc(ctx, ns, cdStageDeployName, rawPipeRun, appPayload, stage, pipeline, clusterSecret) } else { r0 = ret.Error(0) } - return r0 } @@ -59,36 +74,76 @@ func (_e *MockTriggerTemplateManager_Expecter) CreatePendingPipelineRun(ctx inte func (_c *MockTriggerTemplateManager_CreatePendingPipelineRun_Call) Run(run func(ctx context.Context, ns string, cdStageDeployName string, rawPipeRun []byte, appPayload []byte, stage []byte, pipeline []byte, clusterSecret []byte)) *MockTriggerTemplateManager_CreatePendingPipelineRun_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].([]byte), args[4].([]byte), args[5].([]byte), args[6].([]byte), args[7].([]byte)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 []byte + if args[3] != nil { + arg3 = args[3].([]byte) + } + var arg4 []byte + if args[4] != nil { + arg4 = args[4].([]byte) + } + var arg5 []byte + if args[5] != nil { + arg5 = args[5].([]byte) + } + var arg6 []byte + if args[6] != nil { + arg6 = args[6].([]byte) + } + var arg7 []byte + if args[7] != nil { + arg7 = args[7].([]byte) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + arg5, + arg6, + arg7, + ) }) return _c } -func (_c *MockTriggerTemplateManager_CreatePendingPipelineRun_Call) Return(_a0 error) *MockTriggerTemplateManager_CreatePendingPipelineRun_Call { - _c.Call.Return(_a0) +func (_c *MockTriggerTemplateManager_CreatePendingPipelineRun_Call) Return(err error) *MockTriggerTemplateManager_CreatePendingPipelineRun_Call { + _c.Call.Return(err) return _c } -func (_c *MockTriggerTemplateManager_CreatePendingPipelineRun_Call) RunAndReturn(run func(context.Context, string, string, []byte, []byte, []byte, []byte, []byte) error) *MockTriggerTemplateManager_CreatePendingPipelineRun_Call { +func (_c *MockTriggerTemplateManager_CreatePendingPipelineRun_Call) RunAndReturn(run func(ctx context.Context, ns string, cdStageDeployName string, rawPipeRun []byte, appPayload []byte, stage []byte, pipeline []byte, clusterSecret []byte) error) *MockTriggerTemplateManager_CreatePendingPipelineRun_Call { _c.Call.Return(run) return _c } -// CreatePipelineRun provides a mock function with given fields: ctx, ns, cdStageDeployName, rawPipeRun, appPayload, stage, pipeline, clusterSecret -func (_m *MockTriggerTemplateManager) CreatePipelineRun(ctx context.Context, ns string, cdStageDeployName string, rawPipeRun []byte, appPayload []byte, stage []byte, pipeline []byte, clusterSecret []byte) error { - ret := _m.Called(ctx, ns, cdStageDeployName, rawPipeRun, appPayload, stage, pipeline, clusterSecret) +// CreatePipelineRun provides a mock function for the type MockTriggerTemplateManager +func (_mock *MockTriggerTemplateManager) CreatePipelineRun(ctx context.Context, ns string, cdStageDeployName string, rawPipeRun []byte, appPayload []byte, stage []byte, pipeline []byte, clusterSecret []byte) error { + ret := _mock.Called(ctx, ns, cdStageDeployName, rawPipeRun, appPayload, stage, pipeline, clusterSecret) if len(ret) == 0 { panic("no return value specified for CreatePipelineRun") } var r0 error - if rf, ok := ret.Get(0).(func(context.Context, string, string, []byte, []byte, []byte, []byte, []byte) error); ok { - r0 = rf(ctx, ns, cdStageDeployName, rawPipeRun, appPayload, stage, pipeline, clusterSecret) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string, []byte, []byte, []byte, []byte, []byte) error); ok { + r0 = returnFunc(ctx, ns, cdStageDeployName, rawPipeRun, appPayload, stage, pipeline, clusterSecret) } else { r0 = ret.Error(0) } - return r0 } @@ -112,24 +167,65 @@ func (_e *MockTriggerTemplateManager_Expecter) CreatePipelineRun(ctx interface{} func (_c *MockTriggerTemplateManager_CreatePipelineRun_Call) Run(run func(ctx context.Context, ns string, cdStageDeployName string, rawPipeRun []byte, appPayload []byte, stage []byte, pipeline []byte, clusterSecret []byte)) *MockTriggerTemplateManager_CreatePipelineRun_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string), args[3].([]byte), args[4].([]byte), args[5].([]byte), args[6].([]byte), args[7].([]byte)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + var arg3 []byte + if args[3] != nil { + arg3 = args[3].([]byte) + } + var arg4 []byte + if args[4] != nil { + arg4 = args[4].([]byte) + } + var arg5 []byte + if args[5] != nil { + arg5 = args[5].([]byte) + } + var arg6 []byte + if args[6] != nil { + arg6 = args[6].([]byte) + } + var arg7 []byte + if args[7] != nil { + arg7 = args[7].([]byte) + } + run( + arg0, + arg1, + arg2, + arg3, + arg4, + arg5, + arg6, + arg7, + ) }) return _c } -func (_c *MockTriggerTemplateManager_CreatePipelineRun_Call) Return(_a0 error) *MockTriggerTemplateManager_CreatePipelineRun_Call { - _c.Call.Return(_a0) +func (_c *MockTriggerTemplateManager_CreatePipelineRun_Call) Return(err error) *MockTriggerTemplateManager_CreatePipelineRun_Call { + _c.Call.Return(err) return _c } -func (_c *MockTriggerTemplateManager_CreatePipelineRun_Call) RunAndReturn(run func(context.Context, string, string, []byte, []byte, []byte, []byte, []byte) error) *MockTriggerTemplateManager_CreatePipelineRun_Call { +func (_c *MockTriggerTemplateManager_CreatePipelineRun_Call) RunAndReturn(run func(ctx context.Context, ns string, cdStageDeployName string, rawPipeRun []byte, appPayload []byte, stage []byte, pipeline []byte, clusterSecret []byte) error) *MockTriggerTemplateManager_CreatePipelineRun_Call { _c.Call.Return(run) return _c } -// GetRawResourceFromTriggerTemplate provides a mock function with given fields: ctx, triggerTemplateName, ns -func (_m *MockTriggerTemplateManager) GetRawResourceFromTriggerTemplate(ctx context.Context, triggerTemplateName string, ns string) ([]byte, error) { - ret := _m.Called(ctx, triggerTemplateName, ns) +// GetRawResourceFromTriggerTemplate provides a mock function for the type MockTriggerTemplateManager +func (_mock *MockTriggerTemplateManager) GetRawResourceFromTriggerTemplate(ctx context.Context, triggerTemplateName string, ns string) ([]byte, error) { + ret := _mock.Called(ctx, triggerTemplateName, ns) if len(ret) == 0 { panic("no return value specified for GetRawResourceFromTriggerTemplate") @@ -137,23 +233,21 @@ func (_m *MockTriggerTemplateManager) GetRawResourceFromTriggerTemplate(ctx cont var r0 []byte var r1 error - if rf, ok := ret.Get(0).(func(context.Context, string, string) ([]byte, error)); ok { - return rf(ctx, triggerTemplateName, ns) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) ([]byte, error)); ok { + return returnFunc(ctx, triggerTemplateName, ns) } - if rf, ok := ret.Get(0).(func(context.Context, string, string) []byte); ok { - r0 = rf(ctx, triggerTemplateName, ns) + if returnFunc, ok := ret.Get(0).(func(context.Context, string, string) []byte); ok { + r0 = returnFunc(ctx, triggerTemplateName, ns) } else { if ret.Get(0) != nil { r0 = ret.Get(0).([]byte) } } - - if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok { - r1 = rf(ctx, triggerTemplateName, ns) + if returnFunc, ok := ret.Get(1).(func(context.Context, string, string) error); ok { + r1 = returnFunc(ctx, triggerTemplateName, ns) } else { r1 = ret.Error(1) } - return r0, r1 } @@ -172,31 +266,33 @@ func (_e *MockTriggerTemplateManager_Expecter) GetRawResourceFromTriggerTemplate func (_c *MockTriggerTemplateManager_GetRawResourceFromTriggerTemplate_Call) Run(run func(ctx context.Context, triggerTemplateName string, ns string)) *MockTriggerTemplateManager_GetRawResourceFromTriggerTemplate_Call { _c.Call.Run(func(args mock.Arguments) { - run(args[0].(context.Context), args[1].(string), args[2].(string)) + var arg0 context.Context + if args[0] != nil { + arg0 = args[0].(context.Context) + } + var arg1 string + if args[1] != nil { + arg1 = args[1].(string) + } + var arg2 string + if args[2] != nil { + arg2 = args[2].(string) + } + run( + arg0, + arg1, + arg2, + ) }) return _c } -func (_c *MockTriggerTemplateManager_GetRawResourceFromTriggerTemplate_Call) Return(_a0 []byte, _a1 error) *MockTriggerTemplateManager_GetRawResourceFromTriggerTemplate_Call { - _c.Call.Return(_a0, _a1) +func (_c *MockTriggerTemplateManager_GetRawResourceFromTriggerTemplate_Call) Return(bytes []byte, err error) *MockTriggerTemplateManager_GetRawResourceFromTriggerTemplate_Call { + _c.Call.Return(bytes, err) return _c } -func (_c *MockTriggerTemplateManager_GetRawResourceFromTriggerTemplate_Call) RunAndReturn(run func(context.Context, string, string) ([]byte, error)) *MockTriggerTemplateManager_GetRawResourceFromTriggerTemplate_Call { +func (_c *MockTriggerTemplateManager_GetRawResourceFromTriggerTemplate_Call) RunAndReturn(run func(ctx context.Context, triggerTemplateName string, ns string) ([]byte, error)) *MockTriggerTemplateManager_GetRawResourceFromTriggerTemplate_Call { _c.Call.Return(run) return _c } - -// NewMockTriggerTemplateManager creates a new instance of MockTriggerTemplateManager. 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 NewMockTriggerTemplateManager(t interface { - mock.TestingT - Cleanup(func()) -}) *MockTriggerTemplateManager { - mock := &MockTriggerTemplateManager{} - mock.Mock.Test(t) - - t.Cleanup(func() { mock.AssertExpectations(t) }) - - return mock -} diff --git a/pkg/testutils/envtest.go b/pkg/testutils/envtest.go new file mode 100644 index 00000000..9806dc14 --- /dev/null +++ b/pkg/testutils/envtest.go @@ -0,0 +1,34 @@ +package testutils + +import ( + "os" + "path/filepath" + + logf "sigs.k8s.io/controller-runtime/pkg/log" +) + +func GetFirstFoundEnvTestBinaryDir() string { + basePath := filepath.Join("..", "..", "..", "bin", "k8s") + entries, err := os.ReadDir(basePath) + + if err != nil { + logf.Log.Error(err, "Failed to read directory", "path", basePath) + return "" + } + + for _, entry := range entries { + if entry.IsDir() { + return filepath.Join(basePath, entry.Name()) + } + } + + return "" +} + +func GetCRDDirectoryPaths() []string { + return []string{filepath.Join("..", "..", "..", "config", "crd", "bases")} +} + +func GetWebhookCRDDirectoryPaths() []string { + return []string{filepath.Join("..", "..", "config", "crd", "bases")} +} diff --git a/pkg/webhook/webhook_suite_test.go b/pkg/webhook/webhook_suite_test.go index 760320d9..f4e49343 100644 --- a/pkg/webhook/webhook_suite_test.go +++ b/pkg/webhook/webhook_suite_test.go @@ -2,9 +2,7 @@ package webhook import ( "context" - "fmt" "path/filepath" - goruntime "runtime" "testing" . "github.com/onsi/ginkgo/v2" @@ -19,6 +17,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/log/zap" codebaseApi "github.com/epam/edp-codebase-operator/v2/api/v1" + "github.com/epam/edp-codebase-operator/v2/pkg/testutils" ) var ( @@ -44,8 +43,7 @@ var _ = BeforeSuite(func() { testEnv = &envtest.Environment{ CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases")}, ErrorIfCRDPathMissing: true, - BinaryAssetsDirectory: filepath.Join("..", "..", "bin", "k8s", - fmt.Sprintf("1.31.0-%s-%s", goruntime.GOOS, goruntime.GOARCH)), + BinaryAssetsDirectory: testutils.GetFirstFoundEnvTestBinaryDir(), } var err error diff --git a/sonar-project.properties b/sonar-project.properties index 84c25733..f7764896 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,4 +3,4 @@ sonar.projectName=codebase-operator sonar.projectVersion=1.0 sonar.go.coverage.reportPaths=coverage.out sonar.test.inclusions=**/*_test.go -sonar.exclusions=**/build/**,**/config/**,**/deploy-templates/**,**/factory.go,**/mock_*.go,**/*_mock.go,**/.github/**,**/api/**,**/hack/**,**/main.go,**/*generated.go,Dockerfile,**/git/provider.go +sonar.exclusions=**/build/**,**/config/**,**/deploy-templates/**,**/factory.go,**/mock_*.go,**/*.mock.go,**/.github/**,**/api/**,**/hack/**,**/main.go,**/*generated.go,Dockerfile,**/git/provider.go,**/testutils/**