From 438f6534da39409792854af2f91a7641aeb472e7 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Thu, 10 Oct 2024 13:32:18 +0900 Subject: [PATCH 01/20] upgrade kubebuilder to plugin/v4 --- Dockerfile | 6 +- Makefile | 171 +++++++---- PROJECT | 2 +- api/autoscaling/v2/webhook_suite_test.go | 22 +- api/core/v1/webhook_suite_test.go | 22 +- api/v1beta3/webhook_suite_test.go | 22 +- main.go => cmd/main.go | 6 +- cmd/tortoisectl/main.go | 2 +- .../autoscaling.mercari.com_tortoises.yaml | 283 +++++++++--------- config/crd/kustomization.yaml | 4 +- config/default/kustomization.yaml | 10 +- config/default/manager_webhook_patch.yaml | 3 + config/default/metrics_service.yaml | 17 ++ config/default/webhookcainjection_patch.yaml | 10 + config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 5 + config/prometheus/monitor.yaml | 2 + config/rbac/leader_election_role.yaml | 3 + config/rbac/leader_election_role_binding.yaml | 3 + config/rbac/role.yaml | 36 +-- config/rbac/role_binding.yaml | 3 + config/rbac/service_account.yaml | 3 + go.mod | 102 +++---- go.sum | 262 +++++++--------- .../controller}/suite_test.go | 4 +- .../testdata/crd/vpa-v1-crd-gen.yaml | 0 .../deletion-no-delete/before/deployment.yaml | 0 .../deletion-no-delete/before/hpa.yaml | 0 .../deletion-no-delete/before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../deletion-policy-all/before/hpa.yaml | 0 .../deletion-policy-all/before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../after/deployment.yaml | 0 .../after/hpa.yaml | 0 .../after/tortoise.yaml | 0 .../after/vpa-Monitor.yaml | 0 .../before/deployment.yaml | 0 .../before/hpa.yaml | 0 .../before/tortoise.yaml | 0 .../before/vpa-Monitor.yaml | 0 .../controller}/tortoise_controller.go | 2 +- .../controller}/tortoise_controller_test.go | 7 +- 213 files changed, 515 insertions(+), 499 deletions(-) rename main.go => cmd/main.go (98%) create mode 100644 config/default/metrics_service.yaml rename {controllers => internal/controller}/suite_test.go (96%) rename {controllers => internal/controller}/testdata/crd/vpa-v1-crd-gen.yaml (100%) rename {controllers => internal/controller}/testdata/deletion-no-delete/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/deletion-no-delete/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/deletion-no-delete/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/deletion-no-delete/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/deletion-policy-all/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/deletion-policy-all/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/deletion-policy-all/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/deletion-policy-all/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/mutable-autoscalingpolicy-remove-horizontal/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-istio-enabled-pod-working/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-istio-enabled-pod-working/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-istio-enabled-pod-working/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-istio-enabled-pod-working/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-istio-enabled-pod-working/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-istio-enabled-pod-working/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-istio-enabled-pod-working/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-istio-enabled-pod-working/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-working/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-working/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-working/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-working/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-working/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-working/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-working/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-multiple-containers-pod-working/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-backtonormal/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-backtonormal/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-backtonormal/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-backtonormal/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-backtonormal/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-backtonormal/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-backtonormal/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-backtonormal/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-dryrun/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-dryrun/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-dryrun/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-dryrun/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-dryrun/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-dryrun/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-dryrun/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-dryrun/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-during-emergency/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-during-emergency/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-during-emergency/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-during-emergency/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-during-emergency/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-during-emergency/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-during-emergency/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-during-emergency/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-emergency-started/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-emergency-started/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-emergency-started/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-emergency-started/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-emergency-started/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-emergency-started/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-emergency-started/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-emergency-started/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-gathering-data/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-initializing/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-initializing/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-initializing/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-initializing/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-initializing/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-initializing/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-initializing/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-partly-working/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-partly-working/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-partly-working/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-partly-working/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-partly-working/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-partly-working/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-partly-working/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-partly-working/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-too-big/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-too-big/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-too-big/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-too-big/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-too-big/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-too-big/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-too-big/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-too-big/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-working/after/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-working/after/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-working/after/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-working/after/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-working/before/deployment.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-working/before/hpa.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-working/before/tortoise.yaml (100%) rename {controllers => internal/controller}/testdata/reconcile-for-the-single-container-pod-working/before/vpa-Monitor.yaml (100%) rename {controllers => internal/controller}/tortoise_controller.go (99%) rename {controllers => internal/controller}/tortoise_controller_test.go (99%) diff --git a/Dockerfile b/Dockerfile index 541c670a..0d36760b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,13 +10,13 @@ COPY go.sum go.sum RUN go mod download # Copy the go source -COPY main.go main.go +COPY cmd/main.go cmd/main.go COPY api/ api/ -COPY controllers/ controllers/ +COPY internal/controller/ internal/controller/ COPY pkg/ pkg/ # Build -RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o manager main.go +RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o manager cmd/main.go # Use distroless as minimal base image to package the manager binary # Refer to https://github.com/GoogleContainerTools/distroless for more details diff --git a/Makefile b/Makefile index 0a7cf930..a1edfd3f 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,7 @@ - # Image URL to use all building/pushing image targets -IMG ?= ghcr.io/mercari/tortoise:v0.9.0 +IMG ?= ghcr.io/mercari/tortoise:v0.11.0 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. -ENVTEST_K8S_VERSION = 1.27.1 +ENVTEST_K8S_VERSION = 1.31.0 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set) ifeq (,$(shell go env GOBIN)) @@ -11,6 +10,12 @@ else GOBIN=$(shell go env GOBIN) endif +# CONTAINER_TOOL defines the container tool to be used for building images. +# Be aware that the target commands are only tested with Docker which is +# scaffolded by default. However, you might want to replace it to use other +# tools. (i.e. podman) +CONTAINER_TOOL ?= docker + # Setting SHELL to bash allows bash commands to be executed by recipes. # Options are set to exit when a recipe line exits non-zero or a piped command fails. SHELL = /usr/bin/env bash -o pipefail @@ -23,7 +28,7 @@ all: build # The help target prints out all targets with their descriptions organized # beneath their categories. The categories are represented by '##@' and the -# target descriptions by '##'. The awk commands is responsible for reading the +# target descriptions by '##'. The awk command is responsible for reading the # entire set of makefiles included in this invocation, looking for lines of the # file as xyz: ## something, and then pretty-format the target and help. Then, # if there's a line with ##@ something, that gets pretty-printed as a category. @@ -39,11 +44,8 @@ help: ## Display this help. ##@ Development .PHONY: manifests -manifests: kustomize controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. +manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects. $(CONTROLLER_GEN) rbac:roleName=manager-role crd webhook paths="./..." output:crd:artifacts:config=config/crd/bases - cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} - $(KUSTOMIZE) build config/default -o manifests/default - $(KUSTOMIZE) build config/crd -o manifests/crd .PHONY: generate generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations. @@ -57,39 +59,78 @@ fmt: ## Run go fmt against code. vet: ## Run go vet against code. go vet ./... -test: manifests generate fmt vet envtest ginkgo ## Run tests. - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" $(GINKGO) -r --cover --coverprofile cover.out - -.PHONY: test-debug -test-debug: envtest ginkgo - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" DEBUG=true $(GINKGO) -r --fail-fast -v --progress +.PHONY: test +test: manifests generate fmt vet envtest ## Run tests. + KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) --bin-dir $(LOCALBIN) -p path)" go test $$(go list ./... | grep -v /e2e) -coverprofile cover.out + +# TODO(user): To use a different vendor for e2e tests, modify the setup under 'tests/e2e'. +# The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally. +# Prometheus and CertManager are installed by default; skip with: +# - PROMETHEUS_INSTALL_SKIP=true +# - CERT_MANAGER_INSTALL_SKIP=true +.PHONY: test-e2e +test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated environment using Kind. + @command -v kind >/dev/null 2>&1 || { \ + echo "Kind is not installed. Please install Kind manually."; \ + exit 1; \ + } + @kind get clusters | grep -q 'kind' || { \ + echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \ + exit 1; \ + } + go test ./test/e2e/ -v -ginkgo.v -.PHONY: test-update -test-update: envtest ginkgo - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" UPDATE_TESTCASES=true $(GINKGO) -r --fail-fast - -.PHONY: test-tortoisectl -test-tortoisectl: envtest - KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" go test -timeout 30s -v -run Test_TortoiseCtlStop ./cmd/tortoisectl/test/... - -GINKGO ?= $(LOCALBIN)/ginkgo -GINKGO_VERSION ?= v2.1.4 +.PHONY: lint +lint: golangci-lint ## Run golangci-lint linter + $(GOLANGCI_LINT) run -.PHONY: ginkgo -ginkgo: $(GINKGO) ## Download controller-gen locally if necessary. -$(GINKGO): $(LOCALBIN) - test -s $(LOCALBIN)/ginkgo || GOBIN=$(LOCALBIN) go install github.com/onsi/ginkgo/v2/ginkgo@$(GINKGO_VERSION) +.PHONY: lint-fix +lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes + $(GOLANGCI_LINT) run --fix ##@ Build .PHONY: build -build: generate fmt vet ## Build manager binary. - go build -o bin/manager main.go - go build -o bin/tortoisectl cmd/tortoisectl/main.go +build: manifests generate fmt vet ## Build manager binary. + go build -o bin/manager cmd/main.go .PHONY: run run: manifests generate fmt vet ## Run a controller from your host. - go run ./main.go + go run ./cmd/main.go + +# If you wish to build the manager image targeting other platforms you can use the --platform flag. +# (i.e. docker build --platform linux/arm64). However, you must enable docker buildKit for it. +# More info: https://docs.docker.com/develop/develop-images/build_enhancements/ +.PHONY: docker-build +docker-build: ## Build docker image with the manager. + $(CONTAINER_TOOL) build -t ${IMG} . + +.PHONY: docker-push +docker-push: ## Push docker image with the manager. + $(CONTAINER_TOOL) push ${IMG} + +# PLATFORMS defines the target platforms for the manager image be built to provide support to multiple +# architectures. (i.e. make docker-buildx IMG=myregistry/mypoperator:0.0.1). To use this option you need to: +# - be able to use docker buildx. More info: https://docs.docker.com/build/buildx/ +# - have enabled BuildKit. More info: https://docs.docker.com/develop/develop-images/build_enhancements/ +# - be able to push the image to your registry (i.e. if you do not set a valid value via IMG=> then the export will fail) +# To adequately provide solutions that are compatible with multiple platforms, you should consider using this option. +PLATFORMS ?= linux/arm64,linux/amd64,linux/s390x,linux/ppc64le +.PHONY: docker-buildx +docker-buildx: ## Build and push docker image for the manager for cross-platform support + # copy existing Dockerfile and insert --platform=${BUILDPLATFORM} into Dockerfile.cross, and preserve the original Dockerfile + sed -e '1 s/\(^FROM\)/FROM --platform=\$$\{BUILDPLATFORM\}/; t' -e ' 1,// s//FROM --platform=\$$\{BUILDPLATFORM\}/' Dockerfile > Dockerfile.cross + - $(CONTAINER_TOOL) buildx create --name project-v4-builder + $(CONTAINER_TOOL) buildx use project-v4-builder + - $(CONTAINER_TOOL) buildx build --push --platform=$(PLATFORMS) --tag ${IMG} -f Dockerfile.cross . + - $(CONTAINER_TOOL) buildx rm project-v4-builder + rm Dockerfile.cross + +.PHONY: build-installer +build-installer: manifests generate kustomize ## Generate a consolidated YAML with CRDs and deployment. + mkdir -p dist + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} + $(KUSTOMIZE) build config/default > dist/install.yaml ##@ Deployment @@ -99,21 +140,22 @@ endif .PHONY: install install: manifests kustomize ## Install CRDs into the K8s cluster specified in ~/.kube/config. - $(KUSTOMIZE) build config/crd | kubectl apply -f - + $(KUSTOMIZE) build config/crd | $(KUBECTL) apply -f - .PHONY: uninstall uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion. - $(KUSTOMIZE) build config/crd | kubectl delete --ignore-not-found=$(ignore-not-found) -f - + $(KUSTOMIZE) build config/crd | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f - .PHONY: deploy deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config. - $(KUSTOMIZE) build config/default | kubectl apply -f - + cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG} + $(KUSTOMIZE) build config/default | $(KUBECTL) apply -f - .PHONY: undeploy -undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion. - $(KUSTOMIZE) build config/default | kubectl delete --ignore-not-found=$(ignore-not-found) -f - +undeploy: kustomize ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion. + $(KUSTOMIZE) build config/default | $(KUBECTL) delete --ignore-not-found=$(ignore-not-found) -f - -##@ Build Dependencies +##@ Dependencies ## Location to install dependencies to LOCALBIN ?= $(shell pwd)/bin @@ -121,41 +163,50 @@ $(LOCALBIN): mkdir -p $(LOCALBIN) ## Tool Binaries +KUBECTL ?= kubectl KUSTOMIZE ?= $(LOCALBIN)/kustomize CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen ENVTEST ?= $(LOCALBIN)/setup-envtest +GOLANGCI_LINT = $(LOCALBIN)/golangci-lint ## Tool Versions -KUSTOMIZE_VERSION ?= v3.8.7 -CONTROLLER_TOOLS_VERSION ?= v0.13.0 +KUSTOMIZE_VERSION ?= v5.4.3 +CONTROLLER_TOOLS_VERSION ?= v0.16.1 +ENVTEST_VERSION ?= release-0.19 +GOLANGCI_LINT_VERSION ?= v1.59.1 -KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh" .PHONY: kustomize kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary. $(KUSTOMIZE): $(LOCALBIN) - test -s $(LOCALBIN)/kustomize || { curl -s $(KUSTOMIZE_INSTALL_SCRIPT) | bash -s -- $(subst v,,$(KUSTOMIZE_VERSION)) $(LOCALBIN); } + $(call go-install-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v5,$(KUSTOMIZE_VERSION)) .PHONY: controller-gen controller-gen: $(CONTROLLER_GEN) ## Download controller-gen locally if necessary. $(CONTROLLER_GEN): $(LOCALBIN) - test -s $(LOCALBIN)/controller-gen || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION) + $(call go-install-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen,$(CONTROLLER_TOOLS_VERSION)) .PHONY: envtest -envtest: $(ENVTEST) ## Download envtest-setup locally if necessary. +envtest: $(ENVTEST) ## Download setup-envtest locally if necessary. $(ENVTEST): $(LOCALBIN) - test -s $(LOCALBIN)/setup-envtest || GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest - -## Install tools -.PHONY: dependencies -dependencies: - @./scripts/dependencies.sh - -.PHONY: lint -lint: - golangci-lint run $(args) ./... - -.PHONY: lint-fix -lint-fix: - # Note: gci's autofix on golangci-lint was disabled. We can remove this if that is enabled again. - find . -name "*.go" | xargs gci write --section Standard --section Default --section "Prefix(github.com/mercari/tortoise)" --section blank --section dot - @make lint args='--fix -v' cons_args='-v' \ No newline at end of file + $(call go-install-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest,$(ENVTEST_VERSION)) + +.PHONY: golangci-lint +golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary. +$(GOLANGCI_LINT): $(LOCALBIN) + $(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION)) + +# go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist +# $1 - target path with name of binary +# $2 - package url which can be installed +# $3 - specific version of package +define go-install-tool +@[ -f "$(1)-$(3)" ] || { \ +set -e; \ +package=$(2)@$(3) ;\ +echo "Downloading $${package}" ;\ +rm -f $(1) || true ;\ +GOBIN=$(LOCALBIN) go install $${package} ;\ +mv $(1) $(1)-$(3) ;\ +} ;\ +ln -sf $(1)-$(3) $(1) +endef \ No newline at end of file diff --git a/PROJECT b/PROJECT index 5fc2fe1f..f3c19a5a 100644 --- a/PROJECT +++ b/PROJECT @@ -4,7 +4,7 @@ # More info: https://book.kubebuilder.io/reference/project-config.html domain: mercari.com layout: -- go.kubebuilder.io/v3 +- go.kubebuilder.io/v4 projectName: tortoise repo: github.com/mercari/tortoise resources: diff --git a/api/autoscaling/v2/webhook_suite_test.go b/api/autoscaling/v2/webhook_suite_test.go index e0e4f0d4..96cd3e46 100644 --- a/api/autoscaling/v2/webhook_suite_test.go +++ b/api/autoscaling/v2/webhook_suite_test.go @@ -37,8 +37,8 @@ import ( "time" //+kubebuilder:scaffold:imports - admissionv1beta1 "k8s.io/api/admission/v1beta1" - admissionv1 "k8s.io/api/admissionregistration/v1" + admissionv1 "k8s.io/api/admission/v1" + admissionregistrationv1 "k8s.io/api/admissionregistration/v1" autoscalingv1 "k8s.io/api/autoscaling/v1" autoscalingv2 "k8s.io/api/autoscaling/v2" "k8s.io/apimachinery/pkg/runtime" @@ -84,8 +84,8 @@ var _ = BeforeSuite(func() { y, err := os.ReadFile(filepath.Join("..", "..", "..", "config", "webhook", "manifests.yaml")) Expect(err).NotTo(HaveOccurred()) - mutatingWebhookConfig := &admissionv1.MutatingWebhookConfiguration{} - validatingWebhookConfig := &admissionv1.ValidatingWebhookConfiguration{} + mutatingWebhookConfig := &admissionregistrationv1.MutatingWebhookConfiguration{} + validatingWebhookConfig := &admissionregistrationv1.ValidatingWebhookConfiguration{} d := yaml.NewYAMLOrJSONDecoder(bytes.NewReader(y), 4096) err = d.Decode(mutatingWebhookConfig) Expect(err).NotTo(HaveOccurred()) @@ -119,8 +119,8 @@ var _ = BeforeSuite(func() { ErrorIfCRDPathMissing: false, WebhookInstallOptions: envtest.WebhookInstallOptions{ Paths: []string{filepath.Join("..", "..", "..", "config", "webhook", "service.yaml")}, - MutatingWebhooks: []*admissionv1.MutatingWebhookConfiguration{mutatingWebhookConfig}, - ValidatingWebhooks: []*admissionv1.ValidatingWebhookConfiguration{validatingWebhookConfig}, + MutatingWebhooks: []*admissionregistrationv1.MutatingWebhookConfiguration{mutatingWebhookConfig}, + ValidatingWebhooks: []*admissionregistrationv1.ValidatingWebhookConfiguration{validatingWebhookConfig}, }, } @@ -139,7 +139,7 @@ var _ = BeforeSuite(func() { err = autoscalingv2.AddToScheme(scheme) Expect(err).NotTo(HaveOccurred()) - err = admissionv1beta1.AddToScheme(scheme) + err = admissionv1.AddToScheme(scheme) Expect(err).NotTo(HaveOccurred()) //+kubebuilder:scaffold:scheme @@ -151,12 +151,8 @@ var _ = BeforeSuite(func() { // start webhook server using Manager webhookInstallOptions := &testEnv.WebhookInstallOptions mgr, err := ctrl.NewManager(cfg, ctrl.Options{ - Scheme: scheme, - Host: webhookInstallOptions.LocalServingHost, - Port: webhookInstallOptions.LocalServingPort, - CertDir: webhookInstallOptions.LocalServingCertDir, - LeaderElection: false, - MetricsBindAddress: "0", + Scheme: scheme, + LeaderElection: false, }) Expect(err).NotTo(HaveOccurred()) config, err := config.ParseConfig("") diff --git a/api/core/v1/webhook_suite_test.go b/api/core/v1/webhook_suite_test.go index 0a8ed6bb..98152831 100644 --- a/api/core/v1/webhook_suite_test.go +++ b/api/core/v1/webhook_suite_test.go @@ -37,8 +37,8 @@ import ( "time" //+kubebuilder:scaffold:imports - admissionv1beta1 "k8s.io/api/admission/v1beta1" - admissionv1 "k8s.io/api/admissionregistration/v1" + admissionv1 "k8s.io/api/admission/v1beta1" + admissionregistrationv1 "k8s.io/api/admissionregistration/v1" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/yaml" @@ -86,8 +86,8 @@ var _ = BeforeSuite(func() { y, err := os.ReadFile(filepath.Join("..", "..", "..", "config", "webhook", "manifests.yaml")) Expect(err).NotTo(HaveOccurred()) - mutatingWebhookConfig := &admissionv1.MutatingWebhookConfiguration{} - validatingWebhookConfig := &admissionv1.ValidatingWebhookConfiguration{} + mutatingWebhookConfig := &admissionregistrationv1.MutatingWebhookConfiguration{} + validatingWebhookConfig := &admissionregistrationv1.ValidatingWebhookConfiguration{} d := yaml.NewYAMLOrJSONDecoder(bytes.NewReader(y), 4096) err = d.Decode(mutatingWebhookConfig) Expect(err).NotTo(HaveOccurred()) @@ -121,8 +121,8 @@ var _ = BeforeSuite(func() { ErrorIfCRDPathMissing: false, WebhookInstallOptions: envtest.WebhookInstallOptions{ Paths: []string{filepath.Join("..", "..", "..", "config", "webhook", "service.yaml")}, - MutatingWebhooks: []*admissionv1.MutatingWebhookConfiguration{mutatingWebhookConfig}, - ValidatingWebhooks: []*admissionv1.ValidatingWebhookConfiguration{validatingWebhookConfig}, + MutatingWebhooks: []*admissionregistrationv1.MutatingWebhookConfiguration{mutatingWebhookConfig}, + ValidatingWebhooks: []*admissionregistrationv1.ValidatingWebhookConfiguration{validatingWebhookConfig}, }, } @@ -139,7 +139,7 @@ var _ = BeforeSuite(func() { err = clientgoscheme.AddToScheme(scheme) Expect(err).NotTo(HaveOccurred()) - err = admissionv1beta1.AddToScheme(scheme) + err = admissionv1.AddToScheme(scheme) Expect(err).NotTo(HaveOccurred()) //+kubebuilder:scaffold:scheme @@ -151,12 +151,8 @@ var _ = BeforeSuite(func() { // start webhook server using Manager webhookInstallOptions := &testEnv.WebhookInstallOptions mgr, err := ctrl.NewManager(cfg, ctrl.Options{ - Scheme: scheme, - Host: webhookInstallOptions.LocalServingHost, - Port: webhookInstallOptions.LocalServingPort, - CertDir: webhookInstallOptions.LocalServingCertDir, - LeaderElection: false, - MetricsBindAddress: "0", + Scheme: scheme, + LeaderElection: false, }) Expect(err).NotTo(HaveOccurred()) config, err := config.ParseConfig("") diff --git a/api/v1beta3/webhook_suite_test.go b/api/v1beta3/webhook_suite_test.go index b2c00c8e..1d177adf 100644 --- a/api/v1beta3/webhook_suite_test.go +++ b/api/v1beta3/webhook_suite_test.go @@ -37,8 +37,8 @@ import ( "time" //+kubebuilder:scaffold:imports - admissionv1beta1 "k8s.io/api/admission/v1beta1" - admissionv1 "k8s.io/api/admissionregistration/v1" + admissionv1 "k8s.io/api/admission/v1" + admissionregistrationv1 "k8s.io/api/admissionregistration/v1" autoscalingv1 "k8s.io/api/autoscaling/v1" autoscalingv2 "k8s.io/api/autoscaling/v2" "k8s.io/apimachinery/pkg/runtime" @@ -79,8 +79,8 @@ var _ = BeforeSuite(func() { y, err := os.ReadFile(filepath.Join("..", "..", "config", "webhook", "manifests.yaml")) Expect(err).NotTo(HaveOccurred()) - mutatingWebhookConfig := &admissionv1.MutatingWebhookConfiguration{} - validatingWebhookConfig := &admissionv1.ValidatingWebhookConfiguration{} + mutatingWebhookConfig := &admissionregistrationv1.MutatingWebhookConfiguration{} + validatingWebhookConfig := &admissionregistrationv1.ValidatingWebhookConfiguration{} d := yaml.NewYAMLOrJSONDecoder(bytes.NewReader(y), 4096) err = d.Decode(mutatingWebhookConfig) Expect(err).NotTo(HaveOccurred()) @@ -114,8 +114,8 @@ var _ = BeforeSuite(func() { ErrorIfCRDPathMissing: false, WebhookInstallOptions: envtest.WebhookInstallOptions{ Paths: []string{filepath.Join("..", "..", "config", "webhook", "service.yaml")}, - MutatingWebhooks: []*admissionv1.MutatingWebhookConfiguration{mutatingWebhookConfig}, - ValidatingWebhooks: []*admissionv1.ValidatingWebhookConfiguration{validatingWebhookConfig}, + MutatingWebhooks: []*admissionregistrationv1.MutatingWebhookConfiguration{mutatingWebhookConfig}, + ValidatingWebhooks: []*admissionregistrationv1.ValidatingWebhookConfiguration{validatingWebhookConfig}, }, } @@ -134,7 +134,7 @@ var _ = BeforeSuite(func() { err = autoscalingv2.AddToScheme(scheme) Expect(err).NotTo(HaveOccurred()) - err = admissionv1beta1.AddToScheme(scheme) + err = admissionv1.AddToScheme(scheme) Expect(err).NotTo(HaveOccurred()) //+kubebuilder:scaffold:scheme @@ -146,12 +146,8 @@ var _ = BeforeSuite(func() { // start webhook server using Manager webhookInstallOptions := &testEnv.WebhookInstallOptions mgr, err := ctrl.NewManager(cfg, ctrl.Options{ - Scheme: scheme, - Host: webhookInstallOptions.LocalServingHost, - Port: webhookInstallOptions.LocalServingPort, - CertDir: webhookInstallOptions.LocalServingCertDir, - LeaderElection: false, - MetricsBindAddress: "0", + Scheme: scheme, + LeaderElection: false, }) Expect(err).NotTo(HaveOccurred()) diff --git a/main.go b/cmd/main.go similarity index 98% rename from main.go rename to cmd/main.go index e74eb562..c5124b24 100644 --- a/main.go +++ b/cmd/main.go @@ -48,7 +48,7 @@ import ( autoscalingv2 "github.com/mercari/tortoise/api/autoscaling/v2" v1 "github.com/mercari/tortoise/api/core/v1" autoscalingv1beta3 "github.com/mercari/tortoise/api/v1beta3" - "github.com/mercari/tortoise/controllers" + "github.com/mercari/tortoise/internal/controller" "github.com/mercari/tortoise/pkg/config" "github.com/mercari/tortoise/pkg/deployment" "github.com/mercari/tortoise/pkg/hpa" @@ -120,8 +120,6 @@ func main() { mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, - MetricsBindAddress: metricsAddr, - Port: 9443, HealthProbeBindAddress: probeAddr, LeaderElection: enableLeaderElection, LeaderElectionID: "76c4d78a.mercari.com", @@ -160,7 +158,7 @@ func main() { os.Exit(1) } - if err = (&controllers.TortoiseReconciler{ + if err = (&controller.TortoiseReconciler{ Scheme: mgr.GetScheme(), HpaService: hpaService, VpaService: vpaClient, diff --git a/cmd/tortoisectl/main.go b/cmd/tortoisectl/main.go index a03dd8ae..f50d98ae 100644 --- a/cmd/tortoisectl/main.go +++ b/cmd/tortoisectl/main.go @@ -2,6 +2,6 @@ package main import "github.com/mercari/tortoise/cmd/tortoisectl/commands" -func main() { +func tortoisectl() { commands.Execute() } diff --git a/config/crd/bases/autoscaling.mercari.com_tortoises.yaml b/config/crd/bases/autoscaling.mercari.com_tortoises.yaml index 09195403..2cdb75a8 100644 --- a/config/crd/bases/autoscaling.mercari.com_tortoises.yaml +++ b/config/crd/bases/autoscaling.mercari.com_tortoises.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.13.0 + controller-gen.kubebuilder.io/version: v0.16.1 name: tortoises.autoscaling.mercari.com spec: group: autoscaling.mercari.com @@ -27,14 +27,19 @@ spec: description: Tortoise is the Schema for the tortoises API properties: apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + description: |- + APIVersion defines the versioned schema of this representation of an object. + Servers should convert recognized schemas to the latest internal value, and + may reject unrecognized values. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources type: string kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -42,36 +47,29 @@ spec: description: TortoiseSpec defines the desired state of Tortoise properties: autoscalingPolicy: - description: "AutoscalingPolicy is an optional field for specifying - the scaling approach for each resource within each container. \n - There are two primary options for configuring resource scaling within - containers: 1. Allow Tortoise to automatically determine the appropriate - autoscaling policy for each resource. 2. Manually define the autoscaling - policy for each resource. \n For the first option, simply leave - this field unset. In this case, Tortoise will adjust the autoscaling - policies using the following rules: - If .spec.TargetRefs.HorizontalPodAutoscalerName - is not provided, the policies default to \"Horizontal\" for CPU - and \"Vertical\" for memory across all containers. - If .spec.TargetRefs.HorizontalPodAutoscalerName - is specified, resources governed by the referenced Horizontal Pod - Autoscaler will use a \"Horizontal\" policy, while those not managed - by the HPA will use a \"Vertical\" policy. Note that Tortoise supports - only the ContainerResource metric type for HPAs; other metric types - will be disregarded. Additionally, if a ContainerResource metric - is later added to an HPA associated with Tortoise, Tortoise will - automatically update relevant resources to utilize a \"Horizontal\" - policy. - if a container doesn't have the resource request, that - container's autoscaling policy is always set to \"Off\" because - tortoise cannot generate any recommendation without the resource - request. \n With the second option, you must manually specify the - AutoscalingPolicy for the resources of each container within this - field. If policies are defined for some but not all containers or - resources, Tortoise will assign a default \"Off\" policy to unspecified - resources. Be aware that when new containers are introduced to the - workload, the AutoscalingPolicy configuration must be manually updated, - as Tortoise will default to an \"Off\" policy for resources within - the new container, preventing scaling. \n The AutoscalingPolicy - field is mutable; you can modify it at any time, whether from an - empty state to populated or vice versa." + description: |- + AutoscalingPolicy is an optional field for specifying the scaling approach for each resource within each container. + + There are two primary options for configuring resource scaling within containers: + 1. Allow Tortoise to automatically determine the appropriate autoscaling policy for each resource. + 2. Manually define the autoscaling policy for each resource. + + For the first option, simply leave this field unset. In this case, Tortoise will adjust the autoscaling policies using the following rules: + - If .spec.TargetRefs.HorizontalPodAutoscalerName is not provided, the policies default to "Horizontal" for CPU and "Vertical" for memory across all containers. + - If .spec.TargetRefs.HorizontalPodAutoscalerName is specified, resources governed by the referenced Horizontal Pod Autoscaler will use a "Horizontal" policy, + while those not managed by the HPA will use a "Vertical" policy. + Note that Tortoise supports only the ContainerResource metric type for HPAs; other metric types will be disregarded. + Additionally, if a ContainerResource metric is later added to an HPA associated with Tortoise, + Tortoise will automatically update relevant resources to utilize a "Horizontal" policy. + - if a container doesn't have the resource request, that container's autoscaling policy is always set to "Off" + because tortoise cannot generate any recommendation without the resource request. + + With the second option, you must manually specify the AutoscalingPolicy for the resources of each container within this field. + If policies are defined for some but not all containers or resources, Tortoise will assign a default "Off" policy to unspecified resources. + Be aware that when new containers are introduced to the workload, the AutoscalingPolicy configuration must be manually updated, + as Tortoise will default to an "Off" policy for resources within the new container, preventing scaling. + + The AutoscalingPolicy field is mutable; you can modify it at any time, whether from an empty state to populated or vice versa. items: properties: containerName: @@ -84,29 +82,30 @@ spec: - Horizontal - Vertical type: string - description: Policy specifies how each resource is scaled. See - .spec.AutoscalingPolicy for more defail. + description: |- + Policy specifies how each resource is scaled. + See .spec.AutoscalingPolicy for more defail. type: object required: - containerName type: object type: array deletionPolicy: - description: "DeletionPolicy is the policy how the controller deletes - associated HPA and VPA when tortoise is removed. If \"DeleteAll\", - tortoise deletes all associated HPA and VPA, created by tortoise. - If the associated HPA is not created by tortoise, which is associated - by spec.targetRefs.horizontalPodAutoscalerName, tortoise never delete - the HPA. If \"NoDelete\", tortoise doesn't delete any associated - HPA and VPA. \n \"NoDelete\" is the default value." + description: |- + DeletionPolicy is the policy how the controller deletes associated HPA and VPA when tortoise is removed. + If "DeleteAll", tortoise deletes all associated HPA and VPA, created by tortoise. If the associated HPA is not created by tortoise, + which is associated by spec.targetRefs.horizontalPodAutoscalerName, tortoise never delete the HPA. + If "NoDelete", tortoise doesn't delete any associated HPA and VPA. + + "NoDelete" is the default value. enum: - DeleteAll - NoDelete type: string maxReplicas: - description: MaxReplicas is the maximum number of MaxReplicas that - Tortoise will give to HPA. If nil, Tortoise uses the cluster wide - default value, which can be configured via the admin config. + description: |- + MaxReplicas is the maximum number of MaxReplicas that Tortoise will give to HPA. + If nil, Tortoise uses the cluster wide default value, which can be configured via the admin config. format: int32 type: integer resourcePolicy: @@ -124,11 +123,10 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: MaxAllocatedResources is the maximum amount of - resources which is given to the container. Tortoise never - set the resources request on the container more than MaxAllocatedResources. - If nil, Tortoise uses the cluster wide default value, which - can be configured via the admin config. + description: |- + MaxAllocatedResources is the maximum amount of resources which is given to the container. + Tortoise never set the resources request on the container more than MaxAllocatedResources. + If nil, Tortoise uses the cluster wide default value, which can be configured via the admin config. type: object minAllocatedResources: additionalProperties: @@ -137,16 +135,15 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: "MinAllocatedResources is the minimum amount of - resources which is given to the container. Tortoise never - set the resources request on the container less than MinAllocatedResources. - If nil, Tortoise uses the cluster wide default value, which - can be configured via the admin config. \n If empty, tortoise - may reduce the resource request to the value which is suggested - from VPA. Given the VPA suggests values based on the historical - resource usage, you have no choice but to use MinAllocatedResources - to pre-scaling your Pods, for example, when maybe your application - change will result in consuming resources more than the past." + description: |- + MinAllocatedResources is the minimum amount of resources which is given to the container. + Tortoise never set the resources request on the container less than MinAllocatedResources. + If nil, Tortoise uses the cluster wide default value, which can be configured via the admin config. + + If empty, tortoise may reduce the resource request to the value which is suggested from VPA. + Given the VPA suggests values based on the historical resource usage, + you have no choice but to use MinAllocatedResources to pre-scaling your Pods, + for example, when maybe your application change will result in consuming resources more than the past. type: object required: - containerName @@ -156,30 +153,30 @@ spec: description: TargetRefs has reference to involved resources. properties: horizontalPodAutoscalerName: - description: "HorizontalPodAutoscalerName is the name of the target - HPA. You can specify existing HPA only, otherwise Tortoise errors - out. \n The target of this HPA should be the same as the ScaleTargetRef - above. The target HPA should have the ContainerResource type - metric that refers to the container resource utilization. If - HPA has Resource type metrics, Tortoise just removes them because - they'd be conflict with ContainerResource type metrics managed - by Tortoise. If HPA has metrics other than Resource or ContainerResource, - Tortoise just keeps them unless the administrator uses the HPAExternalMetricExclusionRegex - feature. HPAExternalMetricExclusionRegex feature: https://github.com/mercari/tortoise/blob/main/docs/admin-guide.md#hpaexternalmetricexclusionregex - \n Please check out the document for more detail: https://github.com/mercari/tortoise/blob/master/docs/horizontal.md#attach-your-hpa - \n Also, if your Tortoise is in the Auto mode, you should not - edit the target resource utilization in HPA directly. Even if - you edit your HPA in that case, tortoise will overwrite the - HPA with the metrics/values. \n You may also want to see the - document in .spec.autoscalingPolicy to understand how tortoise - with this field decides the autoscaling policy. \n This is an - optional field, and if you don't specify this field, tortoise - will create a new default HPA named `tortoise-hpa-{tortoise - name}`." + description: |- + HorizontalPodAutoscalerName is the name of the target HPA. + You can specify existing HPA only, otherwise Tortoise errors out. + + The target of this HPA should be the same as the ScaleTargetRef above. + The target HPA should have the ContainerResource type metric that refers to the container resource utilization. + If HPA has Resource type metrics, + Tortoise just removes them because they'd be conflict with ContainerResource type metrics managed by Tortoise. + If HPA has metrics other than Resource or ContainerResource, Tortoise just keeps them unless the administrator uses the HPAExternalMetricExclusionRegex feature. + HPAExternalMetricExclusionRegex feature: https://github.com/mercari/tortoise/blob/main/docs/admin-guide.md#hpaexternalmetricexclusionregex + + Please check out the document for more detail: https://github.com/mercari/tortoise/blob/master/docs/horizontal.md#attach-your-hpa + + Also, if your Tortoise is in the Auto mode, you should not edit the target resource utilization in HPA directly. + Even if you edit your HPA in that case, tortoise will overwrite the HPA with the metrics/values. + + You may also want to see the document in .spec.autoscalingPolicy to understand how tortoise with this field decides the autoscaling policy. + + This is an optional field, and if you don't specify this field, tortoise will create a new default HPA named `tortoise-hpa-{tortoise name}`. type: string scaleTargetRef: - description: ScaleTargetRef is the target of scaling. It should - be the same as the target of HPA. + description: |- + ScaleTargetRef is the target of scaling. + It should be the same as the target of HPA. properties: apiVersion: description: apiVersion is the API version of the referent @@ -200,15 +197,15 @@ spec: - scaleTargetRef type: object updateMode: - description: "UpdateMode is how tortoise update resources. If \"Off\", - tortoise generates the recommendations in .Status, but doesn't apply - it actually. If \"Auto\", tortoise generates the recommendations - in .Status, and apply it to resources. If \"Emergency\", tortoise - generates the recommendations in .Status as usual, but increase - replica number high enough value. \"Emergency\" is useful when something - unexpected happens in workloads, and you want to scale up the workload - with high enough resources. See https://github.com/mercari/tortoise/blob/main/docs/emergency.md - to know more about emergency mode. \n \"Off\" is the default value." + description: |- + UpdateMode is how tortoise update resources. + If "Off", tortoise generates the recommendations in .Status, but doesn't apply it actually. + If "Auto", tortoise generates the recommendations in .Status, and apply it to resources. + If "Emergency", tortoise generates the recommendations in .Status as usual, but increase replica number high enough value. + "Emergency" is useful when something unexpected happens in workloads, and you want to scale up the workload with high enough resources. + See https://github.com/mercari/tortoise/blob/main/docs/emergency.md to know more about emergency mode. + + "Off" is the default value. enum: - "Off" - Auto @@ -221,11 +218,11 @@ spec: description: TortoiseStatus defines the observed state of Tortoise properties: autoscalingPolicy: - description: AutoscalingPolicy contains the policy how this tortoise - actually scales each resource. It should basically be the same as - .spec.autoscalingPolicy. But, if .spec.autoscalingPolicy is empty, - tortoise manages/generates the policies generated based on HPA and - the target deployment. + description: |- + AutoscalingPolicy contains the policy how this tortoise actually scales each resource. + It should basically be the same as .spec.autoscalingPolicy. + But, if .spec.autoscalingPolicy is empty, tortoise manages/generates + the policies generated based on HPA and the target deployment. items: properties: containerName: @@ -238,8 +235,9 @@ spec: - Horizontal - Vertical type: string - description: Policy specifies how each resource is scaled. See - .spec.AutoscalingPolicy for more defail. + description: |- + Policy specifies how each resource is scaled. + See .spec.AutoscalingPolicy for more defail. type: object required: - containerName @@ -268,9 +266,9 @@ spec: format: date-time type: string type: object - description: MaxRecommendation is the max recommendation - value from VPA in a certain period (1 week). Tortoise - generates all recommendation based on this MaxRecommendation. + description: |- + MaxRecommendation is the max recommendation value from VPA in a certain period (1 week). + Tortoise generates all recommendation based on this MaxRecommendation. type: object recommendation: additionalProperties: @@ -296,12 +294,11 @@ spec: type: object type: array containerResourceRequests: - description: ContainerResourceRequests has the ideal resource - request for each container. If the mode is Off, it should be - the same value as the current resource request. If the mode - is Auto, it would basically be the same value as the recommendation. - (Tortoise sometimes doesn't immediately apply the recommendation - value to the resource request for the sake of safety.) + description: |- + ContainerResourceRequests has the ideal resource request for each container. + If the mode is Off, it should be the same value as the current resource request. + If the mode is Auto, it would basically be the same value as the recommendation. + (Tortoise sometimes doesn't immediately apply the recommendation value to the resource request for the sake of safety.) items: properties: containerName: @@ -327,8 +324,9 @@ spec: items: properties: lastTransitionTime: - description: lastTransitionTime is the last time the condition - transitioned from one status to another + description: |- + lastTransitionTime is the last time the condition transitioned from + one status to another format: date-time type: string lastUpdateTime: @@ -336,8 +334,9 @@ spec: format: date-time type: string message: - description: message is a human-readable explanation containing - details about the transition + description: |- + message is a human-readable explanation containing details about + the transition type: string reason: description: reason is the reason for the condition's last @@ -369,8 +368,9 @@ spec: additionalProperties: properties: lastTransitionTime: - description: lastTransitionTime is the last time the condition - transitioned from one status to another + description: |- + lastTransitionTime is the last time the condition transitioned from + one status to another format: date-time type: string phase: @@ -391,7 +391,8 @@ spec: horizontal: properties: maxReplicas: - description: MaxReplicas has the recommendation of maxReplicas. + description: |- + MaxReplicas has the recommendation of maxReplicas. It contains the recommendations for each time slot. items: properties: @@ -407,15 +408,16 @@ spec: format: date-time type: string value: - description: Value is the recommendation value. It's - calculated every reconciliation, and updated if the - calculated recommendation value is more than the current - recommendation value on tortoise. + description: |- + Value is the recommendation value. + It's calculated every reconciliation, + and updated if the calculated recommendation value is more than the current recommendation value on tortoise. format: int32 type: integer weekday: - description: WeekDay is the day of the week. If empty, - it means it applies to all days of the week. + description: |- + WeekDay is the day of the week. + If empty, it means it applies to all days of the week. type: string required: - from @@ -425,7 +427,8 @@ spec: type: object type: array minReplicas: - description: MinReplicas has the recommendation of minReplicas. + description: |- + MinReplicas has the recommendation of minReplicas. It contains the recommendations for each time slot. items: properties: @@ -441,15 +444,16 @@ spec: format: date-time type: string value: - description: Value is the recommendation value. It's - calculated every reconciliation, and updated if the - calculated recommendation value is more than the current - recommendation value on tortoise. + description: |- + Value is the recommendation value. + It's calculated every reconciliation, + and updated if the calculated recommendation value is more than the current recommendation value on tortoise. format: int32 type: integer weekday: - description: WeekDay is the day of the week. If empty, - it means it applies to all days of the week. + description: |- + WeekDay is the day of the week. + If empty, it means it applies to all days of the week. type: string required: - from @@ -491,15 +495,14 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: "RecommendedResource is the recommendation - calculated by the tortoise. \n If AutoscalingPolicy - is vertical, it's the same value as the VPA suggests. - If AutoscalingPolicy is horizontal, it's basically - the same value as the current resource request. But, - when the number of replicas are too small or too large, - tortoise may try to increase/decrease the amount of - resources given to the container, so that the number - of replicas won't be very small or very large." + description: |- + RecommendedResource is the recommendation calculated by the tortoise. + + If AutoscalingPolicy is vertical, it's the same value as the VPA suggests. + If AutoscalingPolicy is horizontal, it's basically the same value as the current resource request. + But, when the number of replicas are too small or too large, + tortoise may try to increase/decrease the amount of resources given to the container, + so that the number of replicas won't be very small or very large. type: object containerName: description: ContainerName is the name of target container. diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml index 2307667d..eb60ab0c 100644 --- a/config/crd/kustomization.yaml +++ b/config/crd/kustomization.yaml @@ -8,13 +8,13 @@ resources: patchesStrategicMerge: # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix. # patches here are for enabling the conversion webhook for each CRD -- patches/webhook_in_tortoises.yaml +- path: patches/webhook_in_tortoises.yaml #- patches/webhook_in_tortoises.yaml #+kubebuilder:scaffold:crdkustomizewebhookpatch # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix. # patches here are for enabling the CA injection for each CRD -- patches/cainjection_in_tortoises.yaml +- path: patches/cainjection_in_tortoises.yaml #- patches/cainjection_in_tortoises.yaml #+kubebuilder:scaffold:crdkustomizecainjectionpatch diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml index bbbe440d..7cd3874a 100644 --- a/config/default/kustomization.yaml +++ b/config/default/kustomization.yaml @@ -18,6 +18,7 @@ bases: - ../manager - ../webhook - ../certmanager +- metrics_service.yaml # [PROMETHEUS] To enable prometheus monitor, uncomment all sections with 'PROMETHEUS'. #- ../prometheus @@ -25,14 +26,17 @@ patchesStrategicMerge: # Protect the /metrics endpoint by putting it behind auth. # If you want your controller-manager to expose the /metrics # endpoint w/o any authn/z, please comment the following line. -- manager_auth_proxy_patch.yaml +- path: manager_auth_proxy_patch.yaml # Mount the controller config file for loading manager configurations # through a ComponentConfig type #- manager_config_patch.yaml -- manager_webhook_patch.yaml -- webhookcainjection_patch.yaml +- path: manager_webhook_patch.yaml +- path: webhookcainjection_patch.yaml +- path: manager_metrics_patch.yaml + target: + kind: Deployment # the following config is for teaching kustomize how to do var substitution vars: diff --git a/config/default/manager_webhook_patch.yaml b/config/default/manager_webhook_patch.yaml index 738de350..4e3dc475 100644 --- a/config/default/manager_webhook_patch.yaml +++ b/config/default/manager_webhook_patch.yaml @@ -3,6 +3,9 @@ kind: Deployment metadata: name: controller-manager namespace: system + labels: + app.kubernetes.io/name: tortoise + app.kubernetes.io/managed-by: kustomize spec: template: spec: diff --git a/config/default/metrics_service.yaml b/config/default/metrics_service.yaml new file mode 100644 index 00000000..7034ceaa --- /dev/null +++ b/config/default/metrics_service.yaml @@ -0,0 +1,17 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + control-plane: controller-manager + app.kubernetes.io/name: tortoise + app.kubernetes.io/managed-by: kustomize + name: controller-manager-metrics-service + namespace: system +spec: + ports: + - name: https + port: 8443 + protocol: TCP + targetPort: 8443 + selector: + control-plane: controller-manager \ No newline at end of file diff --git a/config/default/webhookcainjection_patch.yaml b/config/default/webhookcainjection_patch.yaml index 02ab515d..2fdc24c1 100644 --- a/config/default/webhookcainjection_patch.yaml +++ b/config/default/webhookcainjection_patch.yaml @@ -3,6 +3,9 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: + labels: + app.kubernetes.io/name: tortoise + app.kubernetes.io/managed-by: kustomize name: mutating-webhook-configuration annotations: cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) @@ -10,6 +13,13 @@ metadata: apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: + labels: + app.kubernetes.io/name: validatingwebhookconfiguration + app.kubernetes.io/instance: validating-webhook-configuration + app.kubernetes.io/component: webhook + app.kubernetes.io/created-by: tortoise + app.kubernetes.io/part-of: tortoise + app.kubernetes.io/managed-by: kustomize name: validating-webhook-configuration annotations: cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index e76984ab..f109803c 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: ghcr.io/mercari/tortoise - newTag: v0.9.0 + newTag: v0.11.2 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 878ad486..718b572d 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -3,6 +3,8 @@ kind: Namespace metadata: labels: control-plane: controller-manager + app.kubernetes.io/name: tortoise + app.kubernetes.io/managed-by: kustomize name: system --- apiVersion: apps/v1 @@ -12,6 +14,8 @@ metadata: namespace: system labels: control-plane: controller-manager + app.kubernetes.io/name: tortoise + app.kubernetes.io/managed-by: kustomize spec: selector: matchLabels: @@ -38,6 +42,7 @@ spec: - /manager args: - --leader-elect + - --health-probe-bind-address=:8081 image: controller:latest name: manager securityContext: diff --git a/config/prometheus/monitor.yaml b/config/prometheus/monitor.yaml index d19136ae..63f7895c 100644 --- a/config/prometheus/monitor.yaml +++ b/config/prometheus/monitor.yaml @@ -5,6 +5,8 @@ kind: ServiceMonitor metadata: labels: control-plane: controller-manager + app.kubernetes.io/name: tortoise + app.kubernetes.io/managed-by: kustomize name: controller-manager-metrics-monitor namespace: system spec: diff --git a/config/rbac/leader_election_role.yaml b/config/rbac/leader_election_role.yaml index 4190ec80..a6d3cca8 100644 --- a/config/rbac/leader_election_role.yaml +++ b/config/rbac/leader_election_role.yaml @@ -2,6 +2,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: + labels: + app.kubernetes.io/name: tortoise + app.kubernetes.io/managed-by: kustomize name: leader-election-role rules: - apiGroups: diff --git a/config/rbac/leader_election_role_binding.yaml b/config/rbac/leader_election_role_binding.yaml index 1d1321ed..fb069ae2 100644 --- a/config/rbac/leader_election_role_binding.yaml +++ b/config/rbac/leader_election_role_binding.yaml @@ -1,6 +1,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: + labels: + app.kubernetes.io/name: tortoise + app.kubernetes.io/managed-by: kustomize name: leader-election-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index fe3e7558..b01a62dc 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -8,6 +8,8 @@ rules: - apps resources: - daemonsets + - replicasets + - statefulsets verbs: - get - list @@ -24,22 +26,6 @@ rules: - patch - update - watch -- apiGroups: - - apps - resources: - - replicasets - verbs: - - get - - list - - watch -- apiGroups: - - apps - resources: - - statefulsets - verbs: - - get - - list - - watch - apiGroups: - autoscaling resources: @@ -56,17 +42,6 @@ rules: - autoscaling.k8s.io resources: - verticalpodautoscalers - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - autoscaling.k8s.io - resources: - verticalpodautoscalers/status verbs: - create @@ -106,13 +81,6 @@ rules: - batch resources: - cronjobs - verbs: - - get - - list - - watch -- apiGroups: - - batch - resources: - jobs verbs: - get diff --git a/config/rbac/role_binding.yaml b/config/rbac/role_binding.yaml index 2070ede4..a114c8bb 100644 --- a/config/rbac/role_binding.yaml +++ b/config/rbac/role_binding.yaml @@ -1,6 +1,9 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: + labels: + app.kubernetes.io/name: tortoise + app.kubernetes.io/managed-by: kustomize name: manager-rolebinding roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/config/rbac/service_account.yaml b/config/rbac/service_account.yaml index 7cd6025b..85860fa8 100644 --- a/config/rbac/service_account.yaml +++ b/config/rbac/service_account.yaml @@ -1,5 +1,8 @@ apiVersion: v1 kind: ServiceAccount metadata: + labels: + app.kubernetes.io/name: tortoise + app.kubernetes.io/managed-by: kustomize name: controller-manager namespace: system diff --git a/go.mod b/go.mod index bcba95cd..1c97e284 100644 --- a/go.mod +++ b/go.mod @@ -1,85 +1,85 @@ module github.com/mercari/tortoise -go 1.21 +go 1.22.0 -toolchain go1.21.4 +toolchain go1.23.1 require ( - github.com/go-logr/zapr v1.2.4 - github.com/google/go-cmp v0.5.9 - github.com/onsi/ginkgo/v2 v2.9.5 - github.com/onsi/gomega v1.27.7 - github.com/prometheus/client_golang v1.17.0 - go.uber.org/zap v1.24.0 + github.com/go-logr/zapr v1.3.0 + github.com/google/go-cmp v0.6.0 + github.com/onsi/ginkgo/v2 v2.19.0 + github.com/onsi/gomega v1.33.1 + github.com/prometheus/client_golang v1.20.4 + go.uber.org/zap v1.27.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.28.3 - k8s.io/apimachinery v0.28.3 + k8s.io/api v0.31.1 + k8s.io/apimachinery v0.31.1 // Need to use this commit, to use the controller fetcher. k8s.io/autoscaler/vertical-pod-autoscaler v0.10.1-0.20240119175703-2bba2bac1635 - k8s.io/client-go v0.28.3 - k8s.io/klog/v2 v2.100.1 - k8s.io/utils v0.0.0-20240102154912-e7106e64919e - sigs.k8s.io/controller-runtime v0.15.1 - sigs.k8s.io/yaml v1.3.0 + k8s.io/client-go v0.31.1 + k8s.io/klog/v2 v2.130.1 + k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 + sigs.k8s.io/controller-runtime v0.19.0 + sigs.k8s.io/yaml v1.4.0 ) require ( github.com/kyokomi/emoji/v2 v2.2.12 - github.com/spf13/cobra v1.7.0 + github.com/spf13/cobra v1.8.1 ) require ( github.com/beorn7/perks v1.0.1 // indirect - github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful/v3 v3.10.2 // indirect - github.com/evanphx/json-patch v4.12.0+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.6.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect - github.com/go-logr/logr v1.2.4 // indirect - github.com/go-openapi/jsonpointer v0.19.6 // indirect - github.com/go-openapi/jsonreference v0.20.2 // indirect - github.com/go-openapi/swag v0.22.3 // indirect - github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // 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/evanphx/json-patch v5.9.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect + github.com/go-task/slim-sprig/v3 v3.0.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.3 // indirect + github.com/golang/protobuf v1.5.4 // indirect github.com/google/gnostic-models v0.6.8 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect - github.com/google/uuid v1.3.0 // indirect - github.com/imdario/mergo v0.3.15 // indirect + github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.17.9 // indirect github.com/mailru/easyjson v0.7.7 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.4 // 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/pkg/errors v0.9.1 // indirect - github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect - github.com/prometheus/common v0.44.0 // indirect - github.com/prometheus/procfs v0.11.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/spf13/pflag v1.0.5 // indirect - github.com/stretchr/testify v1.8.3 // indirect - go.uber.org/atomic v1.10.0 // indirect + github.com/x448/float16 v0.8.4 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/net v0.20.0 // indirect - golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sys v0.16.0 // indirect - golang.org/x/term v0.16.0 // indirect - golang.org/x/text v0.14.0 // indirect - golang.org/x/time v0.4.0 // indirect - golang.org/x/tools v0.9.1 // indirect - gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect - google.golang.org/appengine v1.6.7 // indirect - google.golang.org/protobuf v1.33.0 // indirect + golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/net v0.29.0 // indirect + golang.org/x/oauth2 v0.23.0 // indirect + golang.org/x/sys v0.25.0 // indirect + golang.org/x/term v0.24.0 // indirect + golang.org/x/text v0.18.0 // indirect + golang.org/x/time v0.6.0 // indirect + golang.org/x/tools v0.24.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect + gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apiextensions-apiserver v0.27.2 // indirect - k8s.io/component-base v0.28.3 // indirect - k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect + k8s.io/apiextensions-apiserver v0.31.1 // indirect + k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) diff --git a/go.sum b/go.sum index 7f340175..40b5f63a 100644 --- a/go.sum +++ b/go.sum @@ -1,85 +1,74 @@ -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= -github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE= -github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= -github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= -github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo= -github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA= -github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= -github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= -github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= -github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= -github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= -github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU= +github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls= +github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= +github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= +github.com/go-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/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= +github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= +github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= +github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= +github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= +github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4= +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-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE= github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/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/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM= -github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= +github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= 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/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA= +github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -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/kyokomi/emoji/v2 v2.2.12 h1:sSVA5nH9ebR3Zji1o31wu3yOwD1zKXQA2z0zUyeit60= github.com/kyokomi/emoji/v2 v2.2.12/go.mod h1:JUcn42DTdsXJo1SWanHh4HKDEyPaR5CqkmoirZZP9qE= github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= -github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -87,155 +76,122 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q= -github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k= -github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= -github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA= +github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= -github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= -github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 h1:v7DLqVdK4VrYkVD5diGdl4sxJurKJEMnODWRJlxV9oM= -github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= -github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY= -github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY= -github.com/prometheus/procfs v0.11.1 h1:xRC8Iq1yyca5ypa9n1EZnWZkt7dwcoRPQwX/5gwaUuI= -github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/y0/p/ScXhY= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v1.20.4 h1:Tgh3Yr67PaOv/uTqloMsCEdeuFTatm5zIq5+qNN23vI= +github.com/prometheus/client_golang v1.20.4/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= +github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E= +github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY= +github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc= +github.com/prometheus/common v0.55.0/go.mod h1:2SECS4xJG1kd8XF9IcM1gMX6510RAEL65zxzNImwdc8= +github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= +github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.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.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= -github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= -go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= -go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= -go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= +go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8= +golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= -golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= -golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo= +golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0= +golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs= +golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE= -golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY= +golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34= +golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.24.0 h1:Mh5cbb+Zk2hqqXNO7S1iTjEphVL+jb8ZWaqh/g+JWkM= +golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/time v0.4.0 h1:Z81tqI5ddIoXDPvVQ7/7CC9TnLM7ubaFG2qXYd5BbYY= -golang.org/x/time v0.4.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224= +golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= +golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo= -golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24= +golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ= 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= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc= -gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= +gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= +gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4= +gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.28.3 h1:Gj1HtbSdB4P08C8rs9AR94MfSGpRhJgsS+GF9V26xMM= -k8s.io/api v0.28.3/go.mod h1:MRCV/jr1dW87/qJnZ57U5Pak65LGmQVkKTzf3AtKFHc= -k8s.io/apiextensions-apiserver v0.27.2 h1:iwhyoeS4xj9Y7v8YExhUwbVuBhMr3Q4bd/laClBV6Bo= -k8s.io/apiextensions-apiserver v0.27.2/go.mod h1:Oz9UdvGguL3ULgRdY9QMUzL2RZImotgxvGjdWRq6ZXQ= -k8s.io/apimachinery v0.28.3 h1:B1wYx8txOaCQG0HmYF6nbpU8dg6HvA06x5tEffvOe7A= -k8s.io/apimachinery v0.28.3/go.mod h1:uQTKmIqs+rAYaq+DFaoD2X7pcjLOqbQX2AOiO0nIpb8= +k8s.io/api v0.31.1 h1:Xe1hX/fPW3PXYYv8BlozYqw63ytA92snr96zMW9gWTU= +k8s.io/api v0.31.1/go.mod h1:sbN1g6eY6XVLeqNsZGLnI5FwVseTrZX7Fv3O26rhAaI= +k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= +k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ= +k8s.io/apimachinery v0.31.1 h1:mhcUBbj7KUjaVhyXILglcVjuS4nYXiwC+KKFBgIVy7U= +k8s.io/apimachinery v0.31.1/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= k8s.io/autoscaler/vertical-pod-autoscaler v0.10.1-0.20240119175703-2bba2bac1635 h1:HdBci+VKLE2+qp+TF6p+M/NxdqGDto6lxaQOGJW6uMQ= k8s.io/autoscaler/vertical-pod-autoscaler v0.10.1-0.20240119175703-2bba2bac1635/go.mod h1:9rkcHM+tg3H2Qujk+9zyyYtuBXJieliujL1ITKGx9p0= -k8s.io/client-go v0.28.3 h1:2OqNb72ZuTZPKCl+4gTKvqao0AMOl9f3o2ijbAj3LI4= -k8s.io/client-go v0.28.3/go.mod h1:LTykbBp9gsA7SwqirlCXBWtK0guzfhpoW4qSm7i9dxo= -k8s.io/component-base v0.28.3 h1:rDy68eHKxq/80RiMb2Ld/tbH8uAE75JdCqJyi6lXMzI= -k8s.io/component-base v0.28.3/go.mod h1:fDJ6vpVNSk6cRo5wmDa6eKIG7UlIQkaFmZN2fYgIUD8= -k8s.io/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg= -k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ= -k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM= -k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= -k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -sigs.k8s.io/controller-runtime v0.15.1 h1:9UvgKD4ZJGcj24vefUFgZFP3xej/3igL9BsOUTb/+4c= -sigs.k8s.io/controller-runtime v0.15.1/go.mod h1:7ngYvp1MLT+9GeZ+6lH3LOlcHkp/+tzA/fmHa4iq9kk= +k8s.io/client-go v0.31.1 h1:f0ugtWSbWpxHR7sjVpQwuvw9a3ZKLXX0u0itkFXufb0= +k8s.io/client-go v0.31.1/go.mod h1:sKI8871MJN2OyeqRlmA4W4KM9KBdBUpDLu/43eGemCg= +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-20240903163716-9e1beecbcb38 h1:1dWzkmJrrprYvjGwh9kEUxmcUV/CtNU8QM7h1FLWQOo= +k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38/go.mod h1:coRQXBK9NxO98XUv3ZD6AK3xzHCxV6+b7lrquKwaKzA= +k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI= +k8s.io/utils v0.0.0-20240921022957-49e7df575cb6/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC0ji/Q= +sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +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/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/controllers/suite_test.go b/internal/controller/suite_test.go similarity index 96% rename from controllers/suite_test.go rename to internal/controller/suite_test.go index 652ed475..1e0ee6f4 100644 --- a/controllers/suite_test.go +++ b/internal/controller/suite_test.go @@ -23,7 +23,7 @@ SOFTWARE. */ -package controllers +package controller import ( "fmt" @@ -73,7 +73,7 @@ var _ = BeforeSuite(func() { By("bootstrapping test environment") testEnv = &envtest.Environment{ - CRDDirectoryPaths: []string{filepath.Join("..", "config", "crd", "bases"), filepath.Join("testdata", "crd")}, + CRDDirectoryPaths: []string{filepath.Join("..", "..", "config", "crd", "bases"), filepath.Join("testdata", "crd")}, ErrorIfCRDPathMissing: true, } diff --git a/controllers/testdata/crd/vpa-v1-crd-gen.yaml b/internal/controller/testdata/crd/vpa-v1-crd-gen.yaml similarity index 100% rename from controllers/testdata/crd/vpa-v1-crd-gen.yaml rename to internal/controller/testdata/crd/vpa-v1-crd-gen.yaml diff --git a/controllers/testdata/deletion-no-delete/before/deployment.yaml b/internal/controller/testdata/deletion-no-delete/before/deployment.yaml similarity index 100% rename from controllers/testdata/deletion-no-delete/before/deployment.yaml rename to internal/controller/testdata/deletion-no-delete/before/deployment.yaml diff --git a/controllers/testdata/deletion-no-delete/before/hpa.yaml b/internal/controller/testdata/deletion-no-delete/before/hpa.yaml similarity index 100% rename from controllers/testdata/deletion-no-delete/before/hpa.yaml rename to internal/controller/testdata/deletion-no-delete/before/hpa.yaml diff --git a/controllers/testdata/deletion-no-delete/before/tortoise.yaml b/internal/controller/testdata/deletion-no-delete/before/tortoise.yaml similarity index 100% rename from controllers/testdata/deletion-no-delete/before/tortoise.yaml rename to internal/controller/testdata/deletion-no-delete/before/tortoise.yaml diff --git a/controllers/testdata/deletion-no-delete/before/vpa-Monitor.yaml b/internal/controller/testdata/deletion-no-delete/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/deletion-no-delete/before/vpa-Monitor.yaml rename to internal/controller/testdata/deletion-no-delete/before/vpa-Monitor.yaml diff --git a/controllers/testdata/deletion-policy-all/before/deployment.yaml b/internal/controller/testdata/deletion-policy-all/before/deployment.yaml similarity index 100% rename from controllers/testdata/deletion-policy-all/before/deployment.yaml rename to internal/controller/testdata/deletion-policy-all/before/deployment.yaml diff --git a/controllers/testdata/deletion-policy-all/before/hpa.yaml b/internal/controller/testdata/deletion-policy-all/before/hpa.yaml similarity index 100% rename from controllers/testdata/deletion-policy-all/before/hpa.yaml rename to internal/controller/testdata/deletion-policy-all/before/hpa.yaml diff --git a/controllers/testdata/deletion-policy-all/before/tortoise.yaml b/internal/controller/testdata/deletion-policy-all/before/tortoise.yaml similarity index 100% rename from controllers/testdata/deletion-policy-all/before/tortoise.yaml rename to internal/controller/testdata/deletion-policy-all/before/tortoise.yaml diff --git a/controllers/testdata/deletion-policy-all/before/vpa-Monitor.yaml b/internal/controller/testdata/deletion-policy-all/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/deletion-policy-all/before/vpa-Monitor.yaml rename to internal/controller/testdata/deletion-policy-all/before/vpa-Monitor.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/deployment.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/deployment.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/deployment.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/deployment.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/hpa.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/hpa.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/hpa.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/hpa.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/tortoise.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/vpa-Monitor.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/vpa-Monitor.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/after/vpa-Monitor.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/deployment.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/deployment.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/deployment.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/deployment.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/hpa.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/hpa.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/hpa.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/hpa.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/tortoise.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/vpa-Monitor.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/vpa-Monitor.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-add-another-horizontal/before/vpa-Monitor.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/deployment.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/deployment.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/deployment.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/deployment.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/hpa.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/hpa.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/hpa.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/hpa.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/tortoise.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/tortoise.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/tortoise.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/tortoise.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/vpa-Monitor.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/vpa-Monitor.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/after/vpa-Monitor.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/deployment.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/deployment.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/deployment.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/deployment.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/tortoise.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/tortoise.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/tortoise.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/tortoise.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/vpa-Monitor.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/vpa-Monitor.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-no-hpa-and-add-horizontal/before/vpa-Monitor.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/deployment.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/deployment.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/deployment.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/deployment.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/hpa.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/hpa.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/hpa.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/hpa.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/tortoise.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/tortoise.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/tortoise.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/tortoise.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/vpa-Monitor.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/vpa-Monitor.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/after/vpa-Monitor.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/deployment.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/deployment.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/deployment.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/deployment.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/hpa.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/hpa.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/hpa.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/hpa.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/tortoise.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/tortoise.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/tortoise.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/tortoise.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/vpa-Monitor.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/vpa-Monitor.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal-2/before/vpa-Monitor.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/deployment.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/after/deployment.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/deployment.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/after/deployment.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/after/tortoise.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/vpa-Monitor.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/after/vpa-Monitor.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/after/vpa-Monitor.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/deployment.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/before/deployment.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/deployment.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/before/deployment.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/hpa.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/before/hpa.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/hpa.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/before/hpa.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/before/tortoise.yaml diff --git a/controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/vpa-Monitor.yaml b/internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/mutable-autoscalingpolicy-remove-horizontal/before/vpa-Monitor.yaml rename to internal/controller/testdata/mutable-autoscalingpolicy-remove-horizontal/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-istio-enabled-pod-working/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-istio-enabled-pod-working/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-istio-enabled-pod-working/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-istio-enabled-pod-working/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-istio-enabled-pod-working/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-istio-enabled-pod-working/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-istio-enabled-pod-working/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-istio-enabled-pod-working/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-istio-enabled-pod-working/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-istio-enabled-pod-working/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-istio-enabled-pod-working/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-istio-enabled-pod-working/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-istio-enabled-pod-working/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-istio-enabled-pod-working/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-istio-enabled-pod-working/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-istio-enabled-pod-working/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-istio-enabled-pod-working/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-off/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-all-vertical/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-during-emergency/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-emergency-started/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-one-off/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-suggested-too-small/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-working/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-working/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-working/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-working/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-working/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-working/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-working/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-multiple-containers-pod-working/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-multiple-containers-pod-working/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-multiple-containers-pod-working/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-backtonormal/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-backtonormal/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-dryrun/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-dryrun/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-dryrun/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-dryrun/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-dryrun/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-dryrun/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-dryrun/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-dryrun/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-dryrun/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-dryrun/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-during-emergency/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-during-emergency/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-emergency-started/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-emergency-started/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data-finished/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-gathering-data/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-gathering-data/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-hpa-changed/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-initializing/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-initializing/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-initializing/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-initializing/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-initializing/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-initializing/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-initializing/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-initializing/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-initializing/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-initializing/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-initializing/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-initializing/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-initializing/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-initializing/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-initializing/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-partly-working/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-partly-working/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-partly-working/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-partly-working/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-partly-working/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-partly-working/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-partly-working/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-partly-working/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-partly-working/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-partly-working/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-partly-working/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-partly-working/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-partly-working/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-partly-working/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-partly-working/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-partly-working/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-partly-working/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-too-big/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-too-big/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-too-big/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-too-big/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-too-big/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-too-big/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-too-big/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-too-big/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-too-big/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-too-big/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-too-big/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-too-big/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-too-big/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-too-big/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-too-big/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-too-big/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-too-big/before/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-working/after/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-working/after/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-working/after/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-working/after/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-working/after/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-working/after/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-working/after/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-working/after/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-working/after/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-working/after/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-working/after/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-working/after/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-working/after/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-working/after/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-working/after/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-working/after/vpa-Monitor.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-working/before/deployment.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-working/before/deployment.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-working/before/deployment.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-working/before/deployment.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-working/before/hpa.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-working/before/hpa.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-working/before/hpa.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-working/before/hpa.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-working/before/tortoise.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-working/before/tortoise.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-working/before/tortoise.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-working/before/tortoise.yaml diff --git a/controllers/testdata/reconcile-for-the-single-container-pod-working/before/vpa-Monitor.yaml b/internal/controller/testdata/reconcile-for-the-single-container-pod-working/before/vpa-Monitor.yaml similarity index 100% rename from controllers/testdata/reconcile-for-the-single-container-pod-working/before/vpa-Monitor.yaml rename to internal/controller/testdata/reconcile-for-the-single-container-pod-working/before/vpa-Monitor.yaml diff --git a/controllers/tortoise_controller.go b/internal/controller/tortoise_controller.go similarity index 99% rename from controllers/tortoise_controller.go rename to internal/controller/tortoise_controller.go index 5770d647..f08fe9f6 100644 --- a/controllers/tortoise_controller.go +++ b/internal/controller/tortoise_controller.go @@ -23,7 +23,7 @@ SOFTWARE. */ -package controllers +package controller import ( "context" diff --git a/controllers/tortoise_controller_test.go b/internal/controller/tortoise_controller_test.go similarity index 99% rename from controllers/tortoise_controller_test.go rename to internal/controller/tortoise_controller_test.go index 38ad1468..72fd16a9 100644 --- a/controllers/tortoise_controller_test.go +++ b/internal/controller/tortoise_controller_test.go @@ -1,4 +1,4 @@ -package controllers +package controller import ( "context" @@ -233,9 +233,8 @@ func removeUnnecessaryFields(rawdata []byte) ([]byte, error) { func startController(ctx context.Context) func() { mgr, err := ctrl.NewManager(cfg, ctrl.Options{ - Scheme: scheme, - LeaderElection: false, - MetricsBindAddress: "0", + Scheme: scheme, + LeaderElection: false, }) Expect(err).ShouldNot(HaveOccurred()) From df7b7b87a987363f06ffd2cbb95c478d952fec28 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Fri, 11 Oct 2024 00:11:56 +0900 Subject: [PATCH 02/20] add test utils --- api/autoscaling/v2/webhook_suite_test.go | 8 ++ api/core/v1/webhook_suite_test.go | 8 ++ api/v1beta3/webhook_suite_test.go | 8 ++ test/e2e/e2e_suite_test.go | 32 ++++++ test/e2e/e2e_test.go | 122 ++++++++++++++++++++ test/utils/utils.go | 140 +++++++++++++++++++++++ 6 files changed, 318 insertions(+) create mode 100644 test/e2e/e2e_suite_test.go create mode 100644 test/e2e/e2e_test.go create mode 100644 test/utils/utils.go diff --git a/api/autoscaling/v2/webhook_suite_test.go b/api/autoscaling/v2/webhook_suite_test.go index 96cd3e46..8115e02e 100644 --- a/api/autoscaling/v2/webhook_suite_test.go +++ b/api/autoscaling/v2/webhook_suite_test.go @@ -50,6 +50,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" + metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" + "sigs.k8s.io/controller-runtime/pkg/webhook" "github.com/mercari/tortoise/api/v1beta3" "github.com/mercari/tortoise/pkg/config" @@ -153,6 +155,12 @@ var _ = BeforeSuite(func() { mgr, err := ctrl.NewManager(cfg, ctrl.Options{ Scheme: scheme, LeaderElection: false, + WebhookServer: webhook.NewServer(webhook.Options{ + Host: webhookInstallOptions.LocalServingHost, + Port: webhookInstallOptions.LocalServingPort, + CertDir: webhookInstallOptions.LocalServingCertDir, + }), + Metrics: metricsserver.Options{BindAddress: "0"}, }) Expect(err).NotTo(HaveOccurred()) config, err := config.ParseConfig("") diff --git a/api/core/v1/webhook_suite_test.go b/api/core/v1/webhook_suite_test.go index 98152831..043e47cb 100644 --- a/api/core/v1/webhook_suite_test.go +++ b/api/core/v1/webhook_suite_test.go @@ -52,6 +52,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" + metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" + "sigs.k8s.io/controller-runtime/pkg/webhook" "github.com/mercari/tortoise/api/v1beta3" "github.com/mercari/tortoise/pkg/config" @@ -153,6 +155,12 @@ var _ = BeforeSuite(func() { mgr, err := ctrl.NewManager(cfg, ctrl.Options{ Scheme: scheme, LeaderElection: false, + WebhookServer: webhook.NewServer(webhook.Options{ + Host: webhookInstallOptions.LocalServingHost, + Port: webhookInstallOptions.LocalServingPort, + CertDir: webhookInstallOptions.LocalServingCertDir, + }), + Metrics: metricsserver.Options{BindAddress: "0"}, }) Expect(err).NotTo(HaveOccurred()) config, err := config.ParseConfig("") diff --git a/api/v1beta3/webhook_suite_test.go b/api/v1beta3/webhook_suite_test.go index 1d177adf..bc284c1d 100644 --- a/api/v1beta3/webhook_suite_test.go +++ b/api/v1beta3/webhook_suite_test.go @@ -50,6 +50,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/envtest" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" + metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" + "sigs.k8s.io/controller-runtime/pkg/webhook" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -148,6 +150,12 @@ var _ = BeforeSuite(func() { mgr, err := ctrl.NewManager(cfg, ctrl.Options{ Scheme: scheme, LeaderElection: false, + WebhookServer: webhook.NewServer(webhook.Options{ + Host: webhookInstallOptions.LocalServingHost, + Port: webhookInstallOptions.LocalServingPort, + CertDir: webhookInstallOptions.LocalServingCertDir, + }), + Metrics: metricsserver.Options{BindAddress: "0"}, }) Expect(err).NotTo(HaveOccurred()) diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go new file mode 100644 index 00000000..9b3d64f0 --- /dev/null +++ b/test/e2e/e2e_suite_test.go @@ -0,0 +1,32 @@ +/* +Copyright 2024. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package e2e + +import ( + "fmt" + "testing" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" +) + +// Run e2e tests using the Ginkgo runner. +func TestE2E(t *testing.T) { + RegisterFailHandler(Fail) + _, _ = fmt.Fprintf(GinkgoWriter, "Starting tortoise-migration-2 suite\n") + RunSpecs(t, "e2e suite") +} diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go new file mode 100644 index 00000000..de79eb38 --- /dev/null +++ b/test/e2e/e2e_test.go @@ -0,0 +1,122 @@ +/* +Copyright 2024. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package e2e + +import ( + "fmt" + "os/exec" + "time" + + . "github.com/onsi/ginkgo/v2" + . "github.com/onsi/gomega" + + "mercari.com/tortoise/test/utils" +) + +const namespace = "tortoise-migration-2-system" + +var _ = Describe("controller", Ordered, func() { + BeforeAll(func() { + By("installing prometheus operator") + Expect(utils.InstallPrometheusOperator()).To(Succeed()) + + By("installing the cert-manager") + Expect(utils.InstallCertManager()).To(Succeed()) + + By("creating manager namespace") + cmd := exec.Command("kubectl", "create", "ns", namespace) + _, _ = utils.Run(cmd) + }) + + AfterAll(func() { + By("uninstalling the Prometheus manager bundle") + utils.UninstallPrometheusOperator() + + By("uninstalling the cert-manager bundle") + utils.UninstallCertManager() + + By("removing manager namespace") + cmd := exec.Command("kubectl", "delete", "ns", namespace) + _, _ = utils.Run(cmd) + }) + + Context("Operator", func() { + It("should run successfully", func() { + var controllerPodName string + var err error + + // projectimage stores the name of the image used in the example + var projectimage = "example.com/tortoise-migration-2:v0.0.1" + + By("building the manager(Operator) image") + cmd := exec.Command("make", "docker-build", fmt.Sprintf("IMG=%s", projectimage)) + _, err = utils.Run(cmd) + ExpectWithOffset(1, err).NotTo(HaveOccurred()) + + By("loading the the manager(Operator) image on Kind") + err = utils.LoadImageToKindClusterWithName(projectimage) + ExpectWithOffset(1, err).NotTo(HaveOccurred()) + + By("installing CRDs") + cmd = exec.Command("make", "install") + _, err = utils.Run(cmd) + ExpectWithOffset(1, err).NotTo(HaveOccurred()) + + By("deploying the controller-manager") + cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", projectimage)) + _, err = utils.Run(cmd) + ExpectWithOffset(1, err).NotTo(HaveOccurred()) + + By("validating that the controller-manager pod is running as expected") + verifyControllerUp := func() error { + // Get pod name + + cmd = exec.Command("kubectl", "get", + "pods", "-l", "control-plane=controller-manager", + "-o", "go-template={{ range .items }}"+ + "{{ if not .metadata.deletionTimestamp }}"+ + "{{ .metadata.name }}"+ + "{{ \"\\n\" }}{{ end }}{{ end }}", + "-n", namespace, + ) + + podOutput, err := utils.Run(cmd) + ExpectWithOffset(2, err).NotTo(HaveOccurred()) + podNames := utils.GetNonEmptyLines(string(podOutput)) + if len(podNames) != 1 { + return fmt.Errorf("expect 1 controller pods running, but got %d", len(podNames)) + } + controllerPodName = podNames[0] + ExpectWithOffset(2, controllerPodName).Should(ContainSubstring("controller-manager")) + + // Validate pod status + cmd = exec.Command("kubectl", "get", + "pods", controllerPodName, "-o", "jsonpath={.status.phase}", + "-n", namespace, + ) + status, err := utils.Run(cmd) + ExpectWithOffset(2, err).NotTo(HaveOccurred()) + if string(status) != "Running" { + return fmt.Errorf("controller pod in %s status", status) + } + return nil + } + EventuallyWithOffset(1, verifyControllerUp, time.Minute, time.Second).Should(Succeed()) + + }) + }) +}) diff --git a/test/utils/utils.go b/test/utils/utils.go new file mode 100644 index 00000000..6b96ab5d --- /dev/null +++ b/test/utils/utils.go @@ -0,0 +1,140 @@ +/* +Copyright 2024. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package utils + +import ( + "fmt" + "os" + "os/exec" + "strings" + + . "github.com/onsi/ginkgo/v2" //nolint:golint,revive +) + +const ( + prometheusOperatorVersion = "v0.72.0" + prometheusOperatorURL = "https://github.com/prometheus-operator/prometheus-operator/" + + "releases/download/%s/bundle.yaml" + + certmanagerVersion = "v1.14.4" + certmanagerURLTmpl = "https://github.com/jetstack/cert-manager/releases/download/%s/cert-manager.yaml" +) + +func warnError(err error) { + _, _ = fmt.Fprintf(GinkgoWriter, "warning: %v\n", err) +} + +// InstallPrometheusOperator installs the prometheus Operator to be used to export the enabled metrics. +func InstallPrometheusOperator() error { + url := fmt.Sprintf(prometheusOperatorURL, prometheusOperatorVersion) + cmd := exec.Command("kubectl", "create", "-f", url) + _, err := Run(cmd) + return err +} + +// Run executes the provided command within this context +func Run(cmd *exec.Cmd) ([]byte, error) { + dir, _ := GetProjectDir() + cmd.Dir = dir + + if err := os.Chdir(cmd.Dir); err != nil { + _, _ = fmt.Fprintf(GinkgoWriter, "chdir dir: %s\n", err) + } + + cmd.Env = append(os.Environ(), "GO111MODULE=on") + command := strings.Join(cmd.Args, " ") + _, _ = fmt.Fprintf(GinkgoWriter, "running: %s\n", command) + output, err := cmd.CombinedOutput() + if err != nil { + return output, fmt.Errorf("%s failed with error: (%v) %s", command, err, string(output)) + } + + return output, nil +} + +// UninstallPrometheusOperator uninstalls the prometheus +func UninstallPrometheusOperator() { + url := fmt.Sprintf(prometheusOperatorURL, prometheusOperatorVersion) + cmd := exec.Command("kubectl", "delete", "-f", url) + if _, err := Run(cmd); err != nil { + warnError(err) + } +} + +// UninstallCertManager uninstalls the cert manager +func UninstallCertManager() { + url := fmt.Sprintf(certmanagerURLTmpl, certmanagerVersion) + cmd := exec.Command("kubectl", "delete", "-f", url) + if _, err := Run(cmd); err != nil { + warnError(err) + } +} + +// InstallCertManager installs the cert manager bundle. +func InstallCertManager() error { + url := fmt.Sprintf(certmanagerURLTmpl, certmanagerVersion) + cmd := exec.Command("kubectl", "apply", "-f", url) + if _, err := Run(cmd); err != nil { + return err + } + // Wait for cert-manager-webhook to be ready, which can take time if cert-manager + // was re-installed after uninstalling on a cluster. + cmd = exec.Command("kubectl", "wait", "deployment.apps/cert-manager-webhook", + "--for", "condition=Available", + "--namespace", "cert-manager", + "--timeout", "5m", + ) + + _, err := Run(cmd) + return err +} + +// LoadImageToKindClusterWithName loads a local docker image to the kind cluster +func LoadImageToKindClusterWithName(name string) error { + cluster := "kind" + if v, ok := os.LookupEnv("KIND_CLUSTER"); ok { + cluster = v + } + kindOptions := []string{"load", "docker-image", name, "--name", cluster} + cmd := exec.Command("kind", kindOptions...) + _, err := Run(cmd) + return err +} + +// GetNonEmptyLines converts given command output string into individual objects +// according to line breakers, and ignores the empty elements in it. +func GetNonEmptyLines(output string) []string { + var res []string + elements := strings.Split(output, "\n") + for _, element := range elements { + if element != "" { + res = append(res, element) + } + } + + return res +} + +// GetProjectDir will return the directory where the project is +func GetProjectDir() (string, error) { + wd, err := os.Getwd() + if err != nil { + return wd, err + } + wd = strings.Replace(wd, "/test/e2e", "", -1) + return wd, nil +} From 52780efdff462a0e919004d194413c771770e3d9 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 04:15:36 +0900 Subject: [PATCH 03/20] fix controller test --- cmd/tortoisectl/main.go | 2 +- internal/controller/tortoise_controller_test.go | 6 ++++++ test/e2e/e2e_suite_test.go | 2 +- test/e2e/e2e_test.go | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cmd/tortoisectl/main.go b/cmd/tortoisectl/main.go index f50d98ae..5316e673 100644 --- a/cmd/tortoisectl/main.go +++ b/cmd/tortoisectl/main.go @@ -1,4 +1,4 @@ -package main +package tortoisectl import "github.com/mercari/tortoise/cmd/tortoisectl/commands" diff --git a/internal/controller/tortoise_controller_test.go b/internal/controller/tortoise_controller_test.go index 72fd16a9..93a9e33d 100644 --- a/internal/controller/tortoise_controller_test.go +++ b/internal/controller/tortoise_controller_test.go @@ -16,8 +16,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" autoscalingv1 "k8s.io/autoscaler/vertical-pod-autoscaler/pkg/apis/autoscaling.k8s.io/v1" "k8s.io/client-go/tools/record" + "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/config" "sigs.k8s.io/yaml" "github.com/mercari/tortoise/api/v1beta3" @@ -235,6 +237,9 @@ func startController(ctx context.Context) func() { mgr, err := ctrl.NewManager(cfg, ctrl.Options{ Scheme: scheme, LeaderElection: false, + Controller: config.Controller{ + SkipNameValidation: ptr.To(true), + }, }) Expect(err).ShouldNot(HaveOccurred()) @@ -289,6 +294,7 @@ var _ = Describe("Test TortoiseController", func() { if err != nil { Expect(apierrors.IsNotFound(err)).To(Equal(true)) } + } generateTestCases := func(path string) { diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index 9b3d64f0..ade105f9 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -27,6 +27,6 @@ import ( // Run e2e tests using the Ginkgo runner. func TestE2E(t *testing.T) { RegisterFailHandler(Fail) - _, _ = fmt.Fprintf(GinkgoWriter, "Starting tortoise-migration-2 suite\n") + _, _ = fmt.Fprintf(GinkgoWriter, "Starting tortoise suite\n") RunSpecs(t, "e2e suite") } diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index de79eb38..9720932e 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -24,10 +24,10 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "mercari.com/tortoise/test/utils" + "github.com/mercari/tortoise/test/utils" ) -const namespace = "tortoise-migration-2-system" +const namespace = "tortoise-system" var _ = Describe("controller", Ordered, func() { BeforeAll(func() { From 9c153b55710168fbbbf7711cc0332096243bab3c Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 04:19:09 +0900 Subject: [PATCH 04/20] fix gha test --- .github/workflows/test.yaml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 61adf8e3..e1e1401d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -15,10 +15,10 @@ jobs: name: Test runs-on: ubuntu-latest steps: - - name: Set up Go 1.21 + - name: Set up Go 1.22 uses: actions/setup-go@v3.5.0 with: - go-version: "1.21" + go-version: "1.22" id: go - name: Check out code into the Go module directory uses: actions/checkout@v3 @@ -31,8 +31,6 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- - - name: Get dependencies - run: make dependencies - name: Build run: make build - name: Test From f4454f41863c21af65a4f3190a508639df794040 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 04:41:26 +0900 Subject: [PATCH 05/20] chmod tortoisectl test --- cmd/tortoisectl/test/tortoisectl_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmd/tortoisectl/test/tortoisectl_test.go b/cmd/tortoisectl/test/tortoisectl_test.go index 319e7090..a87a5a9f 100644 --- a/cmd/tortoisectl/test/tortoisectl_test.go +++ b/cmd/tortoisectl/test/tortoisectl_test.go @@ -73,6 +73,10 @@ func Test_TortoiseCtlStop(t *testing.T) { // Build the latest binary. buildTortoiseCtl(t) + _, _, err := execCommand(t, "chmod", "+x", "./testdata/bin/tortoisectl") + if err != nil { + t.Fatalf("Failed to build tortoisectl: %v", err) + } testEnv, cfg := prepareCluster(t) defer destryCluster(t, testEnv) From bba07476c23c659111894f3386bb630580d0dba0 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 13:44:07 +0900 Subject: [PATCH 06/20] edit tortoisectl --- Dockerfile | 2 +- cmd/tortoisectl/main.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0d36760b..950508c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.21 as builder +FROM golang:1.22 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/cmd/tortoisectl/main.go b/cmd/tortoisectl/main.go index 5316e673..a03dd8ae 100644 --- a/cmd/tortoisectl/main.go +++ b/cmd/tortoisectl/main.go @@ -1,7 +1,7 @@ -package tortoisectl +package main import "github.com/mercari/tortoise/cmd/tortoisectl/commands" -func tortoisectl() { +func main() { commands.Execute() } From a968c7adac9b15315a8bd4649e6a8dfceee45ecc Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 14:08:27 +0900 Subject: [PATCH 07/20] fix lint --- Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a1edfd3f..fe057030 100644 --- a/Makefile +++ b/Makefile @@ -81,12 +81,14 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated go test ./test/e2e/ -v -ginkgo.v .PHONY: lint -lint: golangci-lint ## Run golangci-lint linter - $(GOLANGCI_LINT) run +lint: + golangci-lint run $(args) ./... .PHONY: lint-fix -lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes - $(GOLANGCI_LINT) run --fix +lint-fix: + # Note: gci's autofix on golangci-lint was disabled. We can remove this if that is enabled again. + find . -name "*.go" | xargs gci write --section Standard --section Default --section "Prefix(github.com/mercari/tortoise)" --section blank --section dot + @make lint args='--fix -v' cons_args='-v' ##@ Build From 691c4f4c5c2cd7514ed2e4413390123b8b01f7b8 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 17:29:57 +0900 Subject: [PATCH 08/20] fix lint --- Makefile | 7 +++---- go.mod | 4 ++++ go.sum | 8 ++++++++ test/e2e/e2e_test.go | 4 ++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index fe057030..41483010 100644 --- a/Makefile +++ b/Makefile @@ -81,12 +81,11 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated go test ./test/e2e/ -v -ginkgo.v .PHONY: lint -lint: - golangci-lint run $(args) ./... +lint: golangci-lint ## Run golangci-lint linter + $(GOLANGCI_LINT) run .PHONY: lint-fix -lint-fix: - # Note: gci's autofix on golangci-lint was disabled. We can remove this if that is enabled again. +lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes find . -name "*.go" | xargs gci write --section Standard --section Default --section "Prefix(github.com/mercari/tortoise)" --section blank --section dot @make lint args='--fix -v' cons_args='-v' diff --git a/go.mod b/go.mod index 1c97e284..815fbab6 100644 --- a/go.mod +++ b/go.mod @@ -31,6 +31,7 @@ require ( require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/daixiang0/gci v0.13.5 // 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/evanphx/json-patch v5.9.0+incompatible // indirect @@ -49,6 +50,7 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect github.com/google/uuid v1.6.0 // indirect + github.com/hexops/gotextdiff v1.0.3 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect @@ -66,8 +68,10 @@ require ( github.com/x448/float16 v0.8.4 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect + golang.org/x/mod v0.20.0 // indirect golang.org/x/net v0.29.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect + golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.25.0 // indirect golang.org/x/term v0.24.0 // indirect golang.org/x/text v0.18.0 // indirect diff --git a/go.sum b/go.sum index 40b5f63a..5a903706 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/daixiang0/gci v0.13.5 h1:kThgmH1yBmZSBCh1EJVxQ7JsHpm5Oms0AMed/0LaH4c= +github.com/daixiang0/gci v0.13.5/go.mod h1:12etP2OniiIdP4q+kjUGrC/rUagga7ODbqsom5Eo5Yk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -47,6 +49,8 @@ github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQu github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= +github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -121,6 +125,8 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= +golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -132,6 +138,8 @@ golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 9720932e..717c979f 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -21,10 +21,10 @@ import ( "os/exec" "time" + "github.com/mercari/tortoise/test/utils" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - "github.com/mercari/tortoise/test/utils" ) const namespace = "tortoise-system" From e28d881c55311c3846c3358dce689e96ce36a5e6 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 17:48:21 +0900 Subject: [PATCH 09/20] add lint-fix to ci --- .github/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index e1e1401d..7fba207d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -35,5 +35,7 @@ jobs: run: make build - name: Test run: make test + - name: Test + run: make lint-fix - name: Lint run: make lint From 192fecf65764f1fb47dd1ebf74df2c59edf84c51 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 17:54:41 +0900 Subject: [PATCH 10/20] go mod tidy --- go.mod | 4 ---- go.sum | 8 -------- 2 files changed, 12 deletions(-) diff --git a/go.mod b/go.mod index 815fbab6..1c97e284 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,6 @@ require ( require ( github.com/beorn7/perks v1.0.1 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/daixiang0/gci v0.13.5 // 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/evanphx/json-patch v5.9.0+incompatible // indirect @@ -50,7 +49,6 @@ require ( github.com/google/gofuzz v1.2.0 // indirect github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect github.com/google/uuid v1.6.0 // indirect - github.com/hexops/gotextdiff v1.0.3 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect @@ -68,10 +66,8 @@ require ( github.com/x448/float16 v0.8.4 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect - golang.org/x/mod v0.20.0 // indirect golang.org/x/net v0.29.0 // indirect golang.org/x/oauth2 v0.23.0 // indirect - golang.org/x/sync v0.8.0 // indirect golang.org/x/sys v0.25.0 // indirect golang.org/x/term v0.24.0 // indirect golang.org/x/text v0.18.0 // indirect diff --git a/go.sum b/go.sum index 5a903706..40b5f63a 100644 --- a/go.sum +++ b/go.sum @@ -3,8 +3,6 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/daixiang0/gci v0.13.5 h1:kThgmH1yBmZSBCh1EJVxQ7JsHpm5Oms0AMed/0LaH4c= -github.com/daixiang0/gci v0.13.5/go.mod h1:12etP2OniiIdP4q+kjUGrC/rUagga7ODbqsom5Eo5Yk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= @@ -49,8 +47,6 @@ github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQu github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= -github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4= github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= @@ -125,8 +121,6 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0= -golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -138,8 +132,6 @@ golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= -golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= From 4343ea94ad373b0752effc9557083a6132bafd4f Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 17:58:59 +0900 Subject: [PATCH 11/20] add make dependencies --- .github/workflows/test.yaml | 4 +++- Makefile | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7fba207d..b2d70464 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -31,11 +31,13 @@ jobs: key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go- + - name: Dependencies + run: make dependencies - name: Build run: make build - name: Test run: make test - - name: Test + - name: lint-fix run: make lint-fix - name: Lint run: make lint diff --git a/Makefile b/Makefile index 41483010..73558d02 100644 --- a/Makefile +++ b/Makefile @@ -196,6 +196,10 @@ golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary. $(GOLANGCI_LINT): $(LOCALBIN) $(call go-install-tool,$(GOLANGCI_LINT),github.com/golangci/golangci-lint/cmd/golangci-lint,$(GOLANGCI_LINT_VERSION)) +.PHONY: dependencies +dependencies: + @./scripts/dependencies.sh + # go-install-tool will 'go install' any package with custom target and name of binary, if it doesn't exist # $1 - target path with name of binary # $2 - package url which can be installed From 93556df58e49f03663784fcc036f9a46f1a61e23 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 18:06:40 +0900 Subject: [PATCH 12/20] remove lint-fix --- .github/workflows/test.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index b2d70464..3fd56348 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -37,7 +37,5 @@ jobs: run: make build - name: Test run: make test - - name: lint-fix - run: make lint-fix - name: Lint run: make lint From 5cda06cf5b6deab9610e9cf18864cd94a7175142 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 18:19:13 +0900 Subject: [PATCH 13/20] upgrade tools --- Makefile | 4 +- tools/go.mod | 190 +++++++++++---------- tools/go.sum | 474 +++++++++++++++++++++++++-------------------------- 3 files changed, 335 insertions(+), 333 deletions(-) diff --git a/Makefile b/Makefile index 73558d02..6b6a3de8 100644 --- a/Makefile +++ b/Makefile @@ -81,8 +81,8 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated go test ./test/e2e/ -v -ginkgo.v .PHONY: lint -lint: golangci-lint ## Run golangci-lint linter - $(GOLANGCI_LINT) run +lint: + golangci-lint run $(args) ./... .PHONY: lint-fix lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes diff --git a/tools/go.mod b/tools/go.mod index 58358cd4..c861e282 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,180 +1,192 @@ module github.com/mercari/tortoise/tools -go 1.20 +go 1.22 require ( - github.com/daixiang0/gci v0.10.1 - github.com/golangci/golangci-lint v1.52.2 + github.com/daixiang0/gci v0.13.4 + github.com/golangci/golangci-lint v1.59.1 ) require ( 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect 4d63.com/gochecknoglobals v0.2.1 // indirect - github.com/Abirdcfly/dupword v0.0.11 // indirect - github.com/Antonboom/errname v0.1.9 // indirect - github.com/Antonboom/nilnil v0.1.3 // indirect - github.com/BurntSushi/toml v1.2.1 // indirect + github.com/4meepo/tagalign v1.3.4 // indirect + github.com/Abirdcfly/dupword v0.0.14 // indirect + github.com/Antonboom/errname v0.1.13 // indirect + github.com/Antonboom/nilnil v0.1.9 // indirect + github.com/Antonboom/testifylint v1.3.1 // indirect + github.com/BurntSushi/toml v1.4.0 // indirect + github.com/Crocmagnon/fatcontext v0.2.2 // indirect github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect - github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect - github.com/Masterminds/semver v1.5.0 // indirect - github.com/OpenPeeDeeP/depguard v1.1.1 // indirect + github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect + github.com/Masterminds/semver/v3 v3.2.1 // indirect + github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect + github.com/alecthomas/go-check-sumtype v0.1.4 // indirect + github.com/alexkohler/nakedret/v2 v2.0.4 // indirect github.com/alexkohler/prealloc v1.0.0 // indirect github.com/alingse/asasalint v0.0.11 // indirect - github.com/ashanbrown/forbidigo v1.5.1 // indirect + github.com/ashanbrown/forbidigo v1.6.0 // indirect github.com/ashanbrown/makezero v1.1.1 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bkielbasa/cyclop v1.2.0 // indirect + github.com/bkielbasa/cyclop v1.2.1 // indirect github.com/blizzy78/varnamelen v0.8.0 // indirect - github.com/bombsimon/wsl/v3 v3.4.0 // indirect - github.com/breml/bidichk v0.2.4 // indirect - github.com/breml/errchkjson v0.3.1 // indirect - github.com/butuzov/ireturn v0.1.1 // indirect + github.com/bombsimon/wsl/v4 v4.2.1 // indirect + github.com/breml/bidichk v0.2.7 // indirect + github.com/breml/errchkjson v0.3.6 // indirect + github.com/butuzov/ireturn v0.3.0 // indirect + github.com/butuzov/mirror v1.2.0 // indirect + github.com/catenacyber/perfsprint v0.7.1 // indirect + github.com/ccojocar/zxcvbn-go v1.0.2 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/charithe/durationcheck v0.0.10 // indirect - github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 // indirect + github.com/chavacava/garif v0.1.0 // indirect + github.com/ckaznocha/intrange v0.1.2 // indirect github.com/curioswitch/go-reassign v0.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/denis-tingaikin/go-header v0.4.3 // indirect - github.com/esimonov/ifshort v1.0.4 // indirect - github.com/ettle/strcase v0.1.1 // indirect - github.com/fatih/color v1.15.0 // indirect + github.com/denis-tingaikin/go-header v0.5.0 // indirect + github.com/ettle/strcase v0.2.0 // indirect + github.com/fatih/color v1.17.0 // indirect github.com/fatih/structtag v1.2.0 // indirect - github.com/firefart/nonamedreturns v1.0.4 // indirect + github.com/firefart/nonamedreturns v1.0.5 // indirect github.com/fsnotify/fsnotify v1.5.4 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect - github.com/go-critic/go-critic v0.7.0 // indirect + github.com/ghostiam/protogetter v0.3.6 // indirect + github.com/go-critic/go-critic v0.11.4 // indirect github.com/go-toolsmith/astcast v1.1.0 // indirect github.com/go-toolsmith/astcopy v1.1.0 // indirect - github.com/go-toolsmith/astequal v1.1.0 // indirect + github.com/go-toolsmith/astequal v1.2.0 // indirect github.com/go-toolsmith/astfmt v1.1.0 // indirect github.com/go-toolsmith/astp v1.1.0 // indirect github.com/go-toolsmith/strparse v1.1.0 // indirect github.com/go-toolsmith/typep v1.1.0 // indirect + github.com/go-viper/mapstructure/v2 v2.0.0 // indirect github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gofrs/flock v0.8.1 // indirect - github.com/golang/protobuf v1.5.2 // indirect - github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect - github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect - github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect - github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect - github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect - github.com/golangci/misspell v0.4.0 // indirect - github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect - github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect - github.com/google/go-cmp v0.5.9 // indirect - github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 // indirect + github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect + github.com/golangci/misspell v0.6.0 // indirect + github.com/golangci/modinfo v0.3.4 // indirect + github.com/golangci/plugin-module-register v0.1.1 // indirect + github.com/golangci/revgrep v0.5.3 // indirect + github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/gordonklaus/ineffassign v0.1.0 // indirect github.com/gostaticanalysis/analysisutil v0.7.1 // indirect github.com/gostaticanalysis/comment v1.4.2 // indirect github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect github.com/gostaticanalysis/nilerr v0.1.1 // indirect - github.com/hashicorp/errwrap v1.0.0 // indirect - github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/go-version v1.6.0 // indirect + github.com/hashicorp/go-version v1.7.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hexops/gotextdiff v1.0.3 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect - github.com/jgautheron/goconst v1.5.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jgautheron/goconst v1.7.1 // indirect github.com/jingyugao/rowserrcheck v1.1.1 // indirect github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect + github.com/jjti/go-spancheck v0.6.1 // indirect github.com/julz/importas v0.1.0 // indirect - github.com/junk1tm/musttag v0.5.0 // indirect - github.com/kisielk/errcheck v1.6.3 // indirect - github.com/kisielk/gotool v1.0.0 // indirect - github.com/kkHAIKE/contextcheck v1.1.4 // indirect + github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect + github.com/kisielk/errcheck v1.7.0 // indirect + github.com/kkHAIKE/contextcheck v1.1.5 // indirect github.com/kulti/thelper v0.6.3 // indirect - github.com/kunwardeep/paralleltest v1.0.6 // indirect + github.com/kunwardeep/paralleltest v1.0.10 // indirect github.com/kyoh86/exportloopref v0.1.11 // indirect - github.com/ldez/gomoddirectives v0.2.3 // indirect - github.com/ldez/tagliatelle v0.4.0 // indirect - github.com/leonklingele/grouper v1.1.1 // indirect + github.com/lasiar/canonicalheader v1.1.1 // indirect + github.com/ldez/gomoddirectives v0.2.4 // indirect + github.com/ldez/tagliatelle v0.5.0 // indirect + github.com/leonklingele/grouper v1.1.2 // indirect github.com/lufeee/execinquery v1.2.1 // indirect + github.com/macabu/inamedparam v0.1.3 // indirect github.com/magiconair/properties v1.8.6 // indirect github.com/maratori/testableexamples v1.0.0 // indirect github.com/maratori/testpackage v1.1.1 // indirect github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.9 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/mbilski/exhaustivestruct v1.2.0 // indirect - github.com/mgechev/revive v1.3.1 // indirect + github.com/mgechev/revive v1.3.7 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/moricho/tparallel v0.3.1 // indirect github.com/nakabonne/nestif v0.3.1 // indirect - github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect - github.com/nishanths/exhaustive v0.9.5 // indirect + github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect + github.com/nishanths/exhaustive v0.12.0 // indirect github.com/nishanths/predeclared v0.2.2 // indirect - github.com/nunnatsa/ginkgolinter v0.9.0 // indirect + github.com/nunnatsa/ginkgolinter v0.16.2 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect github.com/pelletier/go-toml v1.9.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.5 // indirect + github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/polyfloyd/go-errorlint v1.4.0 // indirect + github.com/polyfloyd/go-errorlint v1.5.2 // indirect github.com/prometheus/client_golang v1.12.1 // indirect github.com/prometheus/client_model v0.2.0 // indirect github.com/prometheus/common v0.32.1 // indirect github.com/prometheus/procfs v0.7.3 // indirect - github.com/quasilyte/go-ruleguard v0.3.19 // indirect + github.com/quasilyte/go-ruleguard v0.4.2 // indirect + github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect github.com/quasilyte/gogrep v0.5.0 // indirect github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect - github.com/ryancurrah/gomodguard v1.3.0 // indirect - github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect + github.com/ryancurrah/gomodguard v1.3.2 // indirect + github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect + github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect github.com/sashamelentyev/interfacebloat v1.1.0 // indirect - github.com/sashamelentyev/usestdlibvars v1.23.0 // indirect - github.com/securego/gosec/v2 v2.15.0 // indirect + github.com/sashamelentyev/usestdlibvars v1.26.0 // indirect + github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect - github.com/sirupsen/logrus v1.9.0 // indirect - github.com/sivchari/containedctx v1.0.2 // indirect - github.com/sivchari/nosnakecase v1.7.0 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect + github.com/sivchari/containedctx v1.0.3 // indirect github.com/sivchari/tenv v1.7.1 // indirect github.com/sonatard/noctx v0.0.2 // indirect github.com/sourcegraph/go-diff v0.7.0 // indirect - github.com/spf13/afero v1.8.2 // indirect + github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.5.0 // indirect - github.com/spf13/cobra v1.6.1 // indirect + github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.12.0 // indirect github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect - github.com/stretchr/objx v0.5.0 // indirect - github.com/stretchr/testify v1.8.2 // indirect + github.com/stretchr/objx v0.5.2 // indirect + github.com/stretchr/testify v1.9.0 // indirect github.com/subosito/gotenv v1.4.1 // indirect github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect github.com/tdakkota/asciicheck v0.2.0 // indirect - github.com/tetafro/godot v1.4.11 // indirect - github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e // indirect + github.com/tetafro/godot v1.4.16 // indirect + github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect github.com/timonwong/loggercheck v0.9.4 // indirect - github.com/tomarrell/wrapcheck/v2 v2.8.1 // indirect + github.com/tomarrell/wrapcheck/v2 v2.8.3 // indirect github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect - github.com/ultraware/funlen v0.0.3 // indirect - github.com/ultraware/whitespace v0.0.5 // indirect - github.com/uudashr/gocognit v1.0.6 // indirect + github.com/ultraware/funlen v0.1.0 // indirect + github.com/ultraware/whitespace v0.1.1 // indirect + github.com/uudashr/gocognit v1.1.2 // indirect + github.com/xen0n/gosmopolitan v1.2.2 // indirect github.com/yagipy/maintidx v1.0.0 // indirect - github.com/yeya24/promlinter v0.2.0 // indirect - gitlab.com/bosi/decorder v0.2.3 // indirect + github.com/yeya24/promlinter v0.3.0 // indirect + github.com/ykadowak/zerologlint v0.1.5 // indirect + gitlab.com/bosi/decorder v0.4.2 // indirect + go-simpler.org/musttag v0.12.2 // indirect + go-simpler.org/sloglint v0.7.1 // indirect go.uber.org/atomic v1.7.0 // indirect + go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect - golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect - golang.org/x/mod v0.9.0 // indirect - golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.6.0 // indirect - golang.org/x/text v0.7.0 // indirect - golang.org/x/tools v0.7.0 // indirect - google.golang.org/protobuf v1.28.0 // indirect + golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc // indirect + golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect + golang.org/x/mod v0.18.0 // indirect + golang.org/x/sync v0.7.0 // indirect + golang.org/x/sys v0.21.0 // indirect + golang.org/x/text v0.15.0 // indirect + golang.org/x/tools v0.22.0 // indirect + google.golang.org/protobuf v1.33.0 // indirect + gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - honnef.co/go/tools v0.4.3 // indirect - mvdan.cc/gofumpt v0.4.0 // indirect - mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect - mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect - mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect + honnef.co/go/tools v0.4.7 // indirect + mvdan.cc/gofumpt v0.6.0 // indirect + mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect ) diff --git a/tools/go.sum b/tools/go.sum index 723b435a..d5558afe 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -7,7 +7,6 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -18,9 +17,6 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= -cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -38,104 +34,123 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/Abirdcfly/dupword v0.0.11 h1:z6v8rMETchZXUIuHxYNmlUAuKuB21PeaSymTed16wgU= -github.com/Abirdcfly/dupword v0.0.11/go.mod h1:wH8mVGuf3CP5fsBTkfWwwwKTjDnVVCxtU8d8rgeVYXA= -github.com/Antonboom/errname v0.1.9 h1:BZDX4r3l4TBZxZ2o2LNrlGxSHran4d1u4veZdoORTT4= -github.com/Antonboom/errname v0.1.9/go.mod h1:nLTcJzevREuAsgTbG85UsuiWpMpAqbKD1HNZ29OzE58= -github.com/Antonboom/nilnil v0.1.3 h1:6RTbx3d2mcEu3Zwq9TowQpQMVpP75zugwOtqY1RTtcE= -github.com/Antonboom/nilnil v0.1.3/go.mod h1:iOov/7gRcXkeEU+EMGpBu2ORih3iyVEiWjeste1SJm8= +github.com/4meepo/tagalign v1.3.4 h1:P51VcvBnf04YkHzjfclN6BbsopfJR5rxs1n+5zHt+w8= +github.com/4meepo/tagalign v1.3.4/go.mod h1:M+pnkHH2vG8+qhE5bVc/zeP7HS/j910Fwa9TUSyZVI0= +github.com/Abirdcfly/dupword v0.0.14 h1:3U4ulkc8EUo+CaT105/GJ1BQwtgyj6+VaBVbAX11Ba8= +github.com/Abirdcfly/dupword v0.0.14/go.mod h1:VKDAbxdY8YbKUByLGg8EETzYSuC4crm9WwI6Y3S0cLI= +github.com/Antonboom/errname v0.1.13 h1:JHICqsewj/fNckzrfVSe+T33svwQxmjC+1ntDsHOVvM= +github.com/Antonboom/errname v0.1.13/go.mod h1:uWyefRYRN54lBg6HseYCFhs6Qjcy41Y3Jl/dVhA87Ns= +github.com/Antonboom/nilnil v0.1.9 h1:eKFMejSxPSA9eLSensFmjW2XTgTwJMjZ8hUHtV4s/SQ= +github.com/Antonboom/nilnil v0.1.9/go.mod h1:iGe2rYwCq5/Me1khrysB4nwI7swQvjclR8/YRPl5ihQ= +github.com/Antonboom/testifylint v1.3.1 h1:Uam4q1Q+2b6H7gvk9RQFw6jyVDdpzIirFOOrbs14eG4= +github.com/Antonboom/testifylint v1.3.1/go.mod h1:NV0hTlteCkViPW9mSR4wEMfwp+Hs1T3dY60bkvSfhpM= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= -github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= +github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/Crocmagnon/fatcontext v0.2.2 h1:OrFlsDdOj9hW/oBEJBNSuH7QWf+E9WPVHw+x52bXVbk= +github.com/Crocmagnon/fatcontext v0.2.2/go.mod h1:WSn/c/+MMNiD8Pri0ahRj0o9jVpeowzavOQplBJw6u0= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 h1:+r1rSv4gvYn0wmRjC8X7IAzX8QezqtFV9m0MUHFJgts= -github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0/go.mod h1:b3g59n2Y+T5xmcxJL+UEG2f8cQploZm1mR/v6BW0mU0= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/OpenPeeDeeP/depguard v1.1.1 h1:TSUznLjvp/4IUP+OQ0t/4jF4QUyxIcVX8YnghZdunyA= -github.com/OpenPeeDeeP/depguard v1.1.1/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc= +github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 h1:sATXp1x6/axKxz2Gjxv8MALP0bXaNRfQinEwyfMcx8c= +github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0/go.mod h1:Nl76DrGNJTA1KJ0LePKBw/vznBX1EHbAZX8mwjR82nI= +github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= +github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ= +github.com/OpenPeeDeeP/depguard/v2 v2.2.0 h1:vDfG60vDtIuf0MEOhmLlLLSzqaRM8EMcgJPdp74zmpA= +github.com/OpenPeeDeeP/depguard/v2 v2.2.0/go.mod h1:CIzddKRvLBC4Au5aYP/i3nyaWQ+ClszLIuVocRiCYFQ= +github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk= +github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ= +github.com/alecthomas/go-check-sumtype v0.1.4 h1:WCvlB3l5Vq5dZQTFmodqL2g68uHiSwwlWcT5a2FGK0c= +github.com/alecthomas/go-check-sumtype v0.1.4/go.mod h1:WyYPfhfkdhyrdaligV6svFopZV8Lqdzn5pyVBaV6jhQ= +github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk= +github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/alexkohler/nakedret/v2 v2.0.4 h1:yZuKmjqGi0pSmjGpOC016LtPJysIL0WEUiaXW5SUnNg= +github.com/alexkohler/nakedret/v2 v2.0.4/go.mod h1:bF5i0zF2Wo2o4X4USt9ntUWve6JbFv02Ff4vlkmS/VU= github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw= github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw= github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I= -github.com/ashanbrown/forbidigo v1.5.1 h1:WXhzLjOlnuDYPYQo/eFlcFMi8X/kLfvWLYu6CSoebis= -github.com/ashanbrown/forbidigo v1.5.1/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU= +github.com/ashanbrown/forbidigo v1.6.0 h1:D3aewfM37Yb3pxHujIPSpTf6oQk9sc9WZi8gerOIVIY= +github.com/ashanbrown/forbidigo v1.6.0/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU= github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5FcB28s= github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bkielbasa/cyclop v1.2.0 h1:7Jmnh0yL2DjKfw28p86YTd/B4lRGcNuu12sKE35sM7A= -github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= +github.com/bkielbasa/cyclop v1.2.1 h1:AeF71HZDob1P2/pRm1so9cd1alZnrpyc4q2uP2l0gJY= +github.com/bkielbasa/cyclop v1.2.1/go.mod h1:K/dT/M0FPAiYjBgQGau7tz+3TMh4FWAEqlMhzFWCrgM= github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M= github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= -github.com/bombsimon/wsl/v3 v3.4.0 h1:RkSxjT3tmlptwfgEgTgU+KYKLI35p/tviNXNXiL2aNU= -github.com/bombsimon/wsl/v3 v3.4.0/go.mod h1:KkIB+TXkqy6MvK9BDZVbZxKNYsE1/oLRJbIFtf14qqo= -github.com/breml/bidichk v0.2.4 h1:i3yedFWWQ7YzjdZJHnPo9d/xURinSq3OM+gyM43K4/8= -github.com/breml/bidichk v0.2.4/go.mod h1:7Zk0kRFt1LIZxtQdl9W9JwGAcLTTkOs+tN7wuEYGJ3s= -github.com/breml/errchkjson v0.3.1 h1:hlIeXuspTyt8Y/UmP5qy1JocGNR00KQHgfaNtRAjoxQ= -github.com/breml/errchkjson v0.3.1/go.mod h1:XroxrzKjdiutFyW3nWhw34VGg7kiMsDQox73yWCGI2U= -github.com/butuzov/ireturn v0.1.1 h1:QvrO2QF2+/Cx1WA/vETCIYBKtRjc30vesdoPUNo1EbY= -github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= +github.com/bombsimon/wsl/v4 v4.2.1 h1:Cxg6u+XDWff75SIFFmNsqnIOgob+Q9hG6y/ioKbRFiM= +github.com/bombsimon/wsl/v4 v4.2.1/go.mod h1:Xu/kDxGZTofQcDGCtQe9KCzhHphIe0fDuyWTxER9Feo= +github.com/breml/bidichk v0.2.7 h1:dAkKQPLl/Qrk7hnP6P+E0xOodrq8Us7+U0o4UBOAlQY= +github.com/breml/bidichk v0.2.7/go.mod h1:YodjipAGI9fGcYM7II6wFvGhdMYsC5pHDlGzqvEW3tQ= +github.com/breml/errchkjson v0.3.6 h1:VLhVkqSBH96AvXEyclMR37rZslRrY2kcyq+31HCsVrA= +github.com/breml/errchkjson v0.3.6/go.mod h1:jhSDoFheAF2RSDOlCfhHO9KqhZgAYLyvHe7bRCX8f/U= +github.com/butuzov/ireturn v0.3.0 h1:hTjMqWw3y5JC3kpnC5vXmFJAWI/m31jaCYQqzkS6PL0= +github.com/butuzov/ireturn v0.3.0/go.mod h1:A09nIiwiqzN/IoVo9ogpa0Hzi9fex1kd9PSD6edP5ZA= +github.com/butuzov/mirror v1.2.0 h1:9YVK1qIjNspaqWutSv8gsge2e/Xpq1eqEkslEUHy5cs= +github.com/butuzov/mirror v1.2.0/go.mod h1:DqZZDtzm42wIAIyHXeN8W/qb1EPlb9Qn/if9icBOpdQ= +github.com/catenacyber/perfsprint v0.7.1 h1:PGW5G/Kxn+YrN04cRAZKC+ZuvlVwolYMrIyyTJ/rMmc= +github.com/catenacyber/perfsprint v0.7.1/go.mod h1:/wclWYompEyjUD2FuIIDVKNkqz7IgBIWXIH3V0Zol50= +github.com/ccojocar/zxcvbn-go v1.0.2 h1:na/czXU8RrhXO4EZme6eQJLR4PzcGsahsBOAwU6I3Vg= +github.com/ccojocar/zxcvbn-go v1.0.2/go.mod h1:g1qkXtUSvHP8lhHp5GrSmTz6uWALGRMQdw6Qnz/hi60= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/charithe/durationcheck v0.0.10 h1:wgw73BiocdBDQPik+zcEoBG/ob8uyBHf2iyoHGPf5w4= github.com/charithe/durationcheck v0.0.10/go.mod h1:bCWXb7gYRysD1CU3C+u4ceO49LoGOY1C1L6uouGNreQ= -github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 h1:W9o46d2kbNL06lq7UNDPV0zYLzkrde/bjIqO02eoll0= -github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8/go.mod h1:gakxgyXaaPkxvLw1XQxNGK4I37ys9iBRzNUx/B7pUCo= +github.com/chavacava/garif v0.1.0 h1:2JHa3hbYf5D9dsgseMKAmc/MZ109otzgNFk5s87H9Pc= +github.com/chavacava/garif v0.1.0/go.mod h1:XMyYCkEL58DF0oyW4qDjjnPWONs2HBqYKI+UIPD+Gww= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/ckaznocha/intrange v0.1.2 h1:3Y4JAxcMntgb/wABQ6e8Q8leMd26JbX2790lIss9MTI= +github.com/ckaznocha/intrange v0.1.2/go.mod h1:RWffCw/vKBwHeOEwWdCikAtY0q4gGt8VhJZEEA5n+RE= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo= github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= -github.com/daixiang0/gci v0.10.1 h1:eheNA3ljF6SxnPD/vE4lCBusVHmV3Rs3dkKvFrJ7MR0= -github.com/daixiang0/gci v0.10.1/go.mod h1:xtHP9N7AHdNvtRNfcx9gwTDfw7FRJx4bZUsiEfiNNAI= +github.com/daixiang0/gci v0.13.4 h1:61UGkmpoAcxHM2hhNkZEf5SzwQtWJXTSws7jaPyqwlw= +github.com/daixiang0/gci v0.13.4/go.mod h1:12etP2OniiIdP4q+kjUGrC/rUagga7ODbqsom5Eo5Yk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20Ha7UVm+mtU= -github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= +github.com/denis-tingaikin/go-header v0.5.0 h1:SRdnP5ZKvcO9KKRP1KJrhFR3RrlGuD+42t4429eC9k8= +github.com/denis-tingaikin/go-header v0.5.0/go.mod h1:mMenU5bWrok6Wl2UsZjy+1okegmwQ3UgWl4V1D8gjlY= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= -github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/esimonov/ifshort v1.0.4 h1:6SID4yGWfRae/M7hkVDVVyppy8q/v9OuxNdmjLQStBA= -github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0= -github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw= -github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/ettle/strcase v0.2.0 h1:fGNiVF21fHXpX1niBgk0aROov1LagYsOwV/xqKDKR/Q= +github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp+ED1A= +github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= +github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y= -github.com/firefart/nonamedreturns v1.0.4/go.mod h1:TDhe/tjI1BXo48CmYbUduTV7BdIga8MAO/xbKdcVsGI= -github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= +github.com/firefart/nonamedreturns v1.0.5 h1:tM+Me2ZaXs8tfdDw3X6DOX++wMCOqzYUho6tUTYIdRA= +github.com/firefart/nonamedreturns v1.0.5/go.mod h1:gHJjDqhGM4WyPt639SOZs+G89Ko7QKH5R5BhnO6xJhw= +github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8= +github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= -github.com/go-critic/go-critic v0.7.0 h1:tqbKzB8pqi0NsRZ+1pyU4aweAF7A7QN0Pi4Q02+rYnQ= -github.com/go-critic/go-critic v0.7.0/go.mod h1:moYzd7GdVXE2C2hYTwd7h0CPcqlUeclsyBRwMa38v64= +github.com/ghostiam/protogetter v0.3.6 h1:R7qEWaSgFCsy20yYHNIJsU9ZOb8TziSRRxuAOTVKeOk= +github.com/ghostiam/protogetter v0.3.6/go.mod h1:7lpeDnEJ1ZjL/YtyoN99ljO4z0pd3H0d18/t2dPBxHw= +github.com/go-critic/go-critic v0.11.4 h1:O7kGOCx0NDIni4czrkRIXTnit0mkyKOCePh3My6OyEU= +github.com/go-critic/go-critic v0.11.4/go.mod h1:2QAdo4iuLik5S9YG0rT4wcZ8QxwHYkrr6/2MWAiv/vc= 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= @@ -145,25 +160,32 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= +github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8= github.com/go-toolsmith/astcast v1.1.0 h1:+JN9xZV1A+Re+95pgnMgDboWNVnIMMQXwfBwLRPgSC8= github.com/go-toolsmith/astcast v1.1.0/go.mod h1:qdcuFWeGGS2xX5bLM/c3U9lewg7+Zu4mr+xPwZIB4ZU= github.com/go-toolsmith/astcopy v1.1.0 h1:YGwBN0WM+ekI/6SS6+52zLDEf8Yvp3n2seZITCUBt5s= github.com/go-toolsmith/astcopy v1.1.0/go.mod h1:hXM6gan18VA1T/daUEHCFcYiW8Ai1tIwIzHY6srfEAw= github.com/go-toolsmith/astequal v1.0.3/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4= -github.com/go-toolsmith/astequal v1.1.0 h1:kHKm1AWqClYn15R0K1KKE4RG614D46n+nqUQ06E1dTw= github.com/go-toolsmith/astequal v1.1.0/go.mod h1:sedf7VIdCL22LD8qIvv7Nn9MuWJruQA/ysswh64lffQ= +github.com/go-toolsmith/astequal v1.2.0 h1:3Fs3CYZ1k9Vo4FzFhwwewC3CHISHDnVUPC4x0bI2+Cw= +github.com/go-toolsmith/astequal v1.2.0/go.mod h1:c8NZ3+kSFtFY/8lPso4v8LuJjdJiUFVnSuU3s0qrrDY= github.com/go-toolsmith/astfmt v1.1.0 h1:iJVPDPp6/7AaeLJEruMsBUlOYCmvg0MoCfJprsOmcco= github.com/go-toolsmith/astfmt v1.1.0/go.mod h1:OrcLlRwu0CuiIBp/8b5PYF9ktGVZUjlNMV634mhwuQ4= github.com/go-toolsmith/astp v1.1.0 h1:dXPuCl6u2llURjdPLLDxJeZInAeZ0/eZwFJmqZMnpQA= github.com/go-toolsmith/astp v1.1.0/go.mod h1:0T1xFGz9hicKs8Z5MfAqSUitoUYS30pDMsRVIDHs8CA= github.com/go-toolsmith/pkgload v1.2.2 h1:0CtmHq/02QhxcF7E9N5LIFcYFsMR5rdovfqTtRKkgIk= +github.com/go-toolsmith/pkgload v1.2.2/go.mod h1:R2hxLNRKuAsiXCo2i5J6ZQPhnPMOVtU+f0arbFPWCus= github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= github.com/go-toolsmith/strparse v1.1.0 h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQiyP2Bvw= github.com/go-toolsmith/strparse v1.1.0/go.mod h1:7ksGy58fsaQkGQlY8WVoBFNyEPMGuJin1rfoPS4lBSQ= github.com/go-toolsmith/typep v1.1.0 h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUNHus= github.com/go-toolsmith/typep v1.1.0/go.mod h1:fVIw+7zjdsMxDA3ITWnH1yOiw1rnTQKCsF/sk2H/qig= +github.com/go-viper/mapstructure/v2 v2.0.0 h1:dhn8MZ1gZ0mzeodTG3jt5Vj/o87xZKuNAprG2mQfMfc= +github.com/go-viper/mapstructure/v2 v2.0.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/go-xmlfmt/xmlfmt v1.1.2 h1:Nea7b4icn8s57fTx1M5AI4qQT5HEM3rVUO8MuE6g80U= github.com/go-xmlfmt/xmlfmt v1.1.2/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= @@ -197,28 +219,25 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= -github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe h1:6RGUuS7EGotKx6J5HIP8ZtyMdiDscjMLfRBSPuzVVeo= -github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ= -github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 h1:amWTbTGqOZ71ruzrdA+Nx5WA3tV1N0goTspwmKCQvBY= -github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2/go.mod h1:9wOXstvyDRshQ9LggQuzBCGysxs3b6Uo/1MvYCR2NMs= -github.com/golangci/golangci-lint v1.52.2 h1:FrPElUUI5rrHXg1mQ7KxI1MXPAw5lBVskiz7U7a8a1A= -github.com/golangci/golangci-lint v1.52.2/go.mod h1:S5fhC5sHM5kE22/HcATKd1XLWQxX+y7mHj8B5H91Q/0= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= -github.com/golangci/misspell v0.4.0 h1:KtVB/hTK4bbL/S6bs64rYyk8adjmh1BygbBiaAiX+a0= -github.com/golangci/misspell v0.4.0/go.mod h1:W6O/bwV6lGDxUCChm2ykw9NQdd5bYd1Xkjo88UcWyJc= -github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 h1:DIPQnGy2Gv2FSA4B/hh8Q7xx3B7AIDk3DAMeHclH1vQ= -github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6/go.mod h1:0AKcRCkMoKvUvlf89F6O7H2LYdhr1zBh736mBItOdRs= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= +github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e h1:ULcKCDV1LOZPFxGZaA6TlQbiM3J2GCPnkx/bGF6sX/g= +github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e/go.mod h1:Pm5KhLPA8gSnQwrQ6ukebRcapGb/BG9iUkdaiCcGHJM= +github.com/golangci/golangci-lint v1.59.1 h1:CRRLu1JbhK5avLABFJ/OHVSQ0Ie5c4ulsOId1h3TTks= +github.com/golangci/golangci-lint v1.59.1/go.mod h1:jX5Oif4C7P0j9++YB2MMJmoNrb01NJ8ITqKWNLewThg= +github.com/golangci/misspell v0.6.0 h1:JCle2HUTNWirNlDIAUO44hUsKhOFqGPoC4LZxlaSXDs= +github.com/golangci/misspell v0.6.0/go.mod h1:keMNyY6R9isGaSAu+4Q8NMBwMPkh15Gtc8UCVoDtAWo= +github.com/golangci/modinfo v0.3.4 h1:oU5huX3fbxqQXdfspamej74DFX0kyGLkw1ppvXoJ8GA= +github.com/golangci/modinfo v0.3.4/go.mod h1:wytF1M5xl9u0ij8YSvhkEVPP3M5Mc7XLl1pxH3B2aUM= +github.com/golangci/plugin-module-register v0.1.1 h1:TCmesur25LnyJkpsVrupv1Cdzo+2f7zX0H6Jkw1Ol6c= +github.com/golangci/plugin-module-register v0.1.1/go.mod h1:TTpqoB6KkwOJMV8u7+NyXMrkwwESJLOkfl9TxR1DGFc= +github.com/golangci/revgrep v0.5.3 h1:3tL7c1XBMtWHHqVpS5ChmiAAoe4PF/d5+ULzV9sLAzs= +github.com/golangci/revgrep v0.5.3/go.mod h1:U4R/s9dlXZsg8uJmaR1GrloUr14D7qDl8gi2iPXJH8k= +github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed h1:IURFTjxeTfNFP0hTEi1YKjB/ub8zkpaOqFFMApi2EAs= +github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed/go.mod h1:XLXN8bNw4CGRPaqgl3bv/lhz7bsGPh4/xSaMTbo2vkQ= 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/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -233,12 +252,11 @@ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -246,16 +264,13 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= +github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= -github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 h1:9alfqbrhuD+9fLZ4iaAVwhlp5PEhmnBt7yvK2Oy5C1U= -github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= +github.com/gordonklaus/ineffassign v0.1.0 h1:y2Gd/9I7MdY1oEIt+n+rowjBNDcLQq3RsH5hwJd0f9s= +github.com/gordonklaus/ineffassign v0.1.0/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk= github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc= github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= @@ -267,13 +282,10 @@ github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3 github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= github.com/gostaticanalysis/testutil v0.4.0 h1:nhdCmubdmDF6VEatUNjgUZBJKWRqugoISdUv3PPQgHY= -github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -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/gostaticanalysis/testutil v0.4.0/go.mod h1:bLIoPefWXrRi/ssLFWX1dx7Repi5x3CuviD3dgAZaBU= github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= -github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY= +github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= @@ -281,15 +293,16 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jgautheron/goconst v1.5.1 h1:HxVbL1MhydKs8R8n/HE5NPvzfaYmQJA3o879lE4+WcM= -github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +github.com/jgautheron/goconst v1.7.1 h1:VpdAG7Ca7yvvJk5n8dMwQhfEZJh95kl/Hl9S1OI5Jkk= +github.com/jgautheron/goconst v1.7.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs= github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= +github.com/jjti/go-spancheck v0.6.1 h1:ZK/wE5Kyi1VX3PJpUO2oEgeoI4FWOUm7Shb2Gbv5obI= +github.com/jjti/go-spancheck v0.6.1/go.mod h1:vF1QkOO159prdo6mHRxak2CpzDpHAfKiPUDP/NeRnX8= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -301,37 +314,41 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/julz/importas v0.1.0 h1:F78HnrsjY3cR7j0etXy5+TU1Zuy7Xt08X/1aJnH5xXY= github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= -github.com/junk1tm/musttag v0.5.0 h1:bV1DTdi38Hi4pG4OVWa7Kap0hi0o7EczuK6wQt9zPOM= -github.com/junk1tm/musttag v0.5.0/go.mod h1:PcR7BA+oREQYvHwgjIDmw3exJeds5JzRcvEJTfjrA0M= -github.com/kisielk/errcheck v1.6.3 h1:dEKh+GLHcWm2oN34nMvDzn1sqI0i0WxPvrgiJA5JuM8= -github.com/kisielk/errcheck v1.6.3/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= -github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= +github.com/karamaru-alpha/copyloopvar v1.1.0 h1:x7gNyKcC2vRBO1H2Mks5u1VxQtYvFiym7fCjIP8RPos= +github.com/karamaru-alpha/copyloopvar v1.1.0/go.mod h1:u7CIfztblY0jZLOQZgH3oYsJzpC2A7S6u/lfgSXHy0k= +github.com/kisielk/errcheck v1.7.0 h1:+SbscKmWJ5mOK/bO1zS60F5I9WwZDWOfRsC4RwfwRV0= +github.com/kisielk/errcheck v1.7.0/go.mod h1:1kLL+jV4e+CFfueBmI1dSK2ADDyQnlrnrY/FqKluHJQ= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kkHAIKE/contextcheck v1.1.4 h1:B6zAaLhOEEcjvUgIYEqystmnFk1Oemn8bvJhbt0GMb8= -github.com/kkHAIKE/contextcheck v1.1.4/go.mod h1:1+i/gWqokIa+dm31mqGLZhZJ7Uh44DJGZVmr6QRBNJg= +github.com/kkHAIKE/contextcheck v1.1.5 h1:CdnJh63tcDe53vG+RebdpdXJTc9atMgGqdx8LXxiilg= +github.com/kkHAIKE/contextcheck v1.1.5/go.mod h1:O930cpht4xb1YQpK+1+AgoM3mFsvxr7uyFptcnWTYUA= 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/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= 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/kulti/thelper v0.6.3 h1:ElhKf+AlItIu+xGnI990no4cE2+XaSu1ULymV2Yulxs= github.com/kulti/thelper v0.6.3/go.mod h1:DsqKShOvP40epevkFrvIwkCMNYxMeTNjdWL4dqWHZ6I= -github.com/kunwardeep/paralleltest v1.0.6 h1:FCKYMF1OF2+RveWlABsdnmsvJrei5aoyZoaGS+Ugg8g= -github.com/kunwardeep/paralleltest v1.0.6/go.mod h1:Y0Y0XISdZM5IKm3TREQMZ6iteqn1YuwCsJO/0kL9Zes= +github.com/kunwardeep/paralleltest v1.0.10 h1:wrodoaKYzS2mdNVnc4/w31YaXFtsc21PCTdvWJ/lDDs= +github.com/kunwardeep/paralleltest v1.0.10/go.mod h1:2C7s65hONVqY7Q5Efj5aLzRCNLjw2h4eMc9EcypGjcY= github.com/kyoh86/exportloopref v0.1.11 h1:1Z0bcmTypkL3Q4k+IDHMWTcnCliEZcaPiIe0/ymEyhQ= github.com/kyoh86/exportloopref v0.1.11/go.mod h1:qkV4UF1zGl6EkF1ox8L5t9SwyeBAZ3qLMd6up458uqA= -github.com/ldez/gomoddirectives v0.2.3 h1:y7MBaisZVDYmKvt9/l1mjNCiSA1BVn34U0ObUcJwlhA= -github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= -github.com/ldez/tagliatelle v0.4.0 h1:sylp7d9kh6AdXN2DpVGHBRb5guTVAgOxqNGhbqc4b1c= -github.com/ldez/tagliatelle v0.4.0/go.mod h1:mNtTfrHy2haaBAw+VT7IBV6VXBThS7TCreYWbBcJ87I= -github.com/leonklingele/grouper v1.1.1 h1:suWXRU57D4/Enn6pXR0QVqqWWrnJ9Osrz+5rjt8ivzU= -github.com/leonklingele/grouper v1.1.1/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= +github.com/lasiar/canonicalheader v1.1.1 h1:wC+dY9ZfiqiPwAexUApFush/csSPXeIi4QqyxXmng8I= +github.com/lasiar/canonicalheader v1.1.1/go.mod h1:cXkb3Dlk6XXy+8MVQnF23CYKWlyA7kfQhSw2CcZtZb0= +github.com/ldez/gomoddirectives v0.2.4 h1:j3YjBIjEBbqZ0NKtBNzr8rtMHTOrLPeiwTkfUJZ3alg= +github.com/ldez/gomoddirectives v0.2.4/go.mod h1:oWu9i62VcQDYp9EQ0ONTfqLNh+mDLWWDO+SO0qSQw5g= +github.com/ldez/tagliatelle v0.5.0 h1:epgfuYt9v0CG3fms0pEgIMNPuFf/LpPIfjk4kyqSioo= +github.com/ldez/tagliatelle v0.5.0/go.mod h1:rj1HmWiL1MiKQuOONhd09iySTEkUuE/8+5jtPYz9xa4= +github.com/leonklingele/grouper v1.1.2 h1:o1ARBDLOmmasUaNDesWqWCIFH3u7hoFlM84YrjT3mIY= +github.com/leonklingele/grouper v1.1.2/go.mod h1:6D0M/HVkhs2yRKRFZUoGjeDy7EZTfFBE9gl4kjmIGkA= github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM= github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM= +github.com/macabu/inamedparam v0.1.3 h1:2tk/phHkMlEL/1GNe/Yf6kkR/hkcUdAEY3L0hjYV1Mk= +github.com/macabu/inamedparam v0.1.3/go.mod h1:93FLICAIk/quk7eaPPQvbzihUdn/QkGDwIZEoLtpH6I= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s93SLMxb2vI= @@ -345,16 +362,14 @@ github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwM github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwgOdMUQePUo= -github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= -github.com/mgechev/revive v1.3.1 h1:OlQkcH40IB2cGuprTPcjB0iIUddgVZgGmDX3IAMR8D4= -github.com/mgechev/revive v1.3.1/go.mod h1:YlD6TTWl2B8A103R9KWJSPVI9DrEf+oqr15q21Ld+5I= +github.com/mgechev/revive v1.3.7 h1:502QY0vQGe9KtYJ9FpxMz9rL+Fc/P13CI5POL4uHCcE= +github.com/mgechev/revive v1.3.7/go.mod h1:RJ16jUbF0OWC3co/+XTxmFNgEpUPwnnA0BRllX2aDNA= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= @@ -370,38 +385,41 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U= github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= -github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6FxaNu/BnU2OAaLF86eTVhP2hjTB6iMvItA= -github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/nishanths/exhaustive v0.9.5 h1:TzssWan6orBiLYVqewCG8faud9qlFntJE30ACpzmGME= -github.com/nishanths/exhaustive v0.9.5/go.mod h1:IbwrGdVMizvDcIxPYGVdQn5BqWJaOwpCvg4RGb8r/TA= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nishanths/exhaustive v0.12.0 h1:vIY9sALmw6T/yxiASewa4TQcFsVYZQQRUQJhKRf3Swg= +github.com/nishanths/exhaustive v0.12.0/go.mod h1:mEZ95wPIZW+x8kC4TgC+9YCUgiST7ecevsVDTgc2obs= github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= -github.com/nunnatsa/ginkgolinter v0.9.0 h1:Sm0zX5QfjJzkeCjEp+t6d3Ha0jwvoDjleP9XCsrEzOA= -github.com/nunnatsa/ginkgolinter v0.9.0/go.mod h1:FHaMLURXP7qImeH6bvxWJUpyH+2tuqe5j4rW1gxJRmI= +github.com/nunnatsa/ginkgolinter v0.16.2 h1:8iLqHIZvN4fTLDC0Ke9tbSZVcyVHoBs0HIbnVSxfHJk= +github.com/nunnatsa/ginkgolinter v0.16.2/go.mod h1:4tWRinDN1FeJgU+iJANW/kz7xKN5nYRAOfJDQUS9dOQ= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= -github.com/onsi/ginkgo/v2 v2.8.0 h1:pAM+oBNPrpXRs+E/8spkeGx9QgekbRVyr74EUvRVOUI= -github.com/onsi/gomega v1.26.0 h1:03cDLK28U6hWvCAns6NeydX3zIm4SF3ci69ulidS32Q= -github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= +github.com/onsi/ginkgo/v2 v2.17.3 h1:oJcvKpIb7/8uLpDDtnQuf18xVnwKp8DTD7DQ6gTd/MU= +github.com/onsi/ginkgo/v2 v2.17.3/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc= +github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk= +github.com/onsi/gomega v1.33.1/go.mod h1:U4R44UsT+9eLIaYRB2a5qajjtQYn0hauxvRm16AVYg0= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= +github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU= +github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w= github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= -github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= +github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polyfloyd/go-errorlint v1.4.0 h1:b+sQ5HibPIAjEZwtuwU8Wz/u0dMZ7YL+bk+9yWyHVJk= -github.com/polyfloyd/go-errorlint v1.4.0/go.mod h1:qJCkPeBn+0EXkdKTrUCcuFStM2xrDKfxI3MGLXPexUs= +github.com/polyfloyd/go-errorlint v1.5.2 h1:SJhVik3Umsjh7mte1vE0fVZ5T1gznasQG3PV7U5xFdA= +github.com/polyfloyd/go-errorlint v1.5.2/go.mod h1:sH1QC1pxxi0fFecsVIzBmxtrgd9IF/SkJpA6wqyKAJs= +github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= +github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= @@ -424,8 +442,10 @@ 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 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/quasilyte/go-ruleguard v0.3.19 h1:tfMnabXle/HzOb5Xe9CUZYWXKfkS1KwRmZyPmD9nVcc= -github.com/quasilyte/go-ruleguard v0.3.19/go.mod h1:lHSn69Scl48I7Gt9cX3VrbsZYvYiBYszZOZW4A+oTEw= +github.com/quasilyte/go-ruleguard v0.4.2 h1:htXcXDK6/rO12kiTHKfHuqR4kr3Y4M0J0rOL6CH/BYs= +github.com/quasilyte/go-ruleguard v0.4.2/go.mod h1:GJLgqsLeo4qgavUoL8JeGFNS7qcisx3awV/w9eWTmNI= +github.com/quasilyte/go-ruleguard/dsl v0.3.22 h1:wd8zkOhSNr+I+8Qeciml08ivDt1pSXe60+5DqOpCjPE= +github.com/quasilyte/go-ruleguard/dsl v0.3.22/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= github.com/quasilyte/gogrep v0.5.0 h1:eTKODPXbI8ffJMN+W2aE0+oL0z/nh8/5eNdiO34SOAo= github.com/quasilyte/gogrep v0.5.0/go.mod h1:Cm9lpz9NZjEoL1tgZ2OgeUKPIxL1meE7eo60Z6Sk+Ng= github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 h1:TCg2WBOl980XxGFEZSS6KlBGIV0diGdySzxATTWoqaU= @@ -433,20 +453,23 @@ github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727/go.mod h1:r github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 h1:M8mH9eK4OUR4lu7Gd+PU1fV2/qnDNfzT635KRSObncs= github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567/go.mod h1:DWNGW8A4Y+GyBgPuaQJuWiy0XYftx4Xm/y5Jqk9I6VQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryancurrah/gomodguard v1.3.0 h1:q15RT/pd6UggBXVBuLps8BXRvl5GPBcwVA7BJHMLuTw= -github.com/ryancurrah/gomodguard v1.3.0/go.mod h1:ggBxb3luypPEzqVtq33ee7YSN35V28XeGnid8dnni50= -github.com/ryanrolds/sqlclosecheck v0.4.0 h1:i8SX60Rppc1wRuyQjMciLqIzV3xnoHB7/tXbr6RGYNI= -github.com/ryanrolds/sqlclosecheck v0.4.0/go.mod h1:TBRRjzL31JONc9i4XMinicuo+s+E8yKZ5FN8X3G6CKQ= +github.com/ryancurrah/gomodguard v1.3.2 h1:CuG27ulzEB1Gu5Dk5gP8PFxSOZ3ptSdP5iI/3IXxM18= +github.com/ryancurrah/gomodguard v1.3.2/go.mod h1:LqdemiFomEjcxOqirbQCb3JFvSxH2JUYMerTFd3sF2o= +github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU= +github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ= github.com/sanposhiho/wastedassign/v2 v2.0.7 h1:J+6nrY4VW+gC9xFzUc+XjPD3g3wF3je/NsJFwFK7Uxc= github.com/sanposhiho/wastedassign/v2 v2.0.7/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= +github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4= +github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY= github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw= github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ= -github.com/sashamelentyev/usestdlibvars v1.23.0 h1:01h+/2Kd+NblNItNeux0veSL5cBF1jbEOPrEhDzGYq0= -github.com/sashamelentyev/usestdlibvars v1.23.0/go.mod h1:YPwr/Y1LATzHI93CqoPUN/2BzGQ/6N/cl/KwgR0B/aU= -github.com/securego/gosec/v2 v2.15.0 h1:v4Ym7FF58/jlykYmmhZ7mTm7FQvN/setNm++0fgIAtw= -github.com/securego/gosec/v2 v2.15.0/go.mod h1:VOjTrZOkUtSDt2QLSJmQBMWnvwiQPEjg0l+5juIqGk8= +github.com/sashamelentyev/usestdlibvars v1.26.0 h1:LONR2hNVKxRmzIrZR0PhSF3mhCAzvnr+DcUiHgREfXE= +github.com/sashamelentyev/usestdlibvars v1.26.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8= +github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 h1:rnO6Zp1YMQwv8AyxzuwsVohljJgp4L0ZqiCgtACsPsc= +github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9/go.mod h1:dg7lPlu/xK/Ut9SedURCoZbVCR4yC7fM65DtH9/CDHs= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk= @@ -454,24 +477,22 @@ github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOms github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/sivchari/containedctx v1.0.2 h1:0hLQKpgC53OVF1VT7CeoFHk9YKstur1XOgfYIc1yrHI= -github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw= -github.com/sivchari/nosnakecase v1.7.0 h1:7QkpWIRMe8x25gckkFd2A5Pi6Ymo0qgr4JrhGt95do8= -github.com/sivchari/nosnakecase v1.7.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= +github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= +github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+Wwfd0XE= +github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4= github.com/sivchari/tenv v1.7.1 h1:PSpuD4bu6fSmtWMxSGWcvqUUgIn7k3yOJhOIzVWn8Ak= github.com/sivchari/tenv v1.7.1/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= github.com/sonatard/noctx v0.0.2 h1:L7Dz4De2zDQhW8S0t+KUjY0MAQJd6SgVwhzNIc4ok00= github.com/sonatard/noctx v0.0.2/go.mod h1:kzFz+CzWSjQ2OzIm46uJZoXuBpa2+0y3T36U18dWqIo= github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0= github.com/sourcegraph/go-diff v0.7.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= -github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= -github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= +github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8= +github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= @@ -485,9 +506,9 @@ github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8L github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= +github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -495,8 +516,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= -github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplBwWcHBo6q9xrfWdMrT9o4kltkmmvpemgIjep/8= @@ -507,26 +529,30 @@ github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag= github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= -github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw= -github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= -github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e h1:MV6KaVu/hzByHP0UvJ4HcMGE/8a6A4Rggc/0wx2AvJo= -github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ= +github.com/tetafro/godot v1.4.16 h1:4ChfhveiNLk4NveAZ9Pu2AN8QZ2nkUGFuadM9lrr5D0= +github.com/tetafro/godot v1.4.16/go.mod h1:2oVxTBSftRTh4+MVfUaUXR6bn2GDXCaMcOG4Dk3rfio= +github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M= +github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ= github.com/timonwong/loggercheck v0.9.4 h1:HKKhqrjcVj8sxL7K77beXh0adEm6DLjV/QOGeMXEVi4= github.com/timonwong/loggercheck v0.9.4/go.mod h1:caz4zlPcgvpEkXgVnAJGowHAMW2NwHaNlpS8xDbVhTg= -github.com/tomarrell/wrapcheck/v2 v2.8.1 h1:HxSqDSN0sAt0yJYsrcYVoEeyM4aI9yAm3KQpIXDJRhQ= -github.com/tomarrell/wrapcheck/v2 v2.8.1/go.mod h1:/n2Q3NZ4XFT50ho6Hbxg+RV1uyo2Uow/Vdm9NQcl5SE= +github.com/tomarrell/wrapcheck/v2 v2.8.3 h1:5ov+Cbhlgi7s/a42BprYoxsr73CbdMUTzE3bRDFASUs= +github.com/tomarrell/wrapcheck/v2 v2.8.3/go.mod h1:g9vNIyhb5/9TQgumxQyOEqDHsmGYcGsVMOx/xGkqdMo= github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw= github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= -github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA= -github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= -github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= -github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= -github.com/uudashr/gocognit v1.0.6 h1:2Cgi6MweCsdB6kpcVQp7EW4U23iBFQWfTXiWlyp842Y= -github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY= +github.com/ultraware/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81vI= +github.com/ultraware/funlen v0.1.0/go.mod h1:XJqmOQja6DpxarLj6Jj1U7JuoS8PvL4nEqDaQhy22p4= +github.com/ultraware/whitespace v0.1.1 h1:bTPOGejYFulW3PkcrqkeQwOd6NKOOXvmGD9bo/Gk8VQ= +github.com/ultraware/whitespace v0.1.1/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8= +github.com/uudashr/gocognit v1.1.2 h1:l6BAEKJqQH2UpKAPKdMfZf5kE4W/2xk8pfU1OVLvniI= +github.com/uudashr/gocognit v1.1.2/go.mod h1:aAVdLURqcanke8h3vg35BC++eseDm66Z7KmchI5et4k= +github.com/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HHtvU= +github.com/xen0n/gosmopolitan v1.2.2/go.mod h1:7XX7Mj61uLYrj0qmeN0zi7XDon9JRAEhYQqAPLVNTeg= github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM= github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= -github.com/yeya24/promlinter v0.2.0 h1:xFKDQ82orCU5jQujdaD8stOHiv8UN68BSdn2a8u8Y3o= -github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA= +github.com/yeya24/promlinter v0.3.0 h1:JVDbMp08lVCP7Y6NP3qHroGAO6z2yGKQtS5JsjqtoFs= +github.com/yeya24/promlinter v0.3.0/go.mod h1:cDfJQQYv9uYciW60QT0eeHlFodotkYZlL+YcPQN+mW4= +github.com/ykadowak/zerologlint v0.1.5 h1:Gy/fMz1dFQN9JZTPjv1hxEk+sRWm05row04Yoolgdiw= +github.com/ykadowak/zerologlint v0.1.5/go.mod h1:KaUskqF3e/v59oPmdq1U1DnKcuHokl2/K1U4pmIELKg= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -534,17 +560,25 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -gitlab.com/bosi/decorder v0.2.3 h1:gX4/RgK16ijY8V+BRQHAySfQAb354T7/xQpDB2n10P0= -gitlab.com/bosi/decorder v0.2.3/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= +gitlab.com/bosi/decorder v0.4.2 h1:qbQaV3zgwnBZ4zPMhGLW4KZe7A7NwxEhJx39R3shffo= +gitlab.com/bosi/decorder v0.4.2/go.mod h1:muuhHoaJkA9QLcYHq4Mj8FJUwDZ+EirSHRiaTcTf6T8= +go-simpler.org/assert v0.9.0 h1:PfpmcSvL7yAnWyChSjOz6Sp6m9j5lyK8Ok9pEL31YkQ= +go-simpler.org/assert v0.9.0/go.mod h1:74Eqh5eI6vCK6Y5l3PI8ZYFXG4Sa+tkr70OIPJAUr28= +go-simpler.org/musttag v0.12.2 h1:J7lRc2ysXOq7eM8rwaTYnNrHd5JwjppzB6mScysB2Cs= +go-simpler.org/musttag v0.12.2/go.mod h1:uN1DVIasMTQKk6XSik7yrJoEysGtR2GRqvWnI9S7TYM= +go-simpler.org/sloglint v0.7.1 h1:qlGLiqHbN5islOxjeLXoPtUdZXb669RW+BDQ+xOSNoU= +go-simpler.org/sloglint v0.7.1/go.mod h1:OlaVDRh/FKKd4X4sIMbsz8st97vomydceL146Fthh/c= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/automaxprocs v1.5.3 h1:kWazyxZUrS3Gs4qUpbwo5kEIMGe/DAvi5Z4tl2NW4j8= +go.uber.org/automaxprocs v1.5.3/go.mod h1:eRbA25aqJrxAbsLO0xy5jVwPt7FQnRgjW+efnwa1WM0= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= @@ -555,9 +589,7 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= 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= @@ -569,12 +601,12 @@ 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-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= +golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc h1:ao2WRsKSzW6KuUY9IWPwWahcHCgR0s52IfwutMfEbdM= +golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc/go.mod h1:iRJReGqOEeBhDZGkGbynYwcHlctCvnjTYIamk7uXpHI= golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 h1:J74nGeMgeFnYQJN59eFwh06jX/V8g0lB7LWpjSLxtgU= -golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f h1:phY1HzDcf18Aq9A8KkmRtY9WvOFIxN8wgfvy6Zm1DV8= +golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= 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= @@ -587,7 +619,6 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -596,7 +627,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= @@ -605,8 +635,8 @@ golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91 golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI= golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= -golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.18.0 h1:5+9lSbEzPSdWkH32vYPBwEpX8KwDbM52Ud9xBUvNlb0= +golang.org/x/mod v0.18.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -636,9 +666,6 @@ golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -646,19 +673,15 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= -golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ= +golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= 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= @@ -672,8 +695,9 @@ 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-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -705,17 +729,12 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -730,16 +749,15 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= +golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= -golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -747,18 +765,16 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.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.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= 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/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= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -806,14 +822,7 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1-0.20210205202024-ef80cdb6ec6d/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= @@ -825,11 +834,10 @@ golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= -golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ= golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= -golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= +golang.org/x/tools v0.22.0 h1:gqSGLZqv+AI9lIQzniJ0nZDRG5GBPsSi+DRNHWNz6yA= +golang.org/x/tools v0.22.0/go.mod h1:aCwcsjqvq7Yqt6TNyX7QMU2enbQ/Gt0bo6krSeEri+c= 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= @@ -850,16 +858,12 @@ google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0M google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= -google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= -google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= 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= google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= @@ -889,13 +893,6 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -908,10 +905,6 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= -google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -924,13 +917,14 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= +google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -951,16 +945,12 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.4.3 h1:o/n5/K5gXqk8Gozvs2cnL0F2S1/g1vcGCAx2vETjITw= -honnef.co/go/tools v0.4.3/go.mod h1:36ZgoUOrqOk1GxwHhyryEkq8FQWkUO2xGuSMhUCcdvA= -mvdan.cc/gofumpt v0.4.0 h1:JVf4NN1mIpHogBj7ABpgOyZc65/UUOkKQFkoURsz4MM= -mvdan.cc/gofumpt v0.4.0/go.mod h1:PljLOHDeZqgS8opHRKLzp2It2VBuSdteAgqUfzMTxlQ= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= -mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d h1:3rvTIIM22r9pvXk+q3swxUQAQOxksVMGK7sml4nG57w= -mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d/go.mod h1:IeHQjmn6TOD+e4Z3RFiZMMsLVL+A96Nvptar8Fj71is= +honnef.co/go/tools v0.4.7 h1:9MDAWxMoSnB6QoSqiVr7P5mtkT9pOc1kSxchzPCnqJs= +honnef.co/go/tools v0.4.7/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= +mvdan.cc/gofumpt v0.6.0 h1:G3QvahNDmpD+Aek/bNOLrFR2XC6ZAdo62dZu65gmwGo= +mvdan.cc/gofumpt v0.6.0/go.mod h1:4L0wf+kgIPZtcCWXynNS2e6bhmj73umwnuXSZarixzA= +mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f h1:lMpcwN6GxNbWtbpI1+xzFLSW8XzX0u72NttUGVFjO3U= +mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f/go.mod h1:RSLa7mKKCNeTTMHBw5Hsy2rfJmd6O2ivt9Dw9ZqCQpQ= 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= From 0fbfff527b9b2b012aa8022e7507116dc5845d5c Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 18:26:21 +0900 Subject: [PATCH 14/20] lint-fix --- .github/workflows/test.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 3fd56348..81788350 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -37,5 +37,7 @@ jobs: run: make build - name: Test run: make test + - name: Lint-fix + run: make lint-fix - name: Lint run: make lint From ae2334acadb6d70e72c35c1a18eb7872399c337f Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 18:39:26 +0900 Subject: [PATCH 15/20] add tool chain version --- tools/go.mod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/go.mod b/tools/go.mod index c861e282..8fd74f7c 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -2,6 +2,8 @@ module github.com/mercari/tortoise/tools go 1.22 +toolchain go1.23.1 + require ( github.com/daixiang0/gci v0.13.4 github.com/golangci/golangci-lint v1.59.1 From 28080e3b9ce0ca6487aefb35001f1b9b0d74d5bd Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 18:47:30 +0900 Subject: [PATCH 16/20] change toolchain to 1.22 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1c97e284..72c6b751 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/mercari/tortoise go 1.22.0 -toolchain go1.23.1 +toolchain go1.22.6 require ( github.com/go-logr/zapr v1.3.0 From ca36611c6455c405a1ea1a9b588baaa44466e3cf Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 18:54:43 +0900 Subject: [PATCH 17/20] add timeout --- Makefile | 2 +- tools/go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6b6a3de8..bc188f27 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated .PHONY: lint lint: - golangci-lint run $(args) ./... + golangci-lint run --timeout=10m ./... .PHONY: lint-fix lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes diff --git a/tools/go.mod b/tools/go.mod index 8fd74f7c..2cb07f21 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -2,7 +2,7 @@ module github.com/mercari/tortoise/tools go 1.22 -toolchain go1.23.1 +toolchain go1.22.6 require ( github.com/daixiang0/gci v0.13.4 From 5677abc6722368b5f1fd0a8b5d40700d283ef9a1 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Wed, 23 Oct 2024 19:00:49 +0900 Subject: [PATCH 18/20] remove lint-fix --- .github/workflows/test.yaml | 2 -- Makefile | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 81788350..3fd56348 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -37,7 +37,5 @@ jobs: run: make build - name: Test run: make test - - name: Lint-fix - run: make lint-fix - name: Lint run: make lint diff --git a/Makefile b/Makefile index bc188f27..461646e3 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,7 @@ lint: .PHONY: lint-fix lint-fix: golangci-lint ## Run golangci-lint linter and perform fixes find . -name "*.go" | xargs gci write --section Standard --section Default --section "Prefix(github.com/mercari/tortoise)" --section blank --section dot - @make lint args='--fix -v' cons_args='-v' + @make lint args='--fix -v --timeout=10m' cons_args='-v' ##@ Build From a6b03184eaade5d581ee1d4246a57689f63f2fea Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Tue, 29 Oct 2024 11:20:04 +0900 Subject: [PATCH 19/20] edit licenses --- test/e2e/e2e_suite_test.go | 29 ++++++++++++++++++----------- test/e2e/e2e_test.go | 34 +++++++++++++++++++++------------- test/utils/utils.go | 34 +++++++++++++++++++++------------- 3 files changed, 60 insertions(+), 37 deletions(-) diff --git a/test/e2e/e2e_suite_test.go b/test/e2e/e2e_suite_test.go index ade105f9..03d55ef6 100644 --- a/test/e2e/e2e_suite_test.go +++ b/test/e2e/e2e_suite_test.go @@ -1,19 +1,26 @@ /* -Copyright 2024. +MIT License -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at +# Copyright (c) 2023 mercari - http://www.apache.org/licenses/LICENSE-2.0 +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ package e2e import ( diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 717c979f..0b99ad8d 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -1,17 +1,25 @@ /* -Copyright 2024. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +MIT License + +# Copyright (c) 2023 mercari + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. */ package e2e diff --git a/test/utils/utils.go b/test/utils/utils.go index 6b96ab5d..9a63872e 100644 --- a/test/utils/utils.go +++ b/test/utils/utils.go @@ -1,17 +1,25 @@ /* -Copyright 2024. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. +MIT License + +# Copyright (c) 2023 mercari + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. */ package utils From e8454e981c757f26a9a74e30c80ddd81e3b86585 Mon Sep 17 00:00:00 2001 From: randytqwjp Date: Fri, 1 Nov 2024 15:03:15 +0900 Subject: [PATCH 20/20] remove chmod --- cmd/tortoisectl/test/tortoisectl_test.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmd/tortoisectl/test/tortoisectl_test.go b/cmd/tortoisectl/test/tortoisectl_test.go index a87a5a9f..319e7090 100644 --- a/cmd/tortoisectl/test/tortoisectl_test.go +++ b/cmd/tortoisectl/test/tortoisectl_test.go @@ -73,10 +73,6 @@ func Test_TortoiseCtlStop(t *testing.T) { // Build the latest binary. buildTortoiseCtl(t) - _, _, err := execCommand(t, "chmod", "+x", "./testdata/bin/tortoisectl") - if err != nil { - t.Fatalf("Failed to build tortoisectl: %v", err) - } testEnv, cfg := prepareCluster(t) defer destryCluster(t, testEnv)