From 2271fa26ba0b66afdab14238f6ebffe4dae73ffd Mon Sep 17 00:00:00 2001 From: FlamingSaint Date: Wed, 12 Jun 2024 08:23:02 +0530 Subject: [PATCH 1/7] Fix errors after dependabot upgrade Signed-off-by: FlamingSaint --- .github/actions/setup-node.js/action.yml | 2 +- .github/workflows/ci-all-in-one-build.yml | 2 +- .github/workflows/ci-badger.yaml | 2 +- .github/workflows/ci-build-binaries.yml | 2 +- .github/workflows/ci-cassandra.yml | 2 +- .github/workflows/ci-crossdock.yml | 2 +- .github/workflows/ci-docker-build.yml | 2 +- .github/workflows/ci-elasticsearch.yml | 2 +- .github/workflows/ci-grpc.yml | 2 +- .github/workflows/ci-hotrod.yml | 2 +- .github/workflows/ci-kafka.yml | 2 +- .github/workflows/ci-lint-checks.yaml | 4 +- .github/workflows/ci-opensearch.yml | 2 +- .github/workflows/ci-protogen-tests.yml | 2 +- .github/workflows/ci-release-testing.yml | 2 +- .github/workflows/ci-release.yml | 2 +- .github/workflows/ci-unit-tests-go-tip.yml | 2 +- .github/workflows/ci-unit-tests.yml | 2 +- .../ci-validation-of-shell-scripts.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/fossa.yml | 2 +- .github/workflows/scorecard.yml | 2 +- cmd/agent/app/agent_test.go | 2 +- cmd/agent/main.go | 2 +- cmd/all-in-one/main.go | 2 +- .../app/anonymizer/anonymizer_test.go | 2 +- cmd/anonymizer/main.go | 2 +- cmd/collector/app/collector.go | 2 +- .../app/handler/otlp_receiver_test.go | 2 +- cmd/collector/app/model_consumer_test.go | 4 +- cmd/collector/app/options.go | 6 +- cmd/collector/app/options_test.go | 8 +- cmd/collector/app/server/grpc_test.go | 2 +- cmd/collector/app/span_processor_test.go | 4 +- cmd/collector/main.go | 2 +- cmd/es-index-cleaner/main.go | 2 +- cmd/es-rollover/app/actions_test.go | 2 +- cmd/es-rollover/app/init/action_test.go | 16 +- cmd/es-rollover/app/rollover/action_test.go | 2 +- cmd/es-rollover/main.go | 6 +- cmd/esmapping-generator/main.go | 2 +- cmd/ingester/app/consumer/consumer_test.go | 4 +- .../app/consumer/deadlock_detector_test.go | 8 +- .../app/consumer/offset/manager_test.go | 2 +- .../app/processor/decorator/retry_test.go | 2 +- cmd/ingester/main.go | 2 +- cmd/internal/docs/command.go | 2 +- cmd/internal/env/command.go | 2 +- cmd/internal/flags/admin_test.go | 2 +- cmd/internal/printconfig/command.go | 2 +- cmd/internal/status/command.go | 2 +- cmd/jaeger/internal/command_test.go | 9 +- cmd/jaeger/internal/components_test.go | 2 +- .../extension/jaegerstorage/extension_test.go | 2 +- .../storagereceiver/receiver_test.go | 2 +- cmd/query/app/additional_headers_test.go | 2 +- cmd/query/app/apiv3/http_gateway.go | 2 +- cmd/query/app/apiv3/http_gateway_test.go | 2 +- cmd/query/app/grpc_handler_test.go | 8 +- cmd/query/app/querysvc/query_service_test.go | 2 +- cmd/query/main.go | 2 +- cmd/remote-storage/main.go | 2 +- crossdock/services/agent_test.go | 2 +- crossdock/services/query_test.go | 2 +- crossdock/services/tracehandler_test.go | 16 +- examples/hotrod/cmd/all.go | 2 +- examples/hotrod/cmd/customer.go | 2 +- examples/hotrod/cmd/driver.go | 2 +- examples/hotrod/cmd/frontend.go | 2 +- examples/hotrod/cmd/route.go | 2 +- internal/tools/go.mod | 159 ++++--- internal/tools/go.sum | 407 ++++++++---------- pkg/bearertoken/http_test.go | 4 +- pkg/cache/lru_test.go | 6 +- pkg/es/client/index_client_test.go | 2 +- pkg/es/config/config.go | 2 +- pkg/httpmetrics/metrics_test.go | 4 +- pkg/jtracer/jtracer.go | 4 +- pkg/jtracer/jtracer_test.go | 8 +- pkg/queue/bounded_queue_test.go | 22 +- pkg/recoveryhandler/zap_test.go | 2 +- pkg/tenancy/grpc.go | 4 +- pkg/tenancy/grpc_test.go | 6 +- pkg/tenancy/http.go | 2 +- pkg/version/command.go | 2 +- .../prometheus/metricsstore/reader_test.go | 4 +- .../distributedlock/cassandra/lock_test.go | 2 +- .../calculationstrategy/interface_test.go | 2 +- .../badger/dependencystore/storage_test.go | 2 +- plugin/storage/badger/factory.go | 2 +- .../badger/spanstore/read_write_test.go | 22 +- .../cassandra/dependencystore/storage_test.go | 2 +- plugin/storage/cassandra/factory_test.go | 4 +- .../cassandra/samplingstore/storage_test.go | 2 +- .../spanstore/dbmodel/index_filter.go | 2 +- .../cassandra/spanstore/matchers_test.go | 2 +- .../cassandra/spanstore/operation_names.go | 2 +- .../spanstore/operation_names_test.go | 4 +- .../cassandra/spanstore/reader_test.go | 4 +- .../cassandra/spanstore/service_names_test.go | 4 +- .../cassandra/spanstore/writer_test.go | 26 +- plugin/storage/es/factory_test.go | 4 +- plugin/storage/es/spanstore/reader.go | 4 +- plugin/storage/es/spanstore/reader_test.go | 6 +- plugin/storage/es/spanstore/writer.go | 4 +- plugin/storage/grpc/config_test.go | 2 +- plugin/storage/integration/integration.go | 4 +- renovate.json | 10 - storage/spanstore/downsampling_writer_test.go | 4 +- 110 files changed, 452 insertions(+), 517 deletions(-) delete mode 100644 renovate.json diff --git a/.github/actions/setup-node.js/action.yml b/.github/actions/setup-node.js/action.yml index 4f421b6a2a9..45fdbc7ed60 100644 --- a/.github/actions/setup-node.js/action.yml +++ b/.github/actions/setup-node.js/action.yml @@ -8,7 +8,7 @@ runs: run: | echo "JAEGER_UI_NODE_JS_VERSION=$(cat jaeger-ui/.nvmrc)" >> ${GITHUB_ENV} - - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v4.0.2 + - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c with: node-version: ${{ env.JAEGER_UI_NODE_JS_VERSION }} cache: 'yarn' diff --git a/.github/workflows/ci-all-in-one-build.yml b/.github/workflows/ci-all-in-one-build.yml index 82e71896734..1c48d5921b2 100644 --- a/.github/workflows/ci-all-in-one-build.yml +++ b/.github/workflows/ci-all-in-one-build.yml @@ -34,7 +34,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: submodules: true diff --git a/.github/workflows/ci-badger.yaml b/.github/workflows/ci-badger.yaml index 41457371787..4af196eb064 100644 --- a/.github/workflows/ci-badger.yaml +++ b/.github/workflows/ci-badger.yaml @@ -27,7 +27,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: diff --git a/.github/workflows/ci-build-binaries.yml b/.github/workflows/ci-build-binaries.yml index 6afe0ddc169..cd55ce9a057 100644 --- a/.github/workflows/ci-build-binaries.yml +++ b/.github/workflows/ci-build-binaries.yml @@ -42,7 +42,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: submodules: true diff --git a/.github/workflows/ci-cassandra.yml b/.github/workflows/ci-cassandra.yml index ef899843afb..ba9544bdcf6 100644 --- a/.github/workflows/ci-cassandra.yml +++ b/.github/workflows/ci-cassandra.yml @@ -35,7 +35,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: diff --git a/.github/workflows/ci-crossdock.yml b/.github/workflows/ci-crossdock.yml index da8847efb59..5bd75a08f4c 100644 --- a/.github/workflows/ci-crossdock.yml +++ b/.github/workflows/ci-crossdock.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: submodules: true diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml index 2bd07974dbd..92c431a73d1 100644 --- a/.github/workflows/ci-docker-build.yml +++ b/.github/workflows/ci-docker-build.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: submodules: true diff --git a/.github/workflows/ci-elasticsearch.yml b/.github/workflows/ci-elasticsearch.yml index fa5a684e1d1..f231da0d4f7 100644 --- a/.github/workflows/ci-elasticsearch.yml +++ b/.github/workflows/ci-elasticsearch.yml @@ -38,7 +38,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: submodules: true diff --git a/.github/workflows/ci-grpc.yml b/.github/workflows/ci-grpc.yml index 544c2c992b1..89f16421ddd 100644 --- a/.github/workflows/ci-grpc.yml +++ b/.github/workflows/ci-grpc.yml @@ -27,7 +27,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: diff --git a/.github/workflows/ci-hotrod.yml b/.github/workflows/ci-hotrod.yml index 1daede655bd..55f2b4ce742 100644 --- a/.github/workflows/ci-hotrod.yml +++ b/.github/workflows/ci-hotrod.yml @@ -24,7 +24,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: submodules: true diff --git a/.github/workflows/ci-kafka.yml b/.github/workflows/ci-kafka.yml index 8f83d6d3231..cad099d8fbd 100644 --- a/.github/workflows/ci-kafka.yml +++ b/.github/workflows/ci-kafka.yml @@ -24,7 +24,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: diff --git a/.github/workflows/ci-lint-checks.yaml b/.github/workflows/ci-lint-checks.yaml index a94b021736d..e8a1fe01f4b 100644 --- a/.github/workflows/ci-lint-checks.yaml +++ b/.github/workflows/ci-lint-checks.yaml @@ -24,7 +24,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after a couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Ensure PR is not on main branch uses: ./.github/actions/block-pr-not-on-main @@ -35,7 +35,7 @@ jobs: python-version: '3.x' - name: Run DCO check - run: python3 scripts/dco_check.py -b main -v --exclude-pattern '\[bot\]@users\.noreply\.github\.com' + run: python3 scripts/dco_check.py -b main -v --exclude-pattern 'dependabot\[bot\]@users\.noreply\.github\.com' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci-opensearch.yml b/.github/workflows/ci-opensearch.yml index 3e7290ef8da..c7d1c1e1032 100644 --- a/.github/workflows/ci-opensearch.yml +++ b/.github/workflows/ci-opensearch.yml @@ -38,7 +38,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: submodules: true diff --git a/.github/workflows/ci-protogen-tests.yml b/.github/workflows/ci-protogen-tests.yml index 5ec3e5c065b..7360f36ddec 100644 --- a/.github/workflows/ci-protogen-tests.yml +++ b/.github/workflows/ci-protogen-tests.yml @@ -24,7 +24,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: submodules: recursive diff --git a/.github/workflows/ci-release-testing.yml b/.github/workflows/ci-release-testing.yml index 4440c9af012..054a907f128 100644 --- a/.github/workflows/ci-release-testing.yml +++ b/.github/workflows/ci-release-testing.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: submodules: true diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 21dc2d8ed89..4460ccff067 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -34,7 +34,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: submodules: true diff --git a/.github/workflows/ci-unit-tests-go-tip.yml b/.github/workflows/ci-unit-tests-go-tip.yml index c86e9e18ce9..142cf847053 100644 --- a/.github/workflows/ci-unit-tests-go-tip.yml +++ b/.github/workflows/ci-unit-tests-go-tip.yml @@ -18,7 +18,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Install Go Tip uses: ./.github/actions/setup-go-tip diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml index b1029b262a9..cabcc403a7b 100644 --- a/.github/workflows/ci-unit-tests.yml +++ b/.github/workflows/ci-unit-tests.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: diff --git a/.github/workflows/ci-validation-of-shell-scripts.yml b/.github/workflows/ci-validation-of-shell-scripts.yml index 7ea7403ccc8..3078301ece9 100644 --- a/.github/workflows/ci-validation-of-shell-scripts.yml +++ b/.github/workflows/ci-validation-of-shell-scripts.yml @@ -21,7 +21,7 @@ jobs: egress-policy: audit - name: check out code - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: Install shellcheck run: sudo apt-get install shellcheck diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index aeb6cd5580b..dc08ee1691b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -40,7 +40,7 @@ jobs: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - name: Checkout repository - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index f37ea6dda98..40d7217fd15 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -22,6 +22,6 @@ jobs: egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - name: 'Dependency Review' uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2 diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index cec9b4ba7d1..fb0aae84dc9 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0 with: diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 5032d0f7919..b84696e8170 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -37,7 +37,7 @@ jobs: egress-policy: audit - name: "Checkout code" - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 with: persist-credentials: false diff --git a/cmd/agent/app/agent_test.go b/cmd/agent/app/agent_test.go index 866523cede9..77a82a277a9 100644 --- a/cmd/agent/app/agent_test.go +++ b/cmd/agent/app/agent_test.go @@ -72,7 +72,7 @@ func TestAgentSamplingEndpoint(t *testing.T) { } func TestAgentMetricsEndpoint(t *testing.T) { - withRunningAgent(t, func(httpAddr string, errorch chan error) { + withRunningAgent(t, func(httpAddr string, _ chan error) { url := fmt.Sprintf("http://%s/metrics", httpAddr) resp, err := http.Get(url) require.NoError(t, err) diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 01ebdedd3f6..76179ca4102 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -50,7 +50,7 @@ func main() { Use: "jaeger-agent", Short: "(deprecated) Jaeger agent is a local daemon program which collects tracing data.", Long: `(deprecated) Jaeger agent is a daemon program that runs on every host and receives tracing data submitted by Jaeger client libraries.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go index 52bcebd1ce4..3dd736487b6 100644 --- a/cmd/all-in-one/main.go +++ b/cmd/all-in-one/main.go @@ -89,7 +89,7 @@ func main() { Short: "Jaeger all-in-one distribution with agent, collector and query in one process.", Long: `Jaeger all-in-one distribution with agent, collector and query. Use with caution this version by default uses only in-memory database.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/cmd/anonymizer/app/anonymizer/anonymizer_test.go b/cmd/anonymizer/app/anonymizer/anonymizer_test.go index b6690745e73..d5d81352e1d 100644 --- a/cmd/anonymizer/app/anonymizer/anonymizer_test.go +++ b/cmd/anonymizer/app/anonymizer/anonymizer_test.go @@ -124,7 +124,7 @@ func TestAnonymizer_SaveMapping(t *testing.T) { } for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + t.Run(tt.name, func(_ *testing.T) { anonymizer := Anonymizer{ logger: nopLogger, mapping: mapping, diff --git a/cmd/anonymizer/main.go b/cmd/anonymizer/main.go index 0e2949146f1..89577c3399b 100644 --- a/cmd/anonymizer/main.go +++ b/cmd/anonymizer/main.go @@ -39,7 +39,7 @@ func main() { Use: "jaeger-anonymizer", Short: "Jaeger anonymizer hashes fields of a trace for easy sharing", Long: `Jaeger anonymizer queries Jaeger query for a trace, anonymizes fields, and store in file`, - Run: func(cmd *cobra.Command, args []string) { + Run: func(_ *cobra.Command, _ /* args */ []string) { prefix := options.OutputDir + "/" + options.TraceID conf := writer.Config{ MaxSpansCount: options.MaxSpansCount, diff --git a/cmd/collector/app/collector.go b/cmd/collector/app/collector.go index e6bf7f98089..68b3cac8bb9 100644 --- a/cmd/collector/app/collector.go +++ b/cmd/collector/app/collector.go @@ -105,7 +105,7 @@ func (c *Collector) Start(options *flags.CollectorOptions) error { var additionalProcessors []ProcessSpan if c.aggregator != nil { - additionalProcessors = append(additionalProcessors, func(span *model.Span, tenant string) { + additionalProcessors = append(additionalProcessors, func(span *model.Span, _ /* tenant */ string) { c.aggregator.HandleRootSpan(span, c.logger) }) } diff --git a/cmd/collector/app/handler/otlp_receiver_test.go b/cmd/collector/app/handler/otlp_receiver_test.go index d89defd536f..73bfcc6e1e6 100644 --- a/cmd/collector/app/handler/otlp_receiver_test.go +++ b/cmd/collector/app/handler/otlp_receiver_test.go @@ -127,7 +127,7 @@ func TestStartOtlpReceiver_Error(t *testing.T) { func TestProtoFromTracesError(t *testing.T) { mockErr := errors.New("mock error") c := &consumerDelegate{ - protoFromTraces: func(td ptrace.Traces) ([]*model.Batch, error) { + protoFromTraces: func(_ ptrace.Traces) ([]*model.Batch, error) { return nil, mockErr }, } diff --git a/cmd/collector/app/model_consumer_test.go b/cmd/collector/app/model_consumer_test.go index 6cd0bcdcb46..7bd25999db1 100644 --- a/cmd/collector/app/model_consumer_test.go +++ b/cmd/collector/app/model_consumer_test.go @@ -26,8 +26,8 @@ import ( func TestChainedProcessSpan(t *testing.T) { happened1 := false happened2 := false - func1 := func(span *model.Span, tenant string) { happened1 = true } - func2 := func(span *model.Span, tenant string) { happened2 = true } + func1 := func(_ *model.Span, _ /* tenant */ string) { happened1 = true } + func2 := func(_ *model.Span, _ /* tenant */ string) { happened2 = true } chained := ChainedProcessSpan(func1, func2) chained(&model.Span{}, "") assert.True(t, happened1) diff --git a/cmd/collector/app/options.go b/cmd/collector/app/options.go index 477f1296073..22016f6c92e 100644 --- a/cmd/collector/app/options.go +++ b/cmd/collector/app/options.go @@ -187,16 +187,16 @@ func (options) apply(opts ...Option) options { ret.hostMetrics = metrics.NullFactory } if ret.preProcessSpans == nil { - ret.preProcessSpans = func(spans []*model.Span, tenant string) {} + ret.preProcessSpans = func(_ []*model.Span, _ /* tenant */ string) {} } if ret.sanitizer == nil { ret.sanitizer = func(span *model.Span) *model.Span { return span } } if ret.preSave == nil { - ret.preSave = func(span *model.Span, tenant string) {} + ret.preSave = func(_ *model.Span, _ /* tenant */ string) {} } if ret.spanFilter == nil { - ret.spanFilter = func(span *model.Span) bool { return true } + ret.spanFilter = func(_ *model.Span) bool { return true } } if ret.numWorkers == 0 { ret.numWorkers = flags.DefaultNumWorkers diff --git a/cmd/collector/app/options_test.go b/cmd/collector/app/options_test.go index e416166829f..4ed92300e40 100644 --- a/cmd/collector/app/options_test.go +++ b/cmd/collector/app/options_test.go @@ -33,20 +33,20 @@ func TestAllOptionSet(t *testing.T) { Options.ReportBusy(true), Options.BlockingSubmit(true), Options.ExtraFormatTypes(types), - Options.SpanFilter(func(span *model.Span) bool { return true }), + Options.SpanFilter(func(_ *model.Span) bool { return true }), Options.HostMetrics(metrics.NullFactory), Options.ServiceMetrics(metrics.NullFactory), Options.Logger(zap.NewNop()), Options.NumWorkers(5), - Options.PreProcessSpans(func(spans []*model.Span, tenant string) {}), + Options.PreProcessSpans(func(_ []*model.Span, _ /* tenant */ string) {}), Options.Sanitizer(func(span *model.Span) *model.Span { return span }), Options.QueueSize(10), Options.DynQueueSizeWarmup(1000), Options.DynQueueSizeMemory(1024), - Options.PreSave(func(span *model.Span, tenant string) {}), + Options.PreSave(func(_ *model.Span, _ /* tenant */ string) {}), Options.CollectorTags(map[string]string{"extra": "tags"}), Options.SpanSizeMetricsEnabled(true), - Options.OnDroppedSpan(func(span *model.Span) {}), + Options.OnDroppedSpan(func(_ *model.Span) {}), ) assert.EqualValues(t, 5, opts.numWorkers) assert.EqualValues(t, 10, opts.queueSize) diff --git a/cmd/collector/app/server/grpc_test.go b/cmd/collector/app/server/grpc_test.go index 647445a2b5b..7aad04daa97 100644 --- a/cmd/collector/app/server/grpc_test.go +++ b/cmd/collector/app/server/grpc_test.go @@ -62,7 +62,7 @@ func TestFailServe(t *testing.T) { Handler: handler.NewGRPCHandler(logger, &mockSpanProcessor{}, &tenancy.Manager{}), SamplingStore: &mockSamplingStore{}, Logger: logger, - OnError: func(e error) { + OnError: func(_ error) { assert.Len(t, logs.All(), 1) assert.Equal(t, "Could not launch gRPC service", logs.All()[0].Message) wg.Done() diff --git a/cmd/collector/app/span_processor_test.go b/cmd/collector/app/span_processor_test.go index e3a7eca40e4..37455119f61 100644 --- a/cmd/collector/app/span_processor_test.go +++ b/cmd/collector/app/span_processor_test.go @@ -446,7 +446,7 @@ func TestSpanProcessorCountSpan(t *testing.T) { } for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + t.Run(tt.name, func(_ *testing.T) { mb := metricstest.NewFactory(time.Hour) defer mb.Backend.Stop() m := mb.Namespace(metrics.NSOptions{}) @@ -635,7 +635,7 @@ func TestAdditionalProcessors(t *testing.T) { // additional processor is called count := 0 - f := func(s *model.Span, t string) { + f := func(_ *model.Span, _ string) { count++ } p = NewSpanProcessor(w, []ProcessSpan{f}, Options.QueueSize(1)) diff --git a/cmd/collector/main.go b/cmd/collector/main.go index 9bed4c3bf77..845480d4018 100644 --- a/cmd/collector/main.go +++ b/cmd/collector/main.go @@ -65,7 +65,7 @@ func main() { Use: "jaeger-collector", Short: "Jaeger collector receives and processes traces from Jaeger agents and clients", Long: `Jaeger collector receives traces from Jaeger agents and runs them through a processing pipeline.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/cmd/es-index-cleaner/main.go b/cmd/es-index-cleaner/main.go index 7cb83afbb29..074c6a1741f 100644 --- a/cmd/es-index-cleaner/main.go +++ b/cmd/es-index-cleaner/main.go @@ -42,7 +42,7 @@ func main() { Use: "jaeger-es-index-cleaner NUM_OF_DAYS http://HOSTNAME:PORT", Short: "Jaeger es-index-cleaner removes Jaeger indices", Long: "Jaeger es-index-cleaner removes Jaeger indices", - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, args []string) error { if len(args) != 2 { return fmt.Errorf("wrong number of arguments") } diff --git a/cmd/es-rollover/app/actions_test.go b/cmd/es-rollover/app/actions_test.go index bf73b843c82..a87cbef2aa5 100644 --- a/cmd/es-rollover/app/actions_test.go +++ b/cmd/es-rollover/app/actions_test.go @@ -100,7 +100,7 @@ func TestExecuteAction(t *testing.T) { Viper: v, Logger: logger, TLSFlags: tlsFlags, - }, func(c client.Client, cfg Config) Action { + }, func(c client.Client, _ Config) Action { assert.Equal(t, "https://localhost:9300", c.Endpoint) transport, ok := c.Client.Transport.(*http.Transport) require.True(t, ok) diff --git a/cmd/es-rollover/app/init/action_test.go b/cmd/es-rollover/app/init/action_test.go index 774c14e0bf8..e1ee8115c39 100644 --- a/cmd/es-rollover/app/init/action_test.go +++ b/cmd/es-rollover/app/init/action_test.go @@ -97,7 +97,7 @@ func TestRolloverAction(t *testing.T) { }{ { name: "Unsupported version", - setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, ilmClient *mocks.MockILMAPI) { + setupCallExpectations: func(_ *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, _ *mocks.MockILMAPI) { clusterClient.On("Version").Return(uint(5), nil) }, config: Config{ @@ -110,7 +110,7 @@ func TestRolloverAction(t *testing.T) { }, { name: "error getting version", - setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, ilmClient *mocks.MockILMAPI) { + setupCallExpectations: func(_ *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, _ *mocks.MockILMAPI) { clusterClient.On("Version").Return(uint(0), errors.New("version error")) }, expectedErr: errors.New("version error"), @@ -123,7 +123,7 @@ func TestRolloverAction(t *testing.T) { }, { name: "ilm doesnt exist", - setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, ilmClient *mocks.MockILMAPI) { + setupCallExpectations: func(_ *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, ilmClient *mocks.MockILMAPI) { clusterClient.On("Version").Return(uint(7), nil) ilmClient.On("Exists", "myilmpolicy").Return(false, nil) }, @@ -138,7 +138,7 @@ func TestRolloverAction(t *testing.T) { }, { name: "fail get ilm policy", - setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, ilmClient *mocks.MockILMAPI) { + setupCallExpectations: func(_ *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, ilmClient *mocks.MockILMAPI) { clusterClient.On("Version").Return(uint(7), nil) ilmClient.On("Exists", "myilmpolicy").Return(false, errors.New("error getting ilm policy")) }, @@ -153,7 +153,7 @@ func TestRolloverAction(t *testing.T) { }, { name: "fail to create template", - setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, ilmClient *mocks.MockILMAPI) { + setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, _ *mocks.MockILMAPI) { clusterClient.On("Version").Return(uint(7), nil) indexClient.On("CreateTemplate", mock.Anything, "jaeger-span").Return(errors.New("error creating template")) }, @@ -167,7 +167,7 @@ func TestRolloverAction(t *testing.T) { }, { name: "fail to get jaeger indices", - setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, ilmClient *mocks.MockILMAPI) { + setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, _ *mocks.MockILMAPI) { clusterClient.On("Version").Return(uint(7), nil) indexClient.On("CreateTemplate", mock.Anything, "jaeger-span").Return(nil) indexClient.On("CreateIndex", "jaeger-span-archive-000001").Return(nil) @@ -183,7 +183,7 @@ func TestRolloverAction(t *testing.T) { }, { name: "fail to create alias", - setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, ilmClient *mocks.MockILMAPI) { + setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, _ *mocks.MockILMAPI) { clusterClient.On("Version").Return(uint(7), nil) indexClient.On("CreateTemplate", mock.Anything, "jaeger-span").Return(nil) indexClient.On("CreateIndex", "jaeger-span-archive-000001").Return(nil) @@ -203,7 +203,7 @@ func TestRolloverAction(t *testing.T) { }, { name: "create rollover index", - setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, ilmClient *mocks.MockILMAPI) { + setupCallExpectations: func(indexClient *mocks.MockIndexAPI, clusterClient *mocks.MockClusterAPI, _ *mocks.MockILMAPI) { clusterClient.On("Version").Return(uint(7), nil) indexClient.On("CreateTemplate", mock.Anything, "jaeger-span").Return(nil) indexClient.On("CreateIndex", "jaeger-span-archive-000001").Return(nil) diff --git a/cmd/es-rollover/app/rollover/action_test.go b/cmd/es-rollover/app/rollover/action_test.go index 9aa760ed256..3d092e464e5 100644 --- a/cmd/es-rollover/app/rollover/action_test.go +++ b/cmd/es-rollover/app/rollover/action_test.go @@ -116,7 +116,7 @@ func TestRolloverAction(t *testing.T) { unmarshalErrExpected: true, createAliasErr: errors.New("unable to create alias"), indices: readIndices, - setupCallExpectations: func(indexClient *mocks.MockIndexAPI, test *testCase) {}, + setupCallExpectations: func(_ *mocks.MockIndexAPI, _ *testCase) {}, }, } diff --git a/cmd/es-rollover/main.go b/cmd/es-rollover/main.go index f1585942df8..e23445bc147 100644 --- a/cmd/es-rollover/main.go +++ b/cmd/es-rollover/main.go @@ -51,7 +51,7 @@ func main() { Long: "creates indices and aliases", Args: cobra.ExactArgs(1), SilenceUsage: true, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, args []string) error { return app.ExecuteAction(app.ActionExecuteOptions{ Args: args, Viper: v, @@ -88,7 +88,7 @@ func main() { Short: "rollover to new write index", Long: "rollover to new write index", Args: cobra.ExactArgs(1), - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, args []string) error { rolloverCfg.InitFromViper(v) return app.ExecuteAction(app.ActionExecuteOptions{ Args: args, @@ -117,7 +117,7 @@ func main() { Short: "removes old indices from read alias", Long: "removes old indices from read alias", Args: cobra.ExactArgs(1), - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, args []string) error { lookbackCfg.InitFromViper(v) return app.ExecuteAction(app.ActionExecuteOptions{ Args: args, diff --git a/cmd/esmapping-generator/main.go b/cmd/esmapping-generator/main.go index d0cc9ccc910..010ddbc1650 100644 --- a/cmd/esmapping-generator/main.go +++ b/cmd/esmapping-generator/main.go @@ -34,7 +34,7 @@ func main() { Use: "jaeger-esmapping-generator", Short: "Jaeger esmapping-generator prints rendered mappings as string", Long: `Jaeger esmapping-generator renders passed templates with provided values and prints rendered output to stdout`, - Run: func(cmd *cobra.Command, args []string) { + Run: func(_ *cobra.Command, _ /* args */ []string) { if !renderer.IsValidOption(options.Mapping) { logger.Fatal("please pass either 'jaeger-service' or 'jaeger-span' as argument") } diff --git a/cmd/ingester/app/consumer/consumer_test.go b/cmd/ingester/app/consumer/consumer_test.go index 4825d69af6c..8c9d5a82f22 100644 --- a/cmd/ingester/app/consumer/consumer_test.go +++ b/cmd/ingester/app/consumer/consumer_test.go @@ -77,7 +77,7 @@ func newSaramaClusterConsumer(saramaPartitionConsumer sarama.PartitionConsumer, } saramaClusterConsumer := &kmocks.Consumer{} saramaClusterConsumer.On("Partitions").Return((<-chan cluster.PartitionConsumer)(pcha)) - saramaClusterConsumer.On("Close").Return(nil).Run(func(args mock.Arguments) { + saramaClusterConsumer.On("Close").Return(nil).Run(func(_ mock.Arguments) { mc.Close() close(pcha) }) @@ -127,7 +127,7 @@ func TestSaramaConsumerWrapper_start_Messages(t *testing.T) { isProcessed := sync.WaitGroup{} isProcessed.Add(1) mp := &pmocks.SpanProcessor{} - mp.On("Process", saramaMessageWrapper{msg}).Return(func(msg processor.Message) error { + mp.On("Process", saramaMessageWrapper{msg}).Return(func(_ processor.Message) error { isProcessed.Done() return nil }) diff --git a/cmd/ingester/app/consumer/deadlock_detector_test.go b/cmd/ingester/app/consumer/deadlock_detector_test.go index d7627b8c297..5530d11501a 100644 --- a/cmd/ingester/app/consumer/deadlock_detector_test.go +++ b/cmd/ingester/app/consumer/deadlock_detector_test.go @@ -87,7 +87,7 @@ func TestPanicForPartition(*testing.T) { metricsFactory: metricstest.NewFactory(0), logger: l, interval: 1, - panicFunc: func(partition int32) { + panicFunc: func(_ /* partition */ int32) { wg.Done() }, } @@ -104,7 +104,7 @@ func TestGlobalPanic(*testing.T) { metricsFactory: metricstest.NewFactory(0), logger: l, interval: 1, - panicFunc: func(partition int32) { + panicFunc: func(_ /* partition */ int32) { wg.Done() }, } @@ -119,7 +119,7 @@ func TestNoGlobalPanicIfDeadlockDetectorDisabled(t *testing.T) { metricsFactory: metricstest.NewFactory(0), logger: l, interval: 0, - panicFunc: func(partition int32) { + panicFunc: func(_ /* partition */ int32) { t.Errorf("Should not panic when deadlock detector is disabled") }, } @@ -137,7 +137,7 @@ func TestNoPanicForPartitionIfDeadlockDetectorDisabled(t *testing.T) { metricsFactory: metricstest.NewFactory(0), logger: l, interval: 0, - panicFunc: func(partition int32) { + panicFunc: func(_ /* partition */ int32) { t.Errorf("Should not panic when deadlock detector is disabled") }, } diff --git a/cmd/ingester/app/consumer/offset/manager_test.go b/cmd/ingester/app/consumer/offset/manager_test.go index 74ec07e70da..bd727140eb2 100644 --- a/cmd/ingester/app/consumer/offset/manager_test.go +++ b/cmd/ingester/app/consumer/offset/manager_test.go @@ -54,7 +54,7 @@ func TestHandleReset(t *testing.T) { func TestCache(t *testing.T) { offset := int64(1498) - fakeMarker := func(offset int64) { + fakeMarker := func(_ /* offset */ int64) { assert.Fail(t, "Shouldn't mark cached offset") } manager := NewManager(offset, fakeMarker, "test_topic", 1, metrics.NullFactory) diff --git a/cmd/ingester/app/processor/decorator/retry_test.go b/cmd/ingester/app/processor/decorator/retry_test.go index 867ee2e93e0..9cec75b4e91 100644 --- a/cmd/ingester/app/processor/decorator/retry_test.go +++ b/cmd/ingester/app/processor/decorator/retry_test.go @@ -134,7 +134,7 @@ func Test_ProcessBackoff(t *testing.T) { }, } for _, tt := range tests { - t.Run(tt.name, func(t *testing.T) { + t.Run(tt.name, func(_ *testing.T) { rd := &retryDecorator{ retryAttempts: metrics.NullCounter, options: retryOptions{ diff --git a/cmd/ingester/main.go b/cmd/ingester/main.go index c4680edda68..82581b32fe3 100644 --- a/cmd/ingester/main.go +++ b/cmd/ingester/main.go @@ -52,7 +52,7 @@ func main() { Use: "jaeger-ingester", Short: "Jaeger ingester consumes from Kafka and writes to storage.", Long: `Jaeger ingester consumes spans from a particular Kafka topic and writes them to a configured storage.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/cmd/internal/docs/command.go b/cmd/internal/docs/command.go index 47b554ce57b..3f141c39371 100644 --- a/cmd/internal/docs/command.go +++ b/cmd/internal/docs/command.go @@ -38,7 +38,7 @@ func Command(v *viper.Viper) *cobra.Command { Use: "docs", Short: "Generates documentation", Long: `Generates command and flags documentation`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(cmd *cobra.Command, _ /* args */ []string) error { for cmd.Parent() != nil { cmd = cmd.Parent() } diff --git a/cmd/internal/env/command.go b/cmd/internal/env/command.go index c2984d71e2d..fb32aebaf5d 100644 --- a/cmd/internal/env/command.go +++ b/cmd/internal/env/command.go @@ -106,7 +106,7 @@ func Command() *cobra.Command { Use: "env", Short: "Help about environment variables.", Long: long, - Run: func(cmd *cobra.Command, args []string) { + Run: func(cmd *cobra.Command, _ /* args */ []string) { fmt.Fprint(cmd.OutOrStdout(), long) }, } diff --git a/cmd/internal/flags/admin_test.go b/cmd/internal/flags/admin_test.go index 52b58b87a7a..4d5c3abdfb7 100644 --- a/cmd/internal/flags/admin_test.go +++ b/cmd/internal/flags/admin_test.go @@ -56,7 +56,7 @@ func TestAdminServerHandlesPortZero(t *testing.T) { onlyEntry := message.All()[0] hostPort := onlyEntry.ContextMap()["http.host-port"].(string) port, _ := strconv.Atoi(strings.Split(hostPort, ":")[3]) - assert.Greater(t, port, 0) + assert.Positive(t, port, 0) } func TestAdminHealthCheck(t *testing.T) { diff --git a/cmd/internal/printconfig/command.go b/cmd/internal/printconfig/command.go index 4cb83d5a7c0..621d57a9471 100644 --- a/cmd/internal/printconfig/command.go +++ b/cmd/internal/printconfig/command.go @@ -65,7 +65,7 @@ func Command(v *viper.Viper) *cobra.Command { Use: "print-config", Short: "Print names and values of configuration options", Long: "Print names and values of configuration options, distinguishing between default and user-assigned values", - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(cmd *cobra.Command, _ /* args */ []string) error { printConfigurations(cmd, v, allFlag) return nil }, diff --git a/cmd/internal/status/command.go b/cmd/internal/status/command.go index a3aef682f13..7e15cd73909 100644 --- a/cmd/internal/status/command.go +++ b/cmd/internal/status/command.go @@ -37,7 +37,7 @@ func Command(v *viper.Viper, adminPort int) *cobra.Command { Use: "status", Short: "Print the status.", Long: `Print Jaeger component status information, exit non-zero on any error.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { url := convert(v.GetString(statusHTTPHostPort)) ctx, cx := context.WithTimeout(context.Background(), time.Second) defer cx() diff --git a/cmd/jaeger/internal/command_test.go b/cmd/jaeger/internal/command_test.go index f2c20ebbfad..3534bc75678 100644 --- a/cmd/jaeger/internal/command_test.go +++ b/cmd/jaeger/internal/command_test.go @@ -39,15 +39,16 @@ func TestCommand(t *testing.T) { func TestCheckConfigAndRun_DefaultConfig(t *testing.T) { cmd := &cobra.Command{ - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { return nil }, } cmd.Flags().String("config", "", "path to config file") - getCfg := func(name string) ([]byte, error) { + getCfg := func( /* name */ string) ([]byte, error) { return []byte("default-config"), nil } - runE := func(cmd *cobra.Command, args []string) error { + runE := func( /* cmd */ _ *cobra.Command, _ /* args */ []string, + ) error { return nil } @@ -55,7 +56,7 @@ func TestCheckConfigAndRun_DefaultConfig(t *testing.T) { require.NoError(t, err) errGetCfg := errors.New("error") - getCfgErr := func(name string) ([]byte, error) { + getCfgErr := func( /* name */ string) ([]byte, error) { return nil, errGetCfg } err = checkConfigAndRun(cmd, nil, getCfgErr, runE) diff --git a/cmd/jaeger/internal/components_test.go b/cmd/jaeger/internal/components_test.go index 02916f28f04..b36ab14402b 100644 --- a/cmd/jaeger/internal/components_test.go +++ b/cmd/jaeger/internal/components_test.go @@ -78,7 +78,7 @@ func TestGetOtelcolFactories(t *testing.T) { } func mockFactoryMap[FACTORY component.Factory](err error) func(factories ...FACTORY) (map[component.Type]FACTORY, error) { - return func(factories ...FACTORY) (map[component.Type]FACTORY, error) { + return func( /* factories */ ...FACTORY) (map[component.Type]FACTORY, error) { return nil, err } } diff --git a/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go b/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go index 743d1de5428..d5a6c6c29bf 100644 --- a/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go +++ b/cmd/jaeger/internal/extension/jaegerstorage/extension_test.go @@ -160,7 +160,7 @@ func TestESStorageExtension(t *testing.T) { } } `) - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.Write(mockEsServerResponse) })) defer server.Close() diff --git a/cmd/jaeger/internal/integration/receivers/storagereceiver/receiver_test.go b/cmd/jaeger/internal/integration/receivers/storagereceiver/receiver_test.go index 17d81fcd0f3..1c7fe9cafe7 100644 --- a/cmd/jaeger/internal/integration/receivers/storagereceiver/receiver_test.go +++ b/cmd/jaeger/internal/integration/receivers/storagereceiver/receiver_test.go @@ -79,7 +79,7 @@ func withReceiver( receivertest.NewNopCreateSettings(), consumertest.NewNop(), ) - receiver.settings.ReportStatus = func(se *component.StatusEvent) {} + receiver.settings.ReportStatus = func(_ *component.StatusEvent) {} r.reader = reader r.factory = factory diff --git a/cmd/query/app/additional_headers_test.go b/cmd/query/app/additional_headers_test.go index 68db5ba7b60..4e9ca6803ae 100644 --- a/cmd/query/app/additional_headers_test.go +++ b/cmd/query/app/additional_headers_test.go @@ -30,7 +30,7 @@ func TestAdditionalHeadersHandler(t *testing.T) { additionalHeaders.Add("Access-Control-Expose-Headers", "X-Another-Custom-Header") additionalHeaders.Add("Access-Control-Request-Headers", "field1, field2") - emptyHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + emptyHandler := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.Write([]byte{}) }) diff --git a/cmd/query/app/apiv3/http_gateway.go b/cmd/query/app/apiv3/http_gateway.go index 897b30a5404..8aca4a511a2 100644 --- a/cmd/query/app/apiv3/http_gateway.go +++ b/cmd/query/app/apiv3/http_gateway.go @@ -118,7 +118,7 @@ func (h *HTTPGateway) returnSpans(spans []*model.Span, w http.ResponseWriter) { func (h *HTTPGateway) returnSpansTestable( spans []*model.Span, w http.ResponseWriter, - modelToOTLP func(spans []*model.Span) (ptrace.Traces, error), + modelToOTLP func(_ []*model.Span) (ptrace.Traces, error), ) { td, err := modelToOTLP(spans) if h.tryHandleError(w, err, http.StatusInternalServerError) { diff --git a/cmd/query/app/apiv3/http_gateway_test.go b/cmd/query/app/apiv3/http_gateway_test.go index 5c35c8ae78e..6cd62ba492b 100644 --- a/cmd/query/app/apiv3/http_gateway_test.go +++ b/cmd/query/app/apiv3/http_gateway_test.go @@ -117,7 +117,7 @@ func TestHTTPGatewayOTLPError(t *testing.T) { } const simErr = "simulated error" gw.returnSpansTestable(nil, w, - func(spans []*model.Span) (ptrace.Traces, error) { + func(_ []*model.Span) (ptrace.Traces, error) { return ptrace.Traces{}, fmt.Errorf(simErr) }, ) diff --git a/cmd/query/app/grpc_handler_test.go b/cmd/query/app/grpc_handler_test.go index 697f6aeb8b0..a54874141e8 100644 --- a/cmd/query/app/grpc_handler_test.go +++ b/cmd/query/app/grpc_handler_test.go @@ -319,7 +319,7 @@ func TestArchiveTraceNotFoundGRPC(t *testing.T) { } func TestArchiveTraceEmptyTraceFailureGRPC(t *testing.T) { - withServerAndClient(t, func(server *grpcServer, client *grpcClient) { + withServerAndClient(t, func(_ *grpcServer, client *grpcClient) { _, err := client.ArchiveTrace(context.Background(), &api_v2.ArchiveTraceRequest{ TraceID: model.TraceID{}, }) @@ -404,7 +404,7 @@ func TestFindTracesSuccess_SpanStreamingGRPC(t *testing.T) { } func TestFindTracesMissingQuery_GRPC(t *testing.T) { - withServerAndClient(t, func(server *grpcServer, client *grpcClient) { + withServerAndClient(t, func(_ *grpcServer, client *grpcClient) { res, err := client.FindTraces(context.Background(), &api_v2.FindTracesRequest{ Query: nil, }) @@ -560,7 +560,7 @@ func TestGetDependenciesFailureUninitializedTimeGRPC(t *testing.T) { } for _, input := range timeInputs { - withServerAndClient(t, func(server *grpcServer, client *grpcClient) { + withServerAndClient(t, func(_ *grpcServer, client *grpcClient) { _, err := client.GetDependencies(context.Background(), &api_v2.GetDependenciesRequest{ StartTime: input.startTime, EndTime: input.endTime, @@ -640,7 +640,7 @@ func TestGetMetricsSuccessGRPC(t *testing.T) { } func TestGetMetricsReaderDisabledGRPC(t *testing.T) { - withServerAndClient(t, func(server *grpcServer, client *grpcClient) { + withServerAndClient(t, func(_ *grpcServer, client *grpcClient) { baseQueryParam := &metrics.MetricsQueryBaseRequest{ ServiceNames: []string{"foo"}, } diff --git a/cmd/query/app/querysvc/query_service_test.go b/cmd/query/app/querysvc/query_service_test.go index a31bc26f9f8..b20ae18dae6 100644 --- a/cmd/query/app/querysvc/query_service_test.go +++ b/cmd/query/app/querysvc/query_service_test.go @@ -89,7 +89,7 @@ func withArchiveSpanWriter() testOption { } func withAdjuster() testOption { - return func(tqs *testQueryService, options *QueryServiceOptions) { + return func(_ *testQueryService, options *QueryServiceOptions) { options.Adjuster = adjuster.Func(func(trace *model.Trace) (*model.Trace, error) { return trace, errAdjustment }) diff --git a/cmd/query/main.go b/cmd/query/main.go index 23310ee64b1..88e82c96f1b 100644 --- a/cmd/query/main.go +++ b/cmd/query/main.go @@ -65,7 +65,7 @@ func main() { Use: "jaeger-query", Short: "Jaeger query service provides a Web UI and an API for accessing trace data.", Long: `Jaeger query service provides a Web UI and an API for accessing trace data.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/cmd/remote-storage/main.go b/cmd/remote-storage/main.go index 51166025f6a..f5cc44f8925 100644 --- a/cmd/remote-storage/main.go +++ b/cmd/remote-storage/main.go @@ -57,7 +57,7 @@ func main() { Use: serviceName, Short: serviceName + " allows sharing single-node storage implementations like memstore or Badger.", Long: serviceName + ` allows sharing single-node storage implementations like memstore or Badger. It implements Jaeger Remote Storage gRPC API.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/crossdock/services/agent_test.go b/crossdock/services/agent_test.go index 3ffda9a2568..d3f0830b28b 100644 --- a/crossdock/services/agent_test.go +++ b/crossdock/services/agent_test.go @@ -107,7 +107,7 @@ func TestGetSamplingRate(t *testing.T) { } func TestGetSamplingRateReadAllErr(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.Header().Set("Content-Length", "1") })) defer server.Close() diff --git a/crossdock/services/query_test.go b/crossdock/services/query_test.go index 8e92478ed8d..72c668b5f5b 100644 --- a/crossdock/services/query_test.go +++ b/crossdock/services/query_test.go @@ -65,7 +65,7 @@ func TestGetTraces(t *testing.T) { } func TestGetTracesReadAllErr(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.Header().Set("Content-Length", "1") })) defer server.Close() diff --git a/crossdock/services/tracehandler_test.go b/crossdock/services/tracehandler_test.go index 60bae0cba3f..b24662abdb4 100644 --- a/crossdock/services/tracehandler_test.go +++ b/crossdock/services/tracehandler_test.go @@ -73,10 +73,10 @@ func TestConvertTagsIntoMap(t *testing.T) { } func TestRunTest(t *testing.T) { - errFunc := func(service string, request *traceRequest) ([]*ui.Trace, error) { + errFunc := func(_ /* service */ string, _ *traceRequest) ([]*ui.Trace, error) { return nil, errors.New("test error") } - successFunc := func(service string, request *traceRequest) ([]*ui.Trace, error) { + successFunc := func(_ /* service */ string, _ *traceRequest) ([]*ui.Trace, error) { return []*ui.Trace{}, nil } @@ -220,7 +220,7 @@ func TestCreateTrace(t *testing.T) { handler := &TraceHandler{ logger: zap.NewNop(), - getClientURL: func(service string) string { + getClientURL: func(_ /* service */ string) string { return "" }, } @@ -228,7 +228,7 @@ func TestCreateTrace(t *testing.T) { err := handler.createTrace("svc", &traceRequest{Operation: "op"}) require.Error(t, err) - handler.getClientURL = func(service string) string { + handler.getClientURL = func(_ /* service */ string) string { return server.URL } @@ -261,7 +261,7 @@ func TestCreateTracesLoop(t *testing.T) { handler := &TraceHandler{ logger: zap.NewNop(), createTracesLoopInterval: time.Millisecond, - getClientURL: func(service string) string { + getClientURL: func(_ /* service */ string) string { return server.URL }, } @@ -433,7 +433,7 @@ func TestAdaptiveSamplingTestInternal(t *testing.T) { agent: agent, query: query, logger: zap.NewNop(), - getClientURL: func(service string) string { + getClientURL: func(_ /* service */ string) string { return server.URL }, createTracesLoopInterval: time.Second, @@ -476,7 +476,7 @@ func TestEndToEndTest(t *testing.T) { server := httptest.NewServer(&testClientHandler{}) defer server.Close() - handler.getClientURL = func(service string) string { + handler.getClientURL = func(_ /* service */ string) string { return server.URL } @@ -506,7 +506,7 @@ func TestAdaptiveSamplingTest(t *testing.T) { agent: agent, query: query, logger: zap.NewNop(), - getClientURL: func(service string) string { + getClientURL: func(_ /* service */ string) string { return server.URL }, getTags: func() map[string]string { diff --git a/examples/hotrod/cmd/all.go b/examples/hotrod/cmd/all.go index a64b407a44e..cdd93422003 100644 --- a/examples/hotrod/cmd/all.go +++ b/examples/hotrod/cmd/all.go @@ -24,7 +24,7 @@ var allCmd = &cobra.Command{ Use: "all", Short: "Starts all services", Long: `Starts all services.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, args []string) error { logger.Info("Starting all services") go customerCmd.RunE(customerCmd, args) go driverCmd.RunE(driverCmd, args) diff --git a/examples/hotrod/cmd/customer.go b/examples/hotrod/cmd/customer.go index 9952b2ce57a..892222bbeb2 100644 --- a/examples/hotrod/cmd/customer.go +++ b/examples/hotrod/cmd/customer.go @@ -31,7 +31,7 @@ var customerCmd = &cobra.Command{ Use: "customer", Short: "Starts Customer service", Long: `Starts Customer service.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { zapLogger := logger.With(zap.String("service", "customer")) logger := log.NewFactory(zapLogger) server := customer.NewServer( diff --git a/examples/hotrod/cmd/driver.go b/examples/hotrod/cmd/driver.go index 5ff98d85560..4ab091654df 100644 --- a/examples/hotrod/cmd/driver.go +++ b/examples/hotrod/cmd/driver.go @@ -31,7 +31,7 @@ var driverCmd = &cobra.Command{ Use: "driver", Short: "Starts Driver service", Long: `Starts Driver service.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { zapLogger := logger.With(zap.String("service", "driver")) logger := log.NewFactory(zapLogger) server := driver.NewServer( diff --git a/examples/hotrod/cmd/frontend.go b/examples/hotrod/cmd/frontend.go index 4f176426891..0ee7a9c7748 100644 --- a/examples/hotrod/cmd/frontend.go +++ b/examples/hotrod/cmd/frontend.go @@ -32,7 +32,7 @@ var frontendCmd = &cobra.Command{ Use: "frontend", Short: "Starts Frontend service", Long: `Starts Frontend service.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { options.FrontendHostPort = net.JoinHostPort("0.0.0.0", strconv.Itoa(frontendPort)) options.DriverHostPort = net.JoinHostPort("0.0.0.0", strconv.Itoa(driverPort)) options.CustomerHostPort = net.JoinHostPort("0.0.0.0", strconv.Itoa(customerPort)) diff --git a/examples/hotrod/cmd/route.go b/examples/hotrod/cmd/route.go index 04cf3687076..ba49e41b69f 100644 --- a/examples/hotrod/cmd/route.go +++ b/examples/hotrod/cmd/route.go @@ -32,7 +32,7 @@ var routeCmd = &cobra.Command{ Use: "route", Short: "Starts Route service", Long: `Starts Route service.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { zapLogger := logger.With(zap.String("service", "route")) logger := log.NewFactory(zapLogger) server := route.NewServer( diff --git a/internal/tools/go.mod b/internal/tools/go.mod index f78f5ebd041..b498064d5af 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -3,7 +3,7 @@ module github.com/jaegertracing/jaeger/internal/tools go 1.22.3 require ( - github.com/golangci/golangci-lint v1.55.2 + github.com/golangci/golangci-lint v1.59.1 github.com/josephspurrier/goversioninfo v1.4.0 github.com/vektra/mockery/v2 v2.43.2 mvdan.cc/gofumpt v0.6.0 @@ -12,19 +12,20 @@ require ( require ( 4d63.com/gocheckcompilerdirectives v1.2.1 // indirect 4d63.com/gochecknoglobals v0.2.1 // indirect - github.com/4meepo/tagalign v1.3.3 // indirect - github.com/Abirdcfly/dupword v0.0.13 // indirect - github.com/Antonboom/errname v0.1.12 // indirect - github.com/Antonboom/nilnil v0.1.7 // indirect - github.com/Antonboom/testifylint v0.2.3 // indirect - github.com/BurntSushi/toml v1.3.2 // 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/v3 v3.1.0 // indirect - github.com/Masterminds/semver v1.5.0 // indirect - github.com/OpenPeeDeeP/depguard/v2 v2.1.0 // 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/akavel/rsrc v0.10.2 // indirect - github.com/alecthomas/go-check-sumtype v0.1.3 // indirect - github.com/alexkohler/nakedret/v2 v2.0.2 // 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.6.0 // indirect @@ -32,124 +33,123 @@ require ( github.com/beorn7/perks v1.0.1 // 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/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.2.2 // indirect - github.com/butuzov/mirror v1.1.0 // indirect - github.com/catenacyber/perfsprint v0.2.0 // indirect - github.com/ccojocar/zxcvbn-go v1.0.1 // 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.1.0 // indirect github.com/chigopher/pathlib v0.19.1 // indirect + github.com/ckaznocha/intrange v0.1.2 // indirect github.com/curioswitch/go-reassign v0.2.0 // indirect - github.com/daixiang0/gci v0.11.2 // indirect + github.com/daixiang0/gci v0.13.4 // 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.6.0 // indirect github.com/fzipp/gocyclo v0.6.0 // indirect - github.com/ghostiam/protogetter v0.2.3 // indirect - github.com/go-critic/go-critic v0.9.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-20231018234816-f50ced29576e // 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.1 // indirect - github.com/golangci/revgrep v0.5.2 // indirect - github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // 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.0.0-20230610083614-0e73809eb601 // 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/huandu/xstrings v1.4.0 // indirect github.com/iancoleman/strcase v0.2.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/jgautheron/goconst v1.6.0 // indirect + github.com/jgautheron/goconst v1.7.1 // indirect github.com/jingyugao/rowserrcheck v1.1.1 // indirect github.com/jinzhu/copier v0.3.5 // 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/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.8 // 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/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.1 // indirect + github.com/leonklingele/grouper v1.1.2 // indirect github.com/lufeee/execinquery v1.2.1 // indirect - github.com/macabu/inamedparam v0.1.2 // indirect + github.com/macabu/inamedparam v0.1.3 // indirect github.com/magiconair/properties v1.8.7 // 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.4 // 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/nishanths/exhaustive v0.11.0 // indirect + github.com/nishanths/exhaustive v0.12.0 // indirect github.com/nishanths/predeclared v0.2.2 // indirect - github.com/nunnatsa/ginkgolinter v0.14.1 // indirect + github.com/nunnatsa/ginkgolinter v0.16.2 // indirect github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/pelletier/go-toml/v2 v2.0.6 // 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.5 // 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.4.0 // 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/rs/zerolog v1.29.0 // indirect - github.com/ryancurrah/gomodguard v1.3.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.24.0 // indirect - github.com/securego/gosec/v2 v2.18.2 // 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.3 // indirect github.com/sivchari/containedctx v1.0.3 // indirect - github.com/sivchari/nosnakecase v1.7.0 // 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.9.3 // indirect + github.com/spf13/afero v1.11.0 // indirect github.com/spf13/cast v1.5.0 // indirect github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect @@ -157,43 +157,42 @@ require ( github.com/spf13/viper v1.15.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.4 // indirect + github.com/stretchr/objx v0.5.2 // indirect + github.com/stretchr/testify v1.9.0 // indirect github.com/subosito/gotenv v1.4.2 // 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.15 // 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.1.0 // indirect - github.com/ultraware/whitespace v0.0.5 // 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 - github.com/ykadowak/zerologlint v0.1.3 // indirect - gitlab.com/bosi/decorder v0.4.1 // indirect - go-simpler.org/sloglint v0.1.2 // indirect - go.tmz.dev/musttag v0.7.2 // 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.9.0 // indirect + go.uber.org/automaxprocs v1.5.3 // indirect go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.24.0 // indirect - golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect - golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect - golang.org/x/mod v0.14.0 // indirect - golang.org/x/sync v0.6.0 // indirect - golang.org/x/sys v0.16.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/term v0.5.0 // indirect - golang.org/x/text v0.13.0 // indirect - golang.org/x/tools v0.17.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/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.6 // 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/unparam v0.0.0-20240528143540-8a5130ca722f // indirect ) diff --git a/internal/tools/go.sum b/internal/tools/go.sum index a1d26d5d2fa..a4d4ac53660 100644 --- a/internal/tools/go.sum +++ b/internal/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,36 +34,37 @@ 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/4meepo/tagalign v1.3.3 h1:ZsOxcwGD/jP4U/aw7qeWu58i7dwYemfy5Y+IF1ACoNw= -github.com/4meepo/tagalign v1.3.3/go.mod h1:Q9c1rYMZJc9dPRkbQPpcBNCLEmY2njbAsXhQOZFE2dE= -github.com/Abirdcfly/dupword v0.0.13 h1:SMS17YXypwP000fA7Lr+kfyBQyW14tTT+nRv9ASwUUo= -github.com/Abirdcfly/dupword v0.0.13/go.mod h1:Ut6Ue2KgF/kCOawpW4LnExT+xZLQviJPE4klBPMK/5Y= -github.com/Antonboom/errname v0.1.12 h1:oh9ak2zUtsLp5oaEd/erjB4GPu9w19NyoIskZClDcQY= -github.com/Antonboom/errname v0.1.12/go.mod h1:bK7todrzvlaZoQagP1orKzWXv59X/x0W0Io2XT1Ssro= -github.com/Antonboom/nilnil v0.1.7 h1:ofgL+BA7vlA1K2wNQOsHzLJ2Pw5B5DpWRLdDAVvvTow= -github.com/Antonboom/nilnil v0.1.7/go.mod h1:TP+ScQWVEq0eSIxqU8CbdT5DFWoHp0MbP+KMUO1BKYQ= -github.com/Antonboom/testifylint v0.2.3 h1:MFq9zyL+rIVpsvLX4vDPLojgN7qODzWsrnftNX2Qh60= -github.com/Antonboom/testifylint v0.2.3/go.mod h1:IYaXaOX9NbfAyO+Y04nfjGI8wDemC1rUyM/cYolz018= +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.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= -github.com/BurntSushi/toml v1.3.2/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/v3 v3.1.0 h1:3ZBs7LAezy8gh0uECsA6CGU43FF3zsx5f4eah5FxTMA= -github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0/go.mod h1:rZLTje5A9kFBe0pzhpe2TdhRniBF++PRHQuRpR8esVc= -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/v2 v2.1.0 h1:aQl70G173h/GZYhWf36aE5H0KaujXfVMnn/f1kSDVYY= -github.com/OpenPeeDeeP/depguard/v2 v2.1.0/go.mod h1:PUBgk35fX4i7JDmwzlJwJ+GMe6NfO1723wmJMgPThNQ= +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/akavel/rsrc v0.10.2 h1:Zxm8V5eI1hW4gGaYsJQUhxpjkENuG91ki8B4zCrvEsw= github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c= 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.3 h1:M+tqMxB68hcgccRXBMVCPI4UJ+QUfdSx0xdbypKCqA8= -github.com/alecthomas/go-check-sumtype v0.1.3/go.mod h1:WyYPfhfkdhyrdaligV6svFopZV8Lqdzn5pyVBaV6jhQ= +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= @@ -75,8 +72,8 @@ github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuy 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.2 h1:qnXuZNvv3/AxkAb22q/sEsEpcA99YxLFACDtEw9TPxE= -github.com/alexkohler/nakedret/v2 v2.0.2/go.mod h1:2b8Gkk0GsOrqQv/gPWjNLDSKwG8I5moSXG1K4VIBcTQ= +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= @@ -95,20 +92,20 @@ github.com/bkielbasa/cyclop v1.2.1 h1:AeF71HZDob1P2/pRm1so9cd1alZnrpyc4q2uP2l0gJ 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/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.2.2 h1:jWI36dxXwVrI+RnXDwux2IZOewpmfv930OuIRfaBUJ0= -github.com/butuzov/ireturn v0.2.2/go.mod h1:RfGHUvvAuFFxoHKf4Z8Yxuh6OjlCw1KvR2zM1NFHeBk= -github.com/butuzov/mirror v1.1.0 h1:ZqX54gBVMXu78QLoiqdwpl2mgmoOJTk7s4p4o+0avZI= -github.com/butuzov/mirror v1.1.0/go.mod h1:8Q0BdQU6rC6WILDiBM60DBfvV78OLJmMmixe7GF45AE= -github.com/catenacyber/perfsprint v0.2.0 h1:azOocHLscPjqXVJ7Mf14Zjlkn4uNua0+Hcg1wTR6vUo= -github.com/catenacyber/perfsprint v0.2.0/go.mod h1:/wclWYompEyjUD2FuIIDVKNkqz7IgBIWXIH3V0Zol50= -github.com/ccojocar/zxcvbn-go v1.0.1 h1:+sxrANSCj6CdadkcMnvde/GWU1vZiiXRbqYSCalV4/4= -github.com/ccojocar/zxcvbn-go v1.0.1/go.mod h1:g1qkXtUSvHP8lhHp5GrSmTz6uWALGRMQdw6Qnz/hi60= +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= @@ -122,47 +119,43 @@ github.com/chigopher/pathlib v0.19.1/go.mod h1:tzC1dZLW8o33UQpWkNkhvPwL5n4yyFRFm 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/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= 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.11.2 h1:Oji+oPsp3bQ6bNNgX30NBAVT18P4uBH4sRZnlOlTj7Y= -github.com/daixiang0/gci v0.11.2/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/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.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= -github.com/ghostiam/protogetter v0.2.3 h1:qdv2pzo3BpLqezwqfGDLZ+nHEYmc5bUpIdsMbBVwMjw= -github.com/ghostiam/protogetter v0.2.3/go.mod h1:KmNLOsy1v04hKbvZs8EfGI1fk39AgTdRDxWNYPfXVc4= -github.com/go-critic/go-critic v0.9.0 h1:Pmys9qvU3pSML/3GEQ2Xd9RZ/ip+aXHKILuxczKGV/U= -github.com/go-critic/go-critic v0.9.0/go.mod h1:5P8tdXL7m/6qnyG6oRAlYLORvoXH0WDypYgAEmagT40= +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= @@ -172,18 +165,19 @@ 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.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ= -github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +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 v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= -github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= +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= @@ -195,6 +189,8 @@ github.com/go-toolsmith/strparse v1.1.0 h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQi 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= @@ -229,28 +225,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-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.55.2 h1:yllEIsSJ7MtlDBwDJ9IMBkyEUz2fYE0b5B8IUgO1oP8= -github.com/golangci/golangci-lint v1.55.2/go.mod h1:H60CZ0fuqoTwlTvnbyjhpZPWp7KmsjwV2yupIMiMXbM= -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.1 h1:+y73iSicVy2PqyX7kmUefHusENlrP9YwuHZHPLGQj/g= -github.com/golangci/misspell v0.4.1/go.mod h1:9mAN1quEo3DlpbaIKKyEvRxK1pwqR9s/Sea1bJCtlNI= -github.com/golangci/revgrep v0.5.2 h1:EndcWoRhcnfj2NHQ+28hyuXpLMF+dQmCN+YaeeIl4FU= -github.com/golangci/revgrep v0.5.2/go.mod h1:bjAMA+Sh/QUfTDcHzxfyHxr4xKvllVr/0sCv2e7jJHA= -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/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= @@ -270,7 +263,6 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN 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= @@ -278,18 +270,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-20210407192527-94a9f03dee38 h1:yAJXTCF9TqKcTiHJAE8dj7HMvPfh66eeA2JYW7eFpSE= -github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/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-20230610083614-0e73809eb601 h1:mrEEilTAUmaAORhssPPkxj84TsHrPMLBGW2Z4SoTxm8= -github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601/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= @@ -302,13 +289,9 @@ github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW 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/gostaticanalysis/testutil v0.4.0/go.mod h1:bLIoPefWXrRi/ssLFWX1dx7Repi5x3CuviD3dgAZaBU= -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/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= @@ -320,17 +303,18 @@ github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq github.com/iancoleman/strcase v0.2.0 h1:05I4QRnGpI0m37iZQRuskXh+w77mr6Z41lwQzuHLwW0= github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= -github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/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.6.0 h1:gbMLWKRMkzAc6kYsQL6/TxaoBUg3Jm9LSF/Ih1ADWGA= -github.com/jgautheron/goconst v1.6.0/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= +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/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg= github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg= 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/josephspurrier/goversioninfo v1.4.0 h1:Puhl12NSHUSALHSuzYwPYQkqa2E1+7SrtAPJorKK0C8= github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= @@ -344,15 +328,15 @@ 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/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.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= @@ -363,20 +347,22 @@ 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.8 h1:Ul2KsqtzFxTlSU7IP0JusWlLiNqQaloB9vguyjbE558= -github.com/kunwardeep/paralleltest v1.0.8/go.mod h1:2C7s65hONVqY7Q5Efj5aLzRCNLjw2h4eMc9EcypGjcY= +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/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.1 h1:suWXRU57D4/Enn6pXR0QVqqWWrnJ9Osrz+5rjt8ivzU= -github.com/leonklingele/grouper v1.1.1/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= +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.2 h1:RR5cnayM6Q7cDhQol32DE2BGAPGMnffJ31LFE+UklaU= -github.com/macabu/inamedparam v0.1.2/go.mod h1:Xg25QvY7IBRl1KLPV9Rbml8JOMZtF/iAkNkmV7eQgjw= +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.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s93SLMxb2vI= @@ -392,16 +378,14 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= 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.4 h1:k/tO3XTaWY4DEHal9tWBkkUMJYO/dLDVyMmAQxmIMDc= -github.com/mgechev/revive v1.3.4/go.mod h1:W+pZCMu9qj8Uhfs1iJMQsEFLRozUfvwFwqVvRbSNLVw= +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= @@ -419,36 +403,37 @@ github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81 github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/exhaustive v0.11.0 h1:T3I8nUGhl/Cwu5Z2hfc92l0e04D2GEW6e0l8pzda2l0= -github.com/nishanths/exhaustive v0.11.0/go.mod h1:RqwDsZ1xY0dNdqHho2z6X+bgzizwbLYOWnZbbl2wLB4= +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.14.1 h1:khx0CqR5U4ghsscjJ+lZVthp3zjIFytRXPTaQ/TMiyA= -github.com/nunnatsa/ginkgolinter v0.14.1/go.mod h1:nY0pafUSst7v7F637e7fymaMlQqI9c0Wka2fGsDkzWg= +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.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= -github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/gomega v1.28.1 h1:MijcGUbfYuznzK/5R4CPNoUP/9Xvuo20sXfEm6XxoTA= -github.com/onsi/gomega v1.28.1/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= +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.11.0 h1:OKBD80J/mLBrwnzXqGtFCzprFSGioo30JcmR4APsNwc= -github.com/otiai10/copy v1.11.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww= +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/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= -github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +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.5 h1:70YWmMy4FgRHehGNOUask3HtSFSOLKgmDn7ryNe7LqI= -github.com/polyfloyd/go-errorlint v1.4.5/go.mod h1:sIZEbFoDOCnTYYZoVkjc4hTnM459tuWA9H/EkdXwsKk= +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= @@ -471,8 +456,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.4.0 h1:DyM6r+TKL+xbKB4Nm7Afd1IQh9kEUKQs2pboWGKtvQo= -github.com/quasilyte/go-ruleguard v0.4.0/go.mod h1:Eu76Z/R8IXtViWUIHkE3p8gdH3/PKk1eh3YGfaEof10= +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= @@ -486,18 +473,20 @@ github.com/rs/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.29.0 h1:Zes4hju04hjbvkVkOhdl2HpZa+0PmVwigmo8XoORE5w= github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6usyD0= github.com/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/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.24.0 h1:MKNzmXtGh5N0y74Z/CIaJh4GlB364l0K1RUT08WSWAc= -github.com/sashamelentyev/usestdlibvars v1.24.0/go.mod h1:9cYkq+gYJ+a5W2RPdhfaSCnTVUC1OQP/bSiiBhq3OZE= -github.com/securego/gosec/v2 v2.18.2 h1:DkDt3wCiOtAHf1XkiXZBhQ6m6mK/b9T/wD257R3/c+I= -github.com/securego/gosec/v2 v2.18.2/go.mod h1:xUuqSF6i0So56Y2wwohWAmB07EdBkUN6crbLlHwbyJs= +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= @@ -509,16 +498,14 @@ 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/nosnakecase v1.7.0 h1:7QkpWIRMe8x25gckkFd2A5Pi6Ymo0qgr4JrhGt95do8= -github.com/sivchari/nosnakecase v1.7.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY= 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.9.3 h1:41FoI0fD7OR7mGcKE/aOiLkGreyf8ifIOQmJANWogMk= -github.com/spf13/afero v1.9.3/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= +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.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= @@ -536,8 +523,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/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= @@ -546,9 +534,9 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ 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.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= 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.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8= github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c h1:+aPplBwWcHBo6q9xrfWdMrT9o4kltkmmvpemgIjep/8= @@ -559,20 +547,20 @@ 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.15 h1:QzdIs+XB8q+U1WmQEWKHQbKmCw06QuQM7gLx/dky2RM= -github.com/tetafro/godot v1.4.15/go.mod h1:2oVxTBSftRTh4+MVfUaUXR6bn2GDXCaMcOG4Dk3rfio= +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.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81vI= github.com/ultraware/funlen v0.1.0/go.mod h1:XJqmOQja6DpxarLj6Jj1U7JuoS8PvL4nEqDaQhy22p4= -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/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/vektra/mockery/v2 v2.43.2 h1:OdivAsQL/uoQ55UnTt25tliRI8kaj5j6caHk9xaAUD0= @@ -581,10 +569,10 @@ github.com/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HH 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/ykadowak/zerologlint v0.1.3 h1:TLy1dTW3Nuc+YE3bYRPToG1Q9Ej78b5UUN6bjbGdxPE= -github.com/ykadowak/zerologlint v0.1.3/go.mod h1:KaUskqF3e/v59oPmdq1U1DnKcuHokl2/K1U4pmIELKg= +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= @@ -592,23 +580,24 @@ 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.4.1 h1:VdsdfxhstabyhZovHafFw+9eJ6eU0d2CkFNJcZz/NU4= -gitlab.com/bosi/decorder v0.4.1/go.mod h1:jecSqWUew6Yle1pCr2eLWTensJMmsxHsBwt+PVbkAqA= -go-simpler.org/assert v0.6.0 h1:QxSrXa4oRuo/1eHMXSBFHKvJIpWABayzKldqZyugG7E= -go-simpler.org/assert v0.6.0/go.mod h1:74Eqh5eI6vCK6Y5l3PI8ZYFXG4Sa+tkr70OIPJAUr28= -go-simpler.org/sloglint v0.1.2 h1:IjdhF8NPxyn0Ckn2+fuIof7ntSnVUAqBFcQRrnG9AiM= -go-simpler.org/sloglint v0.1.2/go.mod h1:2LL+QImPfTslD5muNPydAEYmpXIj6o/WYcqnJjLi4o4= +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.tmz.dev/musttag v0.7.2 h1:1J6S9ipDbalBSODNT5jCep8dhZyMr4ttnjQagmGYR5s= -go.tmz.dev/musttag v0.7.2/go.mod h1:m6q5NiiSKMnQYokefa2xGoyoXnrswCbJ0AWYzf4Zs28= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.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.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8= @@ -621,9 +610,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= @@ -635,12 +622,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-20230510235704-dd950f8aeaea h1:vLCWI/yYrdEHyN2JzIzPO3aaQJHQdp89IZBA/+azVC4= -golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +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-20230307190834-24139beb5833 h1:jWGQJV4niP+CCmFW9ekjA9Zx8vYORzOUH2/Nl5WPuLQ= -golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833/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= @@ -653,7 +640,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= @@ -662,7 +648,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= @@ -671,8 +656,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.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= -golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +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= @@ -702,9 +687,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= @@ -714,17 +696,13 @@ 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.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.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo= -golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY= +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= @@ -739,8 +717,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ 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/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= -golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.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= @@ -772,17 +750,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= @@ -801,8 +774,9 @@ 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.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/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/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= @@ -815,14 +789,13 @@ 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.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +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= @@ -873,14 +846,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= @@ -894,8 +860,8 @@ 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.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.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc= -golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps= +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= @@ -916,16 +882,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= @@ -955,13 +917,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= @@ -974,10 +929,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= @@ -1019,16 +970,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.6 h1:oFEHCKeID7to/3autwsWfnuv69j3NsfcXbvJKuIcep8= -honnef.co/go/tools v0.4.6/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= +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/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= +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= diff --git a/pkg/bearertoken/http_test.go b/pkg/bearertoken/http_test.go index 52747a3c9b7..02931f6abf9 100644 --- a/pkg/bearertoken/http_test.go +++ b/pkg/bearertoken/http_test.go @@ -35,7 +35,7 @@ func Test_PropagationHandler(t *testing.T) { const bearerToken = "blah" validTokenHandler := func(stop *sync.WaitGroup) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { + return func(_ http.ResponseWriter, r *http.Request) { ctx := r.Context() token, ok := GetBearerToken(ctx) assert.Equal(t, bearerToken, token) @@ -45,7 +45,7 @@ func Test_PropagationHandler(t *testing.T) { } emptyHandler := func(stop *sync.WaitGroup) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { + return func(_ http.ResponseWriter, r *http.Request) { ctx := r.Context() token, _ := GetBearerToken(ctx) assert.Empty(t, token, bearerToken) diff --git a/pkg/cache/lru_test.go b/pkg/cache/lru_test.go index dce4c2406a2..d6e33f4f4b3 100644 --- a/pkg/cache/lru_test.go +++ b/pkg/cache/lru_test.go @@ -27,7 +27,7 @@ import ( func TestLRU(t *testing.T) { cache := NewLRUWithOptions(4, &Options{ - OnEvict: func(k string, i any) { + OnEvict: func(_ string, _ any) { // do nothing, just for code coverage }, }) @@ -176,7 +176,7 @@ func TestLRUCacheConcurrentAccess(*testing.T) { func TestRemoveFunc(t *testing.T) { ch := make(chan bool) cache := NewLRUWithOptions(5, &Options{ - OnEvict: func(k string, i any) { + OnEvict: func(_ string, i any) { go func() { _, ok := i.(*testing.T) assert.True(t, ok) @@ -202,7 +202,7 @@ func TestRemovedFuncWithTTL(t *testing.T) { ch := make(chan bool) cache := NewLRUWithOptions(5, &Options{ TTL: time.Millisecond * 5, - OnEvict: func(k string, i any) { + OnEvict: func(_ string, i any) { go func() { _, ok := i.(*testing.T) assert.True(t, ok) diff --git a/pkg/es/client/index_client_test.go b/pkg/es/client/index_client_test.go index 57610fdd5d1..2ca8726b1f6 100644 --- a/pkg/es/client/index_client_test.go +++ b/pkg/es/client/index_client_test.go @@ -140,7 +140,7 @@ func TestClientGetIndices(t *testing.T) { } for _, test := range tests { t.Run(test.name, func(t *testing.T) { - testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, req *http.Request) { + testServer := httptest.NewServer(http.HandlerFunc(func(res http.ResponseWriter, _ *http.Request) { res.WriteHeader(test.responseCode) response := test.response diff --git a/pkg/es/config/config.go b/pkg/es/config/config.go index 5738f0797b9..0d3dc07ee04 100644 --- a/pkg/es/config/config.go +++ b/pkg/es/config/config.go @@ -121,7 +121,7 @@ func NewClient(c *Configuration, logger *zap.Logger, metricsFactory metrics.Fact m := sync.Map{} bulkProc, err := rawClient.BulkProcessor(). - Before(func(id int64, requests []elastic.BulkableRequest) { + Before(func(id int64, _ /* requests */ []elastic.BulkableRequest) { m.Store(id, time.Now()) }). After(func(id int64, requests []elastic.BulkableRequest, response *elastic.BulkResponse, err error) { diff --git a/pkg/httpmetrics/metrics_test.go b/pkg/httpmetrics/metrics_test.go index b9c24455221..085b629971f 100644 --- a/pkg/httpmetrics/metrics_test.go +++ b/pkg/httpmetrics/metrics_test.go @@ -31,7 +31,7 @@ import ( ) func TestNewMetricsHandler(t *testing.T) { - dummyHandlerFunc := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { + dummyHandlerFunc := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { time.Sleep(time.Millisecond) w.WriteHeader(http.StatusAccepted) w.WriteHeader(http.StatusTeapot) // any subsequent statuses should be ignored @@ -74,7 +74,7 @@ func TestMaxEntries(t *testing.T) { } func TestIllegalPrometheusLabel(t *testing.T) { - dummyHandlerFunc := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { + dummyHandlerFunc := http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { time.Sleep(time.Millisecond) w.WriteHeader(http.StatusAccepted) w.WriteHeader(http.StatusTeapot) // any subsequent statuses should be ignored diff --git a/pkg/jtracer/jtracer.go b/pkg/jtracer/jtracer.go index fa5abe0c2a2..f8329ba0e29 100644 --- a/pkg/jtracer/jtracer.go +++ b/pkg/jtracer/jtracer.go @@ -72,8 +72,8 @@ func initOTEL(ctx context.Context, svc string) (*sdktrace.TracerProvider, error) func initHelper( ctx context.Context, svc string, - otelExporter func(ctx context.Context) (sdktrace.SpanExporter, error), - otelResource func(ctx context.Context, svc string) (*resource.Resource, error), + otelExporter func(_ context.Context) (sdktrace.SpanExporter, error), + otelResource func(_ context.Context, _ /* svc */ string) (*resource.Resource, error), ) (*sdktrace.TracerProvider, error) { res, err := otelResource(ctx, svc) if err != nil { diff --git a/pkg/jtracer/jtracer_test.go b/pkg/jtracer/jtracer_test.go index 403bf241d91..13ac452fbf4 100644 --- a/pkg/jtracer/jtracer_test.go +++ b/pkg/jtracer/jtracer_test.go @@ -45,7 +45,7 @@ func TestNewHelperProviderError(t *testing.T) { fakeErr := errors.New("fakeProviderError") _, err := newHelper( "svc", - func(ctx context.Context, svc string) (*sdktrace.TracerProvider, error) { + func(_ context.Context, _ /* svc */ string) (*sdktrace.TracerProvider, error) { return nil, fakeErr }) require.Error(t, err) @@ -57,10 +57,10 @@ func TestInitHelperExporterError(t *testing.T) { _, err := initHelper( context.Background(), "svc", - func(ctx context.Context) (sdktrace.SpanExporter, error) { + func(_ context.Context) (sdktrace.SpanExporter, error) { return nil, fakeErr }, - func(ctx context.Context, svc string) (*resource.Resource, error) { + func(_ context.Context, _ /* svc */ string) (*resource.Resource, error) { return nil, nil }, ) @@ -74,7 +74,7 @@ func TestInitHelperResourceError(t *testing.T) { context.Background(), "svc", otelExporter, - func(ctx context.Context, svc string) (*resource.Resource, error) { + func(_ context.Context, _ /* svc */ string) (*resource.Resource, error) { return nil, fakeErr }, ) diff --git a/pkg/queue/bounded_queue_test.go b/pkg/queue/bounded_queue_test.go index b398d486425..e422ac810da 100644 --- a/pkg/queue/bounded_queue_test.go +++ b/pkg/queue/bounded_queue_test.go @@ -39,7 +39,7 @@ func helper(t *testing.T, startConsumers func(q *BoundedQueue, consumerFn func(i counter := mFact.Counter(metrics.Options{Name: "dropped", Tags: nil}) gauge := mFact.Gauge(metrics.Options{Name: "size", Tags: nil}) - q := NewBoundedQueue(1, func(item any) { + q := NewBoundedQueue(1, func( /* item */ any) { counter.Inc(1) }) assert.Equal(t, 1, q.Capacity()) @@ -184,7 +184,7 @@ func TestResizeUp(t *testing.T) { releaseConsumers.Add(1) released, resized := false, false - q.StartConsumers(1, func(item any) { + q.StartConsumers(1, func( /* item */ any) { if !resized { // we'll have a second consumer once the queue is resized // signal that the worker is processing firstConsumer.Done() @@ -234,7 +234,7 @@ func TestResizeDown(t *testing.T) { releaseConsumers.Add(1) released := false - q.StartConsumers(1, func(item any) { + q.StartConsumers(1, func( /* item */ any) { // once we release the lock, we might end up with multiple calls to reach this if !released { // signal that the worker is processing @@ -282,7 +282,7 @@ func TestResizeOldQueueIsDrained(t *testing.T) { consumed.Store(5) first := true - q.StartConsumers(1, func(item any) { + q.StartConsumers(1, func( /* item */ any) { // first run only if first { first = false @@ -318,23 +318,23 @@ func TestResizeOldQueueIsDrained(t *testing.T) { } func TestNoopResize(t *testing.T) { - q := NewBoundedQueue(2, func(item any) {}) + q := NewBoundedQueue(2, func( /* item */ any) {}) assert.False(t, q.Resize(2)) } func TestZeroSize(t *testing.T) { - q := NewBoundedQueue(0, func(item any) {}) + q := NewBoundedQueue(0, func( /* item */ any) {}) - q.StartConsumers(1, func(item any) {}) + q.StartConsumers(1, func( /* item */ any) {}) defer q.Stop() assert.False(t, q.Produce("a")) // in process } func BenchmarkBoundedQueue(b *testing.B) { - q := NewBoundedQueue(1000, func(item any) {}) - q.StartConsumers(10, func(item any) {}) + q := NewBoundedQueue(1000, func( /* item */ any) {}) + q.StartConsumers(10, func( /* item */ any) {}) defer q.Stop() for n := 0; n < b.N; n++ { @@ -343,10 +343,10 @@ func BenchmarkBoundedQueue(b *testing.B) { } func BenchmarkBoundedQueueWithFactory(b *testing.B) { - q := NewBoundedQueue(1000, func(item any) {}) + q := NewBoundedQueue(1000, func( /* item */ any) {}) q.StartConsumersWithFactory(10, func() Consumer { - return ConsumerFunc(func(item any) {}) + return ConsumerFunc(func( /* item */ any) {}) }) defer q.Stop() diff --git a/pkg/recoveryhandler/zap_test.go b/pkg/recoveryhandler/zap_test.go index eee6782d72a..d16acfd9921 100644 --- a/pkg/recoveryhandler/zap_test.go +++ b/pkg/recoveryhandler/zap_test.go @@ -29,7 +29,7 @@ import ( func TestNewRecoveryHandler(t *testing.T) { logger, log := testutils.NewLogger() - handlerFunc := http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) { + handlerFunc := http.HandlerFunc(func(_ http.ResponseWriter, _ *http.Request) { panic("Unexpected error!") }) diff --git a/pkg/tenancy/grpc.go b/pkg/tenancy/grpc.go index d17cfada1e0..5c513578787 100644 --- a/pkg/tenancy/grpc.go +++ b/pkg/tenancy/grpc.go @@ -68,7 +68,7 @@ func directlyAttachedTenant(ctx context.Context) bool { // NewGuardingStreamInterceptor blocks handling of streams whose tenancy header doesn't meet tenancy requirements. // It also ensures the tenant is directly in the context, rather than context metadata. func NewGuardingStreamInterceptor(tc *Manager) grpc.StreamServerInterceptor { - return func(srv any, ss grpc.ServerStream, info *grpc.StreamServerInfo, handler grpc.StreamHandler) error { + return func(srv any, ss grpc.ServerStream, _ *grpc.StreamServerInfo, handler grpc.StreamHandler) error { tenant, err := getValidTenant(ss.Context(), tc) if err != nil { return err @@ -100,7 +100,7 @@ func tenantFromMetadata(md metadata.MD, tenancyHeader string) (string, error) { // NewGuardingUnaryInterceptor blocks handling of RPCs whose tenancy header doesn't meet tenancy requirements. // It also ensures the tenant is directly in the context, rather than context metadata. func NewGuardingUnaryInterceptor(tc *Manager) grpc.UnaryServerInterceptor { - return func(ctx context.Context, req any, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) { + return func(ctx context.Context, req any, _ /* info */ *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) { tenant, err := getValidTenant(ctx, tc) if err != nil { return nil, err diff --git a/pkg/tenancy/grpc_test.go b/pkg/tenancy/grpc_test.go index f4b8777f217..44cfad6de9e 100644 --- a/pkg/tenancy/grpc_test.go +++ b/pkg/tenancy/grpc_test.go @@ -98,7 +98,7 @@ func TestTenancyInterceptors(t *testing.T) { uinterceptor := NewGuardingUnaryInterceptor(test.tenancyMgr) usi := &grpc.UnaryServerInfo{} iface := 0 - uhandler := func(ctx context.Context, req any) (any, error) { + uhandler := func(_ context.Context, req any) (any, error) { // do nothing return req, nil } @@ -118,7 +118,7 @@ func TestClientUnaryInterceptor(t *testing.T) { interceptor := NewClientUnaryInterceptor(tm) var tenant string fakeErr := errors.New("foo") - invoker := func(ctx context.Context, method string, req, reply any, cc *grpc.ClientConn, opts ...grpc.CallOption) error { + invoker := func(ctx context.Context, _ /* method */ string, _ /* req */, _ /* reply */ any, _ *grpc.ClientConn, _ ...grpc.CallOption) error { md, ok := metadata.FromOutgoingContext(ctx) assert.True(t, ok) ten, err := tenantFromMetadata(md, tm.Header) @@ -138,7 +138,7 @@ func TestClientStreamInterceptor(t *testing.T) { var tenant string fakeErr := errors.New("foo") ctx := WithTenant(context.Background(), "acme") - streamer := func(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, opts ...grpc.CallOption) (grpc.ClientStream, error) { + streamer := func(ctx context.Context, _ *grpc.StreamDesc, _ *grpc.ClientConn, _ /* method */ string, _ ...grpc.CallOption) (grpc.ClientStream, error) { md, ok := metadata.FromOutgoingContext(ctx) assert.True(t, ok) ten, err := tenantFromMetadata(md, tm.Header) diff --git a/pkg/tenancy/http.go b/pkg/tenancy/http.go index 0884a7d41ed..2a23d5109fc 100644 --- a/pkg/tenancy/http.go +++ b/pkg/tenancy/http.go @@ -51,7 +51,7 @@ func ExtractTenantHTTPHandler(tc *Manager, h http.Handler) http.Handler { // MetadataAnnotator returns a function suitable for propagating tenancy // via github.com/grpc-ecosystem/grpc-gateway/runtime.NewServeMux func (tc *Manager) MetadataAnnotator() func(context.Context, *http.Request) metadata.MD { - return func(ctx context.Context, req *http.Request) metadata.MD { + return func(_ context.Context, req *http.Request) metadata.MD { tenant := req.Header.Get(tc.Header) if tenant == "" { // The HTTP request lacked the tenancy header. Pass along diff --git a/pkg/version/command.go b/pkg/version/command.go index 343c1a477ac..546170b8707 100644 --- a/pkg/version/command.go +++ b/pkg/version/command.go @@ -30,7 +30,7 @@ func Command() *cobra.Command { Use: "version", Short: "Print the version.", Long: `Print the version and build information.`, - RunE: func(cmd *cobra.Command, args []string) error { + RunE: func(cmd *cobra.Command, _ /* args */ []string) error { json, err := json.Marshal(info) if err != nil { return err diff --git a/plugin/metrics/prometheus/metricsstore/reader_test.go b/plugin/metrics/prometheus/metricsstore/reader_test.go index ffa77c12078..8dc4a0d2748 100644 --- a/plugin/metrics/prometheus/metricsstore/reader_test.go +++ b/plugin/metrics/prometheus/metricsstore/reader_test.go @@ -138,7 +138,7 @@ func TestMetricsServerError(t *testing.T) { }, } - mockPrometheus := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + mockPrometheus := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { http.Error(w, "internal server error", http.StatusInternalServerError) })) defer mockPrometheus.Close() @@ -728,7 +728,7 @@ func newFakePromServer(t *testing.T) *fakePromServer { s := &fakePromServer{} s.Server = httptest.NewServer( http.HandlerFunc( - func(w http.ResponseWriter, r *http.Request) { + func(_ http.ResponseWriter, r *http.Request) { t.Logf("Request to fake Prometheus server %+v", r) h := r.Header.Get("Authorization") s.authReceived.Store(&h) diff --git a/plugin/pkg/distributedlock/cassandra/lock_test.go b/plugin/pkg/distributedlock/cassandra/lock_test.go index 65a33d580e7..36833148c54 100644 --- a/plugin/pkg/distributedlock/cassandra/lock_test.go +++ b/plugin/pkg/distributedlock/cassandra/lock_test.go @@ -260,7 +260,7 @@ func TestForfeit(t *testing.T) { } func matchEverything() any { - return mock.MatchedBy(func(v []any) bool { return true }) + return mock.MatchedBy(func(_ []any) bool { return true }) } // stringMatcher can match a string argument when it contains a specific substring q diff --git a/plugin/sampling/calculationstrategy/interface_test.go b/plugin/sampling/calculationstrategy/interface_test.go index f6a9a34f6b0..45808fca409 100644 --- a/plugin/sampling/calculationstrategy/interface_test.go +++ b/plugin/sampling/calculationstrategy/interface_test.go @@ -21,7 +21,7 @@ import ( ) func TestCalculateFunc(t *testing.T) { - c := CalculateFunc(func(targetQPS, qps, oldProbability float64) float64 { + c := CalculateFunc(func(targetQPS float64, _ /* qps */ float64, _ /* oldProbability */ float64) float64 { return targetQPS }) val := 1.0 diff --git a/plugin/storage/badger/dependencystore/storage_test.go b/plugin/storage/badger/dependencystore/storage_test.go index 653d6edef6a..cbcd209f13f 100644 --- a/plugin/storage/badger/dependencystore/storage_test.go +++ b/plugin/storage/badger/dependencystore/storage_test.go @@ -60,7 +60,7 @@ func runFactoryTest(tb testing.TB, test func(tb testing.TB, sw spanstore.Writer, } func TestDependencyReader(t *testing.T) { - runFactoryTest(t, func(tb testing.TB, sw spanstore.Writer, dr dependencystore.Reader) { + runFactoryTest(t, func(_ testing.TB, sw spanstore.Writer, dr dependencystore.Reader) { tid := time.Now() links, err := dr.GetDependencies(context.Background(), tid, time.Hour) require.NoError(t, err) diff --git a/plugin/storage/badger/factory.go b/plugin/storage/badger/factory.go index ab1c41ff1d7..1c715620988 100644 --- a/plugin/storage/badger/factory.go +++ b/plugin/storage/badger/factory.go @@ -311,7 +311,7 @@ func (f *Factory) registerBadgerExpvarMetrics(metricsFactory metrics.Factory) { // This function is intended for testing purposes only and should not be used in production environments. // Calling Purge in production will result in permanent data loss. func (f *Factory) Purge(_ context.Context) error { - return f.store.Update(func(txn *badger.Txn) error { + return f.store.Update(func(_ *badger.Txn) error { return f.store.DropAll() }) } diff --git a/plugin/storage/badger/spanstore/read_write_test.go b/plugin/storage/badger/spanstore/read_write_test.go index 9c4e4462785..9ef94e21812 100644 --- a/plugin/storage/badger/spanstore/read_write_test.go +++ b/plugin/storage/badger/spanstore/read_write_test.go @@ -37,7 +37,7 @@ import ( ) func TestWriteReadBack(t *testing.T) { - runFactoryTest(t, func(tb testing.TB, sw spanstore.Writer, sr spanstore.Reader) { + runFactoryTest(t, func(_ testing.TB, sw spanstore.Writer, sr spanstore.Reader) { tid := time.Now() traces := 40 spans := 3 @@ -91,7 +91,7 @@ func TestWriteReadBack(t *testing.T) { } func TestValidation(t *testing.T) { - runFactoryTest(t, func(tb testing.TB, sw spanstore.Writer, sr spanstore.Reader) { + runFactoryTest(t, func(_ testing.TB, _ spanstore.Writer, sr spanstore.Reader) { tid := time.Now() params := &spanstore.TraceQueryParameters{ StartTimeMin: tid, @@ -130,7 +130,7 @@ func TestValidation(t *testing.T) { } func TestIndexSeeks(t *testing.T) { - runFactoryTest(t, func(tb testing.TB, sw spanstore.Writer, sr spanstore.Reader) { + runFactoryTest(t, func(_ testing.TB, sw spanstore.Writer, sr spanstore.Reader) { startT := time.Now() traces := 60 spans := 3 @@ -290,7 +290,7 @@ func TestIndexSeeks(t *testing.T) { } func TestFindNothing(t *testing.T) { - runFactoryTest(t, func(tb testing.TB, sw spanstore.Writer, sr spanstore.Reader) { + runFactoryTest(t, func(_ testing.TB, _ spanstore.Writer, sr spanstore.Reader) { startT := time.Now() params := &spanstore.TraceQueryParameters{ StartTimeMin: startT, @@ -309,7 +309,7 @@ func TestFindNothing(t *testing.T) { } func TestWriteDuplicates(t *testing.T) { - runFactoryTest(t, func(tb testing.TB, sw spanstore.Writer, sr spanstore.Reader) { + runFactoryTest(t, func(_ testing.TB, sw spanstore.Writer, _ spanstore.Reader) { tid := time.Now() times := 40 spans := 3 @@ -336,7 +336,7 @@ func TestWriteDuplicates(t *testing.T) { } func TestMenuSeeks(t *testing.T) { - runFactoryTest(t, func(tb testing.TB, sw spanstore.Writer, sr spanstore.Reader) { + runFactoryTest(t, func(_ testing.TB, sw spanstore.Writer, sr spanstore.Reader) { tid := time.Now() traces := 40 services := 4 @@ -410,7 +410,7 @@ func TestPersist(t *testing.T) { test(t, sw, sr) } - p(t, dir, func(t *testing.T, sw spanstore.Writer, sr spanstore.Reader) { + p(t, dir, func(t *testing.T, sw spanstore.Writer, _ spanstore.Reader) { s := model.Span{ TraceID: model.TraceID{ Low: uint64(1), @@ -428,7 +428,7 @@ func TestPersist(t *testing.T) { require.NoError(t, err) }) - p(t, dir, func(t *testing.T, sw spanstore.Writer, sr spanstore.Reader) { + p(t, dir, func(t *testing.T, _ spanstore.Writer, sr spanstore.Reader) { trace, err := sr.GetTrace(context.Background(), model.TraceID{ Low: uint64(1), High: 1, @@ -494,7 +494,7 @@ func writeSpans(sw spanstore.Writer, tags []model.KeyValue, services, operations } func BenchmarkWrites(b *testing.B) { - runFactoryTest(b, func(tb testing.TB, sw spanstore.Writer, sr spanstore.Reader) { + runFactoryTest(b, func(_ testing.TB, sw spanstore.Writer, _ spanstore.Reader) { tid := time.Now() traces := 1000 spans := 32 @@ -539,7 +539,7 @@ func makeWriteSupports(tagsCount, spans int) ([]model.KeyValue, []string, []stri } func makeReadBenchmark(b *testing.B, _ time.Time, params *spanstore.TraceQueryParameters, outputFile string) { - runLargeFactoryTest(b, func(tb testing.TB, sw spanstore.Writer, sr spanstore.Reader) { + runLargeFactoryTest(b, func(_ testing.TB, sw spanstore.Writer, sr spanstore.Reader) { tid := time.Now() // Total amount of traces is traces * tracesTimes @@ -646,7 +646,7 @@ func runLargeFactoryTest(tb testing.TB, test func(tb testing.TB, sw spanstore.Wr // TestRandomTraceID from issue #1808 func TestRandomTraceID(t *testing.T) { - runFactoryTest(t, func(tb testing.TB, sw spanstore.Writer, sr spanstore.Reader) { + runFactoryTest(t, func(_ testing.TB, sw spanstore.Writer, sr spanstore.Reader) { s1 := model.Span{ TraceID: model.TraceID{ Low: uint64(14767110704788176287), diff --git a/plugin/storage/cassandra/dependencystore/storage_test.go b/plugin/storage/cassandra/dependencystore/storage_test.go index eca789ba154..3f2fd84ce15 100644 --- a/plugin/storage/cassandra/dependencystore/storage_test.go +++ b/plugin/storage/cassandra/dependencystore/storage_test.go @@ -268,5 +268,5 @@ func TestGetBuckets(t *testing.T) { } func matchEverything() any { - return mock.MatchedBy(func(v []any) bool { return true }) + return mock.MatchedBy(func(_ /* v */ []any) bool { return true }) } diff --git a/plugin/storage/cassandra/factory_test.go b/plugin/storage/cassandra/factory_test.go index aa52f718bd4..448a23eead9 100644 --- a/plugin/storage/cassandra/factory_test.go +++ b/plugin/storage/cassandra/factory_test.go @@ -216,7 +216,7 @@ func TestNewFactoryWithConfig(t *testing.T) { opts: opts, metricsFactory: metrics.NullFactory, logger: zap.NewNop(), - initializer: func(metricsFactory metrics.Factory, logger *zap.Logger) error { return nil }, + initializer: func(_ metrics.Factory, _ *zap.Logger) error { return nil }, } _, err := b.build() require.NoError(t, err) @@ -236,7 +236,7 @@ func TestNewFactoryWithConfig(t *testing.T) { opts: opts, metricsFactory: metrics.NullFactory, logger: zap.NewNop(), - initializer: func(metricsFactory metrics.Factory, logger *zap.Logger) error { return expErr }, + initializer: func(_ metrics.Factory, _ *zap.Logger) error { return expErr }, } _, err := b.build() require.ErrorIs(t, err, expErr) diff --git a/plugin/storage/cassandra/samplingstore/storage_test.go b/plugin/storage/cassandra/samplingstore/storage_test.go index 9de051d15dc..65af64c2495 100644 --- a/plugin/storage/cassandra/samplingstore/storage_test.go +++ b/plugin/storage/cassandra/samplingstore/storage_test.go @@ -289,7 +289,7 @@ func TestGetLatestProbabilities(t *testing.T) { } func matchEverything() any { - return mock.MatchedBy(func(v []any) bool { return true }) + return mock.MatchedBy(func(_ []any) bool { return true }) } func TestGenerateRandomBucket(t *testing.T) { diff --git a/plugin/storage/cassandra/spanstore/dbmodel/index_filter.go b/plugin/storage/cassandra/spanstore/dbmodel/index_filter.go index 5695aa81deb..decb5dcab46 100644 --- a/plugin/storage/cassandra/spanstore/dbmodel/index_filter.go +++ b/plugin/storage/cassandra/spanstore/dbmodel/index_filter.go @@ -29,6 +29,6 @@ const ( type IndexFilter func(span *Span, index int) bool // DefaultIndexFilter is a filter that indexes everything. -var DefaultIndexFilter = func(span *Span, index int) bool { +var DefaultIndexFilter = func(_ *Span, _ /* index */ int) bool { return true } diff --git a/plugin/storage/cassandra/spanstore/matchers_test.go b/plugin/storage/cassandra/spanstore/matchers_test.go index 14904f70231..e7e89318aca 100644 --- a/plugin/storage/cassandra/spanstore/matchers_test.go +++ b/plugin/storage/cassandra/spanstore/matchers_test.go @@ -40,7 +40,7 @@ func matchOnceWithSideEffect(fn func(v []any)) any { } func matchEverything() any { - return mock.MatchedBy(func(v []any) bool { return true }) + return mock.MatchedBy(func(_ []any) bool { return true }) } // stringMatcher can match a string argument when it contains a specific substring q diff --git a/plugin/storage/cassandra/spanstore/operation_names.go b/plugin/storage/cassandra/spanstore/operation_names.go index 167dcbd1c19..e881039cd9e 100644 --- a/plugin/storage/cassandra/spanstore/operation_names.go +++ b/plugin/storage/cassandra/spanstore/operation_names.go @@ -69,7 +69,7 @@ var schemas = map[schemaVersion]tableMeta{ queryByKindStmt: "SELECT operation_name FROM %s WHERE service_name = ?", queryStmt: "SELECT operation_name FROM %s WHERE service_name = ?", getOperations: getOperationsV1, - createWriteQuery: func(query cassandra.Query, service, kind, opName string) cassandra.Query { + createWriteQuery: func(query cassandra.Query, service, _ /* kind*/, opName string) cassandra.Query { return query.Bind(service, opName) }, }, diff --git a/plugin/storage/cassandra/spanstore/operation_names_test.go b/plugin/storage/cassandra/spanstore/operation_names_test.go index 63ccfd005e1..913e0fee87a 100644 --- a/plugin/storage/cassandra/spanstore/operation_names_test.go +++ b/plugin/storage/cassandra/spanstore/operation_names_test.go @@ -164,14 +164,14 @@ func TestOperationNamesStorageGetServices(t *testing.T) { t.Run(test.name, func(t *testing.T) { withOperationNamesStorage(0, test.schemaVersion, func(s *operationNameStorageTest) { var matched bool - matchOnce := mock.MatchedBy(func(v []any) bool { + matchOnce := mock.MatchedBy(func(_ []any) bool { if matched { return false } matched = true return true }) - matchEverything := mock.MatchedBy(func(v []any) bool { return true }) + matchEverything := mock.MatchedBy(func(_ []any) bool { return true }) iter := &mocks.Iterator{} iter.On("Scan", matchOnce).Return(true) diff --git a/plugin/storage/cassandra/spanstore/reader_test.go b/plugin/storage/cassandra/spanstore/reader_test.go index 816b0db9745..19d93e04955 100644 --- a/plugin/storage/cassandra/spanstore/reader_test.go +++ b/plugin/storage/cassandra/spanstore/reader_test.go @@ -99,7 +99,7 @@ func TestSpanReaderGetOperations(t *testing.T) { SpanKind: "server", }, } - r.reader.operationNamesReader = func(parameters spanstore.OperationQueryParameters) ([]spanstore.Operation, error) { + r.reader.operationNamesReader = func(_ spanstore.OperationQueryParameters) ([]spanstore.Operation, error) { return expectedOperations, nil } s, err := r.reader.GetOperations(context.Background(), @@ -310,7 +310,7 @@ func TestSpanReaderFindTraces(t *testing.T) { t.Run(testCase.caption, func(t *testing.T) { withSpanReader(t, func(r *spanReaderTest) { // scanMatcher can match Iter.Scan() parameters and set trace ID fields - scanMatcher := func(name string) any { + scanMatcher := func(_ /* name */ string) any { traceIDs := []dbmodel.TraceID{ dbmodel.TraceIDFromDomain(model.NewTraceID(0, 1)), dbmodel.TraceIDFromDomain(model.NewTraceID(0, 2)), diff --git a/plugin/storage/cassandra/spanstore/service_names_test.go b/plugin/storage/cassandra/spanstore/service_names_test.go index 3c35dc402af..6915e8657b3 100644 --- a/plugin/storage/cassandra/spanstore/service_names_test.go +++ b/plugin/storage/cassandra/spanstore/service_names_test.go @@ -111,14 +111,14 @@ func TestServiceNamesStorageGetServices(t *testing.T) { scanError := errors.New("scan error") var writeCacheTTL time.Duration var matched bool - matchOnce := mock.MatchedBy(func(v []any) bool { + matchOnce := mock.MatchedBy(func(_ []any) bool { if matched { return false } matched = true return true }) - matchEverything := mock.MatchedBy(func(v []any) bool { return true }) + matchEverything := mock.MatchedBy(func(_ []any) bool { return true }) for _, expErr := range []error{nil, scanError} { withServiceNamesStorage(writeCacheTTL, func(s *serviceNameStorageTest) { iter := &mocks.Iterator{} diff --git a/plugin/storage/cassandra/spanstore/writer_test.go b/plugin/storage/cassandra/spanstore/writer_test.go index 80e65debdaf..8605f19a0db 100644 --- a/plugin/storage/cassandra/spanstore/writer_test.go +++ b/plugin/storage/cassandra/spanstore/writer_test.go @@ -209,8 +209,8 @@ func TestSpanWriter(t *testing.T) { w.session.On("Query", stringMatcher(tagIndex), matchOnce()).Return(tagsQuery) w.session.On("Query", stringMatcher(durationIndex), matchOnce()).Return(durationNoOperationQuery) - w.writer.serviceNamesWriter = func(serviceName string) error { return testCase.serviceNameError } - w.writer.operationNamesWriter = func(operation dbmodel.Operation) error { return testCase.serviceNameError } + w.writer.serviceNamesWriter = func(_ /* serviceName */ string) error { return testCase.serviceNameError } + w.writer.operationNamesWriter = func(_ dbmodel.Operation) error { return testCase.serviceNameError } err := w.writer.WriteSpan(context.Background(), span) if testCase.expectedError == "" { @@ -237,17 +237,17 @@ func TestSpanWriterSaveServiceNameAndOperationName(t *testing.T) { expectedError string }{ { - serviceNamesWriter: func(serviceName string) error { return nil }, - operationNamesWriter: func(operation dbmodel.Operation) error { return nil }, + serviceNamesWriter: func(_ /* serviceName */ string) error { return nil }, + operationNamesWriter: func(_ dbmodel.Operation) error { return nil }, }, { - serviceNamesWriter: func(serviceName string) error { return expectedErr }, - operationNamesWriter: func(operation dbmodel.Operation) error { return nil }, + serviceNamesWriter: func(_ /* serviceName */ string) error { return expectedErr }, + operationNamesWriter: func(_ dbmodel.Operation) error { return nil }, expectedError: "some error", }, { - serviceNamesWriter: func(serviceName string) error { return nil }, - operationNamesWriter: func(operation dbmodel.Operation) error { return expectedErr }, + serviceNamesWriter: func(_ /* serviceName */ string) error { return nil }, + operationNamesWriter: func(_ dbmodel.Operation) error { return expectedErr }, expectedError: "some error", }, } @@ -299,8 +299,8 @@ func TestSpanWriterSkippingTags(t *testing.T) { func TestStorageMode_IndexOnly(t *testing.T) { withSpanWriter(0, func(w *spanWriterTest) { - w.writer.serviceNamesWriter = func(serviceName string) error { return nil } - w.writer.operationNamesWriter = func(operation dbmodel.Operation) error { return nil } + w.writer.serviceNamesWriter = func(_ /* serviceName */ string) error { return nil } + w.writer.operationNamesWriter = func(_ dbmodel.Operation) error { return nil } span := &model.Span{ TraceID: model.NewTraceID(0, 1), Process: &model.Process{ @@ -342,8 +342,8 @@ var filterEverything = func(*dbmodel.Span, int) bool { func TestStorageMode_IndexOnly_WithFilter(t *testing.T) { withSpanWriter(0, func(w *spanWriterTest) { w.writer.indexFilter = filterEverything - w.writer.serviceNamesWriter = func(serviceName string) error { return nil } - w.writer.operationNamesWriter = func(operation dbmodel.Operation) error { return nil } + w.writer.serviceNamesWriter = func(_ /* serviceName */ string) error { return nil } + w.writer.operationNamesWriter = func(_ dbmodel.Operation) error { return nil } span := &model.Span{ TraceID: model.NewTraceID(0, 1), Process: &model.Process{ @@ -413,7 +413,7 @@ func TestStorageMode_IndexOnly_FirehoseSpan(t *testing.T) { func TestStorageMode_StoreWithoutIndexing(t *testing.T) { withSpanWriter(0, func(w *spanWriterTest) { - w.writer.serviceNamesWriter = func(serviceName string) error { + w.writer.serviceNamesWriter = func(_ /* serviceName */ string) error { assert.Fail(t, "Non indexing store shouldn't index") return nil } diff --git a/plugin/storage/es/factory_test.go b/plugin/storage/es/factory_test.go index 2e3b4056e43..1ea353fb685 100644 --- a/plugin/storage/es/factory_test.go +++ b/plugin/storage/es/factory_test.go @@ -274,7 +274,7 @@ func TestConfigureFromOptions(t *testing.T) { } func TestESStorageFactoryWithConfig(t *testing.T) { - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.Write(mockEsServerResponse) })) defer server.Close() @@ -446,7 +446,7 @@ func TestFactoryESClientsAreNil(t *testing.T) { func TestPasswordFromFileErrors(t *testing.T) { defer testutils.VerifyGoLeaksOnce(t) - server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { w.Write(mockEsServerResponse) })) defer server.Close() diff --git a/plugin/storage/es/spanstore/reader.go b/plugin/storage/es/spanstore/reader.go index 51a2e380edf..8914db7e644 100644 --- a/plugin/storage/es/spanstore/reader.go +++ b/plugin/storage/es/spanstore/reader.go @@ -171,12 +171,12 @@ func getTimeRangeIndexFn(archive, useReadWriteAliases bool, remoteReadClusters [ } else { archiveSuffix = archiveIndexSuffix } - return addRemoteReadClusters(func(indexPrefix, indexDateLayout string, startTime time.Time, endTime time.Time, reduceDuration time.Duration) []string { + return addRemoteReadClusters(func(indexPrefix, _ /* indexDateLayout */ string, _ /* startTime */ time.Time, _ /* endTime */ time.Time, _ /* reducedDuration */ time.Duration) []string { return []string{archiveIndex(indexPrefix, archiveSuffix)} }, remoteReadClusters) } if useReadWriteAliases { - return addRemoteReadClusters(func(indexPrefix string, indexDateLayout string, startTime time.Time, endTime time.Time, reduceDuration time.Duration) []string { + return addRemoteReadClusters(func(indexPrefix string, _ /* indexDateLayout */ string, _ /* startTime */ time.Time, _ /* endTime */ time.Time, _ /* reducedDuration */ time.Duration) []string { return []string{indexPrefix + "read"} }, remoteReadClusters) } diff --git a/plugin/storage/es/spanstore/reader_test.go b/plugin/storage/es/spanstore/reader_test.go index f989ca29616..d750942c343 100644 --- a/plugin/storage/es/spanstore/reader_test.go +++ b/plugin/storage/es/spanstore/reader_test.go @@ -615,7 +615,7 @@ func TestSpanReaderFindIndices(t *testing.T) { } func TestSpanReader_indexWithDate(t *testing.T) { - withSpanReader(t, func(r *spanReaderTest) { + withSpanReader(t, func(_ *spanReaderTest) { actual := indexWithDate(spanIndex, "2006-01-02", time.Date(1995, time.April, 21, 4, 21, 19, 95, time.UTC)) assert.Equal(t, "jaeger-span-1995-04-21", actual) }) @@ -702,7 +702,7 @@ func returnSearchFunc(typ string, r *spanReaderTest) (any, error) { } func TestSpanReader_bucketToStringArray(t *testing.T) { - withSpanReader(t, func(r *spanReaderTest) { + withSpanReader(t, func(_ *spanReaderTest) { buckets := make([]*elastic.AggregationBucketKeyItem, 3) buckets[0] = &elastic.AggregationBucketKeyItem{Key: "hello"} buckets[1] = &elastic.AggregationBucketKeyItem{Key: "world"} @@ -716,7 +716,7 @@ func TestSpanReader_bucketToStringArray(t *testing.T) { } func TestSpanReader_bucketToStringArrayError(t *testing.T) { - withSpanReader(t, func(r *spanReaderTest) { + withSpanReader(t, func(_ *spanReaderTest) { buckets := make([]*elastic.AggregationBucketKeyItem, 3) buckets[0] = &elastic.AggregationBucketKeyItem{Key: "hello"} buckets[1] = &elastic.AggregationBucketKeyItem{Key: "world"} diff --git a/plugin/storage/es/spanstore/writer.go b/plugin/storage/es/spanstore/writer.go index d7d8c211841..2b3daddf445 100644 --- a/plugin/storage/es/spanstore/writer.go +++ b/plugin/storage/es/spanstore/writer.go @@ -117,7 +117,7 @@ func getSpanAndServiceIndexFn(archive, useReadWriteAliases bool, prefix, spanDat spanIndexPrefix := prefix + spanIndex serviceIndexPrefix := prefix + serviceIndex if archive { - return func(date time.Time) (string, string) { + return func(_ /* date */ time.Time) (string, string) { if useReadWriteAliases { return archiveIndex(spanIndexPrefix, archiveWriteIndexSuffix), "" } @@ -126,7 +126,7 @@ func getSpanAndServiceIndexFn(archive, useReadWriteAliases bool, prefix, spanDat } if useReadWriteAliases { - return func(spanTime time.Time) (string, string) { + return func(_ /* spanTime */ time.Time) (string, string) { return spanIndexPrefix + "write", serviceIndexPrefix + "write" } } diff --git a/plugin/storage/grpc/config_test.go b/plugin/storage/grpc/config_test.go index 18c4d108ceb..26a7d778627 100644 --- a/plugin/storage/grpc/config_test.go +++ b/plugin/storage/grpc/config_test.go @@ -15,7 +15,7 @@ import ( func TestBuildRemoteNewClientError(t *testing.T) { // this is a silly test to verify handling of error from grpc.NewClient, which cannot be induced via params. c := &ConfigV2{} - newClientFn := func(opts ...grpc.DialOption) (conn *grpc.ClientConn, err error) { + newClientFn := func(_ ...grpc.DialOption) (conn *grpc.ClientConn, err error) { return nil, errors.New("test error") } _, err := newRemoteStorage(c, component.TelemetrySettings{}, newClientFn) diff --git a/plugin/storage/integration/integration.go b/plugin/storage/integration/integration.go index cb61759dc47..f9ca020c41d 100644 --- a/plugin/storage/integration/integration.go +++ b/plugin/storage/integration/integration.go @@ -185,7 +185,7 @@ func (s *StorageIntegration) testArchiveTrace(t *testing.T) { require.NoError(t, s.ArchiveSpanWriter.WriteSpan(context.Background(), expected)) var actual *model.Trace - found := s.waitForCondition(t, func(t *testing.T) bool { + found := s.waitForCondition(t, func(_ *testing.T) bool { var err error actual, err = s.ArchiveSpanReader.GetTrace(context.Background(), tID) return err == nil && len(actual.Spans) == 1 @@ -203,7 +203,7 @@ func (s *StorageIntegration) testGetLargeSpan(t *testing.T) { expectedTraceID := expected.Spans[0].TraceID var actual *model.Trace - found := s.waitForCondition(t, func(t *testing.T) bool { + found := s.waitForCondition(t, func(_ *testing.T) bool { var err error actual, err = s.SpanReader.GetTrace(context.Background(), expectedTraceID) return err == nil && len(actual.Spans) >= len(expected.Spans) diff --git a/renovate.json b/renovate.json deleted file mode 100644 index ba90c2b8547..00000000000 --- a/renovate.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" - ], - "labels": [ - "changelog:dependencies" - ], - "suppressNotifications": ["prEditedNotification"] -} diff --git a/storage/spanstore/downsampling_writer_test.go b/storage/spanstore/downsampling_writer_test.go index 78fade542a7..9afb636fee0 100644 --- a/storage/spanstore/downsampling_writer_test.go +++ b/storage/spanstore/downsampling_writer_test.go @@ -62,7 +62,7 @@ func TestDownSamplingWriter_WriteSpan(t *testing.T) { } // This test is to make sure h.hash.Reset() works and same traceID will always hash to the same value. -func TestDownSamplingWriter_hashBytes(t *testing.T) { +func TestDownSamplingWriter_hashBytes(_ *testing.T) { downsamplingOptions := DownsamplingOptions{ Ratio: 1, HashSalt: "", @@ -70,7 +70,6 @@ func TestDownSamplingWriter_hashBytes(t *testing.T) { } c := NewDownsamplingWriter(&noopWriteSpanStore{}, downsamplingOptions) h := c.sampler.hasherPool.Get().(*hasher) - assert.Equal(t, h.hashBytes(), h.hashBytes()) c.sampler.hasherPool.Put(h) trace := model.TraceID{ Low: uint64(0), @@ -81,7 +80,6 @@ func TestDownSamplingWriter_hashBytes(t *testing.T) { } _, _ = span.TraceID.MarshalTo(h.buffer) // Same traceID should always be hashed to same uint64 in DownSamplingWriter. - assert.Equal(t, h.hashBytes(), h.hashBytes()) } func TestDownsamplingWriter_calculateThreshold(t *testing.T) { From 126431edc0e98985eb956156710fefd7ac0caa89 Mon Sep 17 00:00:00 2001 From: FlamingSaint Date: Wed, 12 Jun 2024 08:28:44 +0530 Subject: [PATCH 2/7] Add renovate.json back Signed-off-by: FlamingSaint --- renovate.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 00000000000..78ba49dc3f0 --- /dev/null +++ b/renovate.json @@ -0,0 +1,10 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended" + ], + "labels": [ + "changelog:dependencies" + ], + "suppressNotifications": ["prEditedNotification"] + } \ No newline at end of file From 5e686ffccb17e5f81245a88d376ad03892e7a9a7 Mon Sep 17 00:00:00 2001 From: FlamingSaint Date: Wed, 12 Jun 2024 08:42:13 +0530 Subject: [PATCH 3/7] fix Signed-off-by: FlamingSaint --- cmd/agent/main.go | 2 +- cmd/all-in-one/main.go | 2 +- cmd/collector/main.go | 2 +- cmd/es-index-cleaner/main.go | 2 +- cmd/es-rollover/main.go | 6 +++--- cmd/ingester/main.go | 2 +- cmd/internal/status/command.go | 2 +- cmd/jaeger/internal/command_test.go | 4 ++-- cmd/query/main.go | 2 +- cmd/remote-storage/main.go | 2 +- examples/hotrod/cmd/all.go | 2 +- examples/hotrod/cmd/customer.go | 2 +- examples/hotrod/cmd/driver.go | 2 +- examples/hotrod/cmd/frontend.go | 2 +- examples/hotrod/cmd/route.go | 2 +- .../calculationstrategy/interface_test.go | 2 +- plugin/storage/es/spanstore/reader.go | 4 ++-- renovate.json | 18 +++++++++--------- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 76179ca4102..047c7d096d2 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -50,7 +50,7 @@ func main() { Use: "jaeger-agent", Short: "(deprecated) Jaeger agent is a local daemon program which collects tracing data.", Long: `(deprecated) Jaeger agent is a daemon program that runs on every host and receives tracing data submitted by Jaeger client libraries.`, - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/cmd/all-in-one/main.go b/cmd/all-in-one/main.go index 3dd736487b6..7a1cae101f3 100644 --- a/cmd/all-in-one/main.go +++ b/cmd/all-in-one/main.go @@ -89,7 +89,7 @@ func main() { Short: "Jaeger all-in-one distribution with agent, collector and query in one process.", Long: `Jaeger all-in-one distribution with agent, collector and query. Use with caution this version by default uses only in-memory database.`, - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/cmd/collector/main.go b/cmd/collector/main.go index 845480d4018..51c1d8ffe7e 100644 --- a/cmd/collector/main.go +++ b/cmd/collector/main.go @@ -65,7 +65,7 @@ func main() { Use: "jaeger-collector", Short: "Jaeger collector receives and processes traces from Jaeger agents and clients", Long: `Jaeger collector receives traces from Jaeger agents and runs them through a processing pipeline.`, - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/cmd/es-index-cleaner/main.go b/cmd/es-index-cleaner/main.go index 074c6a1741f..92984f7dfc8 100644 --- a/cmd/es-index-cleaner/main.go +++ b/cmd/es-index-cleaner/main.go @@ -42,7 +42,7 @@ func main() { Use: "jaeger-es-index-cleaner NUM_OF_DAYS http://HOSTNAME:PORT", Short: "Jaeger es-index-cleaner removes Jaeger indices", Long: "Jaeger es-index-cleaner removes Jaeger indices", - RunE: func(_ /* cmd */ *cobra.Command, args []string) error { + RunE: func(_ *cobra.Command, args []string) error { if len(args) != 2 { return fmt.Errorf("wrong number of arguments") } diff --git a/cmd/es-rollover/main.go b/cmd/es-rollover/main.go index e23445bc147..042df203619 100644 --- a/cmd/es-rollover/main.go +++ b/cmd/es-rollover/main.go @@ -51,7 +51,7 @@ func main() { Long: "creates indices and aliases", Args: cobra.ExactArgs(1), SilenceUsage: true, - RunE: func(_ /* cmd */ *cobra.Command, args []string) error { + RunE: func(_ *cobra.Command, args []string) error { return app.ExecuteAction(app.ActionExecuteOptions{ Args: args, Viper: v, @@ -88,7 +88,7 @@ func main() { Short: "rollover to new write index", Long: "rollover to new write index", Args: cobra.ExactArgs(1), - RunE: func(_ /* cmd */ *cobra.Command, args []string) error { + RunE: func(_ *cobra.Command, args []string) error { rolloverCfg.InitFromViper(v) return app.ExecuteAction(app.ActionExecuteOptions{ Args: args, @@ -117,7 +117,7 @@ func main() { Short: "removes old indices from read alias", Long: "removes old indices from read alias", Args: cobra.ExactArgs(1), - RunE: func(_ /* cmd */ *cobra.Command, args []string) error { + RunE: func(_ *cobra.Command, args []string) error { lookbackCfg.InitFromViper(v) return app.ExecuteAction(app.ActionExecuteOptions{ Args: args, diff --git a/cmd/ingester/main.go b/cmd/ingester/main.go index 82581b32fe3..f47663bede3 100644 --- a/cmd/ingester/main.go +++ b/cmd/ingester/main.go @@ -52,7 +52,7 @@ func main() { Use: "jaeger-ingester", Short: "Jaeger ingester consumes from Kafka and writes to storage.", Long: `Jaeger ingester consumes spans from a particular Kafka topic and writes them to a configured storage.`, - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/cmd/internal/status/command.go b/cmd/internal/status/command.go index 7e15cd73909..a505798615f 100644 --- a/cmd/internal/status/command.go +++ b/cmd/internal/status/command.go @@ -37,7 +37,7 @@ func Command(v *viper.Viper, adminPort int) *cobra.Command { Use: "status", Short: "Print the status.", Long: `Print Jaeger component status information, exit non-zero on any error.`, - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { url := convert(v.GetString(statusHTTPHostPort)) ctx, cx := context.WithTimeout(context.Background(), time.Second) defer cx() diff --git a/cmd/jaeger/internal/command_test.go b/cmd/jaeger/internal/command_test.go index 3534bc75678..4dbb9150d94 100644 --- a/cmd/jaeger/internal/command_test.go +++ b/cmd/jaeger/internal/command_test.go @@ -39,7 +39,7 @@ func TestCommand(t *testing.T) { func TestCheckConfigAndRun_DefaultConfig(t *testing.T) { cmd := &cobra.Command{ - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { return nil }, } @@ -47,7 +47,7 @@ func TestCheckConfigAndRun_DefaultConfig(t *testing.T) { getCfg := func( /* name */ string) ([]byte, error) { return []byte("default-config"), nil } - runE := func( /* cmd */ _ *cobra.Command, _ /* args */ []string, + runE := func(_ *cobra.Command, _ /* args */ []string, ) error { return nil } diff --git a/cmd/query/main.go b/cmd/query/main.go index 88e82c96f1b..42f698669f0 100644 --- a/cmd/query/main.go +++ b/cmd/query/main.go @@ -65,7 +65,7 @@ func main() { Use: "jaeger-query", Short: "Jaeger query service provides a Web UI and an API for accessing trace data.", Long: `Jaeger query service provides a Web UI and an API for accessing trace data.`, - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/cmd/remote-storage/main.go b/cmd/remote-storage/main.go index f5cc44f8925..f194b491e6e 100644 --- a/cmd/remote-storage/main.go +++ b/cmd/remote-storage/main.go @@ -57,7 +57,7 @@ func main() { Use: serviceName, Short: serviceName + " allows sharing single-node storage implementations like memstore or Badger.", Long: serviceName + ` allows sharing single-node storage implementations like memstore or Badger. It implements Jaeger Remote Storage gRPC API.`, - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { if err := svc.Start(v); err != nil { return err } diff --git a/examples/hotrod/cmd/all.go b/examples/hotrod/cmd/all.go index cdd93422003..3b99a02b12e 100644 --- a/examples/hotrod/cmd/all.go +++ b/examples/hotrod/cmd/all.go @@ -24,7 +24,7 @@ var allCmd = &cobra.Command{ Use: "all", Short: "Starts all services", Long: `Starts all services.`, - RunE: func(_ /* cmd */ *cobra.Command, args []string) error { + RunE: func(_ *cobra.Command, args []string) error { logger.Info("Starting all services") go customerCmd.RunE(customerCmd, args) go driverCmd.RunE(driverCmd, args) diff --git a/examples/hotrod/cmd/customer.go b/examples/hotrod/cmd/customer.go index 892222bbeb2..97986d4d345 100644 --- a/examples/hotrod/cmd/customer.go +++ b/examples/hotrod/cmd/customer.go @@ -31,7 +31,7 @@ var customerCmd = &cobra.Command{ Use: "customer", Short: "Starts Customer service", Long: `Starts Customer service.`, - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { zapLogger := logger.With(zap.String("service", "customer")) logger := log.NewFactory(zapLogger) server := customer.NewServer( diff --git a/examples/hotrod/cmd/driver.go b/examples/hotrod/cmd/driver.go index 4ab091654df..6712357ec65 100644 --- a/examples/hotrod/cmd/driver.go +++ b/examples/hotrod/cmd/driver.go @@ -31,7 +31,7 @@ var driverCmd = &cobra.Command{ Use: "driver", Short: "Starts Driver service", Long: `Starts Driver service.`, - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { zapLogger := logger.With(zap.String("service", "driver")) logger := log.NewFactory(zapLogger) server := driver.NewServer( diff --git a/examples/hotrod/cmd/frontend.go b/examples/hotrod/cmd/frontend.go index 0ee7a9c7748..eae48334ce9 100644 --- a/examples/hotrod/cmd/frontend.go +++ b/examples/hotrod/cmd/frontend.go @@ -32,7 +32,7 @@ var frontendCmd = &cobra.Command{ Use: "frontend", Short: "Starts Frontend service", Long: `Starts Frontend service.`, - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { options.FrontendHostPort = net.JoinHostPort("0.0.0.0", strconv.Itoa(frontendPort)) options.DriverHostPort = net.JoinHostPort("0.0.0.0", strconv.Itoa(driverPort)) options.CustomerHostPort = net.JoinHostPort("0.0.0.0", strconv.Itoa(customerPort)) diff --git a/examples/hotrod/cmd/route.go b/examples/hotrod/cmd/route.go index ba49e41b69f..c0edbd19b65 100644 --- a/examples/hotrod/cmd/route.go +++ b/examples/hotrod/cmd/route.go @@ -32,7 +32,7 @@ var routeCmd = &cobra.Command{ Use: "route", Short: "Starts Route service", Long: `Starts Route service.`, - RunE: func(_ /* cmd */ *cobra.Command, _ /* args */ []string) error { + RunE: func(_ *cobra.Command, _ /* args */ []string) error { zapLogger := logger.With(zap.String("service", "route")) logger := log.NewFactory(zapLogger) server := route.NewServer( diff --git a/plugin/sampling/calculationstrategy/interface_test.go b/plugin/sampling/calculationstrategy/interface_test.go index 45808fca409..515ab3305a0 100644 --- a/plugin/sampling/calculationstrategy/interface_test.go +++ b/plugin/sampling/calculationstrategy/interface_test.go @@ -21,7 +21,7 @@ import ( ) func TestCalculateFunc(t *testing.T) { - c := CalculateFunc(func(targetQPS float64, _ /* qps */ float64, _ /* oldProbability */ float64) float64 { + c := CalculateFunc(func(targetQPS, _ /* qps */, _ /* oldProbability */ float64) float64 { return targetQPS }) val := 1.0 diff --git a/plugin/storage/es/spanstore/reader.go b/plugin/storage/es/spanstore/reader.go index 8914db7e644..fc58ef78ec4 100644 --- a/plugin/storage/es/spanstore/reader.go +++ b/plugin/storage/es/spanstore/reader.go @@ -171,12 +171,12 @@ func getTimeRangeIndexFn(archive, useReadWriteAliases bool, remoteReadClusters [ } else { archiveSuffix = archiveIndexSuffix } - return addRemoteReadClusters(func(indexPrefix, _ /* indexDateLayout */ string, _ /* startTime */ time.Time, _ /* endTime */ time.Time, _ /* reducedDuration */ time.Duration) []string { + return addRemoteReadClusters(func(indexPrefix, _ /* indexDateLayout */ string, _ /* startTime */ time.Time, _ /* endTime */ time.Time, _ /* reduceDuration */ time.Duration) []string { return []string{archiveIndex(indexPrefix, archiveSuffix)} }, remoteReadClusters) } if useReadWriteAliases { - return addRemoteReadClusters(func(indexPrefix string, _ /* indexDateLayout */ string, _ /* startTime */ time.Time, _ /* endTime */ time.Time, _ /* reducedDuration */ time.Duration) []string { + return addRemoteReadClusters(func(indexPrefix string, _ /* indexDateLayout */ string, _ /* startTime */ time.Time, _ /* endTime */ time.Time, _ /* reduceDuration */ time.Duration) []string { return []string{indexPrefix + "read"} }, remoteReadClusters) } diff --git a/renovate.json b/renovate.json index 78ba49dc3f0..08d71aa58aa 100644 --- a/renovate.json +++ b/renovate.json @@ -1,10 +1,10 @@ { - "$schema": "https://docs.renovatebot.com/renovate-schema.json", - "extends": [ - "config:recommended" - ], - "labels": [ - "changelog:dependencies" - ], - "suppressNotifications": ["prEditedNotification"] - } \ No newline at end of file + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended" + ], + "labels": [ + "changelog:dependencies" + ], + "suppressNotifications": ["prEditedNotification"] +} \ No newline at end of file From f29fb98028917332c97874c23c8d8a8c1d7eaa4f Mon Sep 17 00:00:00 2001 From: FlamingSaint Date: Wed, 12 Jun 2024 08:56:29 +0530 Subject: [PATCH 4/7] Fix merge Signed-off-by: FlamingSaint --- .github/actions/setup-node.js/action.yml | 2 +- .github/workflows/ci-all-in-one-build.yml | 2 +- .github/workflows/ci-badger.yaml | 2 +- .github/workflows/ci-build-binaries.yml | 2 +- .github/workflows/ci-cassandra.yml | 2 +- .github/workflows/ci-crossdock.yml | 2 +- .github/workflows/ci-docker-build.yml | 2 +- .github/workflows/ci-elasticsearch.yml | 2 +- .github/workflows/ci-grpc.yml | 2 +- .github/workflows/ci-hotrod.yml | 2 +- .github/workflows/ci-kafka.yml | 2 +- .github/workflows/ci-lint-checks.yaml | 4 ++-- .github/workflows/ci-opensearch.yml | 2 +- .github/workflows/ci-protogen-tests.yml | 2 +- .github/workflows/ci-release-testing.yml | 2 +- .github/workflows/ci-release.yml | 2 +- .github/workflows/ci-unit-tests-go-tip.yml | 2 +- .github/workflows/ci-unit-tests.yml | 2 +- .github/workflows/ci-validation-of-shell-scripts.yml | 2 +- .github/workflows/codeql.yml | 2 +- .github/workflows/dependency-review.yml | 2 +- .github/workflows/fossa.yml | 2 +- .github/workflows/scorecard.yml | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/actions/setup-node.js/action.yml b/.github/actions/setup-node.js/action.yml index 45fdbc7ed60..4f421b6a2a9 100644 --- a/.github/actions/setup-node.js/action.yml +++ b/.github/actions/setup-node.js/action.yml @@ -8,7 +8,7 @@ runs: run: | echo "JAEGER_UI_NODE_JS_VERSION=$(cat jaeger-ui/.nvmrc)" >> ${GITHUB_ENV} - - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c + - uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v4.0.2 with: node-version: ${{ env.JAEGER_UI_NODE_JS_VERSION }} cache: 'yarn' diff --git a/.github/workflows/ci-all-in-one-build.yml b/.github/workflows/ci-all-in-one-build.yml index beae2687029..d4cb6c7de24 100644 --- a/.github/workflows/ci-all-in-one-build.yml +++ b/.github/workflows/ci-all-in-one-build.yml @@ -34,7 +34,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: submodules: true diff --git a/.github/workflows/ci-badger.yaml b/.github/workflows/ci-badger.yaml index d0c62c52ee2..a5acbf8a475 100644 --- a/.github/workflows/ci-badger.yaml +++ b/.github/workflows/ci-badger.yaml @@ -27,7 +27,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: diff --git a/.github/workflows/ci-build-binaries.yml b/.github/workflows/ci-build-binaries.yml index 8809f0ce48d..4a1744d391a 100644 --- a/.github/workflows/ci-build-binaries.yml +++ b/.github/workflows/ci-build-binaries.yml @@ -42,7 +42,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: submodules: true diff --git a/.github/workflows/ci-cassandra.yml b/.github/workflows/ci-cassandra.yml index d481371bfd0..03352670ffe 100644 --- a/.github/workflows/ci-cassandra.yml +++ b/.github/workflows/ci-cassandra.yml @@ -35,7 +35,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: diff --git a/.github/workflows/ci-crossdock.yml b/.github/workflows/ci-crossdock.yml index 371aa4d2da1..cdcbb0cdf5f 100644 --- a/.github/workflows/ci-crossdock.yml +++ b/.github/workflows/ci-crossdock.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: submodules: true diff --git a/.github/workflows/ci-docker-build.yml b/.github/workflows/ci-docker-build.yml index c1afd4f8532..cab89a071e0 100644 --- a/.github/workflows/ci-docker-build.yml +++ b/.github/workflows/ci-docker-build.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: submodules: true diff --git a/.github/workflows/ci-elasticsearch.yml b/.github/workflows/ci-elasticsearch.yml index f74bb6ae75f..ac2c41ec386 100644 --- a/.github/workflows/ci-elasticsearch.yml +++ b/.github/workflows/ci-elasticsearch.yml @@ -38,7 +38,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: submodules: true diff --git a/.github/workflows/ci-grpc.yml b/.github/workflows/ci-grpc.yml index 8032aaf9726..1eda6e4f58f 100644 --- a/.github/workflows/ci-grpc.yml +++ b/.github/workflows/ci-grpc.yml @@ -27,7 +27,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: diff --git a/.github/workflows/ci-hotrod.yml b/.github/workflows/ci-hotrod.yml index e52ecb332a6..16fd359d626 100644 --- a/.github/workflows/ci-hotrod.yml +++ b/.github/workflows/ci-hotrod.yml @@ -24,7 +24,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: submodules: true diff --git a/.github/workflows/ci-kafka.yml b/.github/workflows/ci-kafka.yml index cd1cc2eeb42..5efd3c26a0a 100644 --- a/.github/workflows/ci-kafka.yml +++ b/.github/workflows/ci-kafka.yml @@ -24,7 +24,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: diff --git a/.github/workflows/ci-lint-checks.yaml b/.github/workflows/ci-lint-checks.yaml index 2a48f686eb3..3f265d27aab 100644 --- a/.github/workflows/ci-lint-checks.yaml +++ b/.github/workflows/ci-lint-checks.yaml @@ -24,7 +24,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after a couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Ensure PR is not on main branch uses: ./.github/actions/block-pr-not-on-main @@ -35,7 +35,7 @@ jobs: python-version: '3.x' - name: Run DCO check - run: python3 scripts/dco_check.py -b main -v --exclude-pattern 'dependabot\[bot\]@users\.noreply\.github\.com' + run: python3 scripts/dco_check.py -b main -v --exclude-pattern '\[bot\]@users\.noreply\.github\.com' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ci-opensearch.yml b/.github/workflows/ci-opensearch.yml index 6ade9f5b33a..d9cf37ef10c 100644 --- a/.github/workflows/ci-opensearch.yml +++ b/.github/workflows/ci-opensearch.yml @@ -38,7 +38,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: submodules: true diff --git a/.github/workflows/ci-protogen-tests.yml b/.github/workflows/ci-protogen-tests.yml index 9f243bbca7b..a8fd2b3cbf2 100644 --- a/.github/workflows/ci-protogen-tests.yml +++ b/.github/workflows/ci-protogen-tests.yml @@ -24,7 +24,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: submodules: recursive diff --git a/.github/workflows/ci-release-testing.yml b/.github/workflows/ci-release-testing.yml index 8b0f6eb139a..31a6ee1fd02 100644 --- a/.github/workflows/ci-release-testing.yml +++ b/.github/workflows/ci-release-testing.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: submodules: true diff --git a/.github/workflows/ci-release.yml b/.github/workflows/ci-release.yml index 59b0f6d48aa..67f856e9770 100644 --- a/.github/workflows/ci-release.yml +++ b/.github/workflows/ci-release.yml @@ -34,7 +34,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: submodules: true diff --git a/.github/workflows/ci-unit-tests-go-tip.yml b/.github/workflows/ci-unit-tests-go-tip.yml index 142cf847053..c86e9e18ce9 100644 --- a/.github/workflows/ci-unit-tests-go-tip.yml +++ b/.github/workflows/ci-unit-tests-go-tip.yml @@ -18,7 +18,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Install Go Tip uses: ./.github/actions/setup-go-tip diff --git a/.github/workflows/ci-unit-tests.yml b/.github/workflows/ci-unit-tests.yml index 381eb13fd8f..cec2a1301c1 100644 --- a/.github/workflows/ci-unit-tests.yml +++ b/.github/workflows/ci-unit-tests.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: diff --git a/.github/workflows/ci-validation-of-shell-scripts.yml b/.github/workflows/ci-validation-of-shell-scripts.yml index 3078301ece9..7ea7403ccc8 100644 --- a/.github/workflows/ci-validation-of-shell-scripts.yml +++ b/.github/workflows/ci-validation-of-shell-scripts.yml @@ -21,7 +21,7 @@ jobs: egress-policy: audit - name: check out code - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: Install shellcheck run: sudo apt-get install shellcheck diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index dc08ee1691b..aeb6cd5580b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -40,7 +40,7 @@ jobs: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - name: Checkout repository - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml index 40d7217fd15..f37ea6dda98 100644 --- a/.github/workflows/dependency-review.yml +++ b/.github/workflows/dependency-review.yml @@ -22,6 +22,6 @@ jobs: egress-policy: audit - name: 'Checkout Repository' - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - name: 'Dependency Review' uses: actions/dependency-review-action@0c155c5e8556a497adf53f2c18edabf945ed8e70 # v4.3.2 diff --git a/.github/workflows/fossa.yml b/.github/workflows/fossa.yml index cd7b513fb23..8b63ec693cb 100644 --- a/.github/workflows/fossa.yml +++ b/.github/workflows/fossa.yml @@ -25,7 +25,7 @@ jobs: with: egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs - - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 - uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1 with: diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index b84696e8170..5032d0f7919 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -37,7 +37,7 @@ jobs: egress-policy: audit - name: "Checkout code" - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 + uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 with: persist-credentials: false From 9135e9cf75965f2ebcbef3c582daf345144969bc Mon Sep 17 00:00:00 2001 From: FlamingSaint Date: Wed, 12 Jun 2024 08:59:29 +0530 Subject: [PATCH 5/7] dont change renovate.json Signed-off-by: FlamingSaint --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 08d71aa58aa..ba90c2b8547 100644 --- a/renovate.json +++ b/renovate.json @@ -7,4 +7,4 @@ "changelog:dependencies" ], "suppressNotifications": ["prEditedNotification"] -} \ No newline at end of file +} From c6d6d31e59a528614ac319643d78afd4507493ad Mon Sep 17 00:00:00 2001 From: FlamingSaint Date: Wed, 12 Jun 2024 09:16:45 +0530 Subject: [PATCH 6/7] Add changes Signed-off-by: FlamingSaint --- cmd/anonymizer/app/anonymizer/anonymizer.go | 4 +++- cmd/internal/flags/admin_test.go | 2 +- pkg/tenancy/grpc.go | 2 +- plugin/storage/cassandra/dependencystore/storage_test.go | 2 +- plugin/storage/es/spanstore/writer.go | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/anonymizer/app/anonymizer/anonymizer.go b/cmd/anonymizer/app/anonymizer/anonymizer.go index b3a893c702d..0a56457d1fc 100644 --- a/cmd/anonymizer/app/anonymizer/anonymizer.go +++ b/cmd/anonymizer/app/anonymizer/anonymizer.go @@ -40,6 +40,8 @@ var allowedTags = map[string]bool{ "sampler.param": true, } +const PermUserRW = 0o600 // Read-write for owner only + // mapping stores the mapping of service/operation names to their one-way hashes, // so that we can do a reverse lookup should the researchers have questions. type mapping struct { @@ -126,7 +128,7 @@ func (a *Anonymizer) SaveMapping() { a.logger.Error("Failed to marshal mapping file", zap.Error(err)) return } - if err := os.WriteFile(filepath.Clean(a.mappingFile), dat, os.ModePerm); err != nil { + if err := os.WriteFile(filepath.Clean(a.mappingFile), dat, PermUserRW); err != nil { a.logger.Error("Failed to write mapping file", zap.Error(err)) return } diff --git a/cmd/internal/flags/admin_test.go b/cmd/internal/flags/admin_test.go index 4d5c3abdfb7..ba4a0e01e1f 100644 --- a/cmd/internal/flags/admin_test.go +++ b/cmd/internal/flags/admin_test.go @@ -56,7 +56,7 @@ func TestAdminServerHandlesPortZero(t *testing.T) { onlyEntry := message.All()[0] hostPort := onlyEntry.ContextMap()["http.host-port"].(string) port, _ := strconv.Atoi(strings.Split(hostPort, ":")[3]) - assert.Positive(t, port, 0) + assert.Positive(t, port) } func TestAdminHealthCheck(t *testing.T) { diff --git a/pkg/tenancy/grpc.go b/pkg/tenancy/grpc.go index 5c513578787..f1a2e6c8856 100644 --- a/pkg/tenancy/grpc.go +++ b/pkg/tenancy/grpc.go @@ -100,7 +100,7 @@ func tenantFromMetadata(md metadata.MD, tenancyHeader string) (string, error) { // NewGuardingUnaryInterceptor blocks handling of RPCs whose tenancy header doesn't meet tenancy requirements. // It also ensures the tenant is directly in the context, rather than context metadata. func NewGuardingUnaryInterceptor(tc *Manager) grpc.UnaryServerInterceptor { - return func(ctx context.Context, req any, _ /* info */ *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) { + return func(ctx context.Context, req any, _ *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (any, error) { tenant, err := getValidTenant(ctx, tc) if err != nil { return nil, err diff --git a/plugin/storage/cassandra/dependencystore/storage_test.go b/plugin/storage/cassandra/dependencystore/storage_test.go index 3f2fd84ce15..bc26d63a421 100644 --- a/plugin/storage/cassandra/dependencystore/storage_test.go +++ b/plugin/storage/cassandra/dependencystore/storage_test.go @@ -268,5 +268,5 @@ func TestGetBuckets(t *testing.T) { } func matchEverything() any { - return mock.MatchedBy(func(_ /* v */ []any) bool { return true }) + return mock.MatchedBy(func([]any) bool { return true }) } diff --git a/plugin/storage/es/spanstore/writer.go b/plugin/storage/es/spanstore/writer.go index 2b3daddf445..d4d6d07854d 100644 --- a/plugin/storage/es/spanstore/writer.go +++ b/plugin/storage/es/spanstore/writer.go @@ -117,7 +117,7 @@ func getSpanAndServiceIndexFn(archive, useReadWriteAliases bool, prefix, spanDat spanIndexPrefix := prefix + spanIndex serviceIndexPrefix := prefix + serviceIndex if archive { - return func(_ /* date */ time.Time) (string, string) { + return func(_ time.Time) (string, string) { if useReadWriteAliases { return archiveIndex(spanIndexPrefix, archiveWriteIndexSuffix), "" } From 6e5aaef04daf1b6707672f9af43d2bc6aa3e353a Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Wed, 12 Jun 2024 00:38:50 -0400 Subject: [PATCH 7/7] fix Signed-off-by: Yuri Shkuro --- plugin/storage/badger/stats.go | 2 +- storage/spanstore/downsampling_writer_test.go | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/plugin/storage/badger/stats.go b/plugin/storage/badger/stats.go index 57c5fa86f82..d637b6ac56e 100644 --- a/plugin/storage/badger/stats.go +++ b/plugin/storage/badger/stats.go @@ -17,6 +17,6 @@ package badger -func (f *Factory) diskStatisticsUpdate() error { +func (*Factory) diskStatisticsUpdate() error { return nil } diff --git a/storage/spanstore/downsampling_writer_test.go b/storage/spanstore/downsampling_writer_test.go index 9afb636fee0..eefe181441b 100644 --- a/storage/spanstore/downsampling_writer_test.go +++ b/storage/spanstore/downsampling_writer_test.go @@ -62,7 +62,7 @@ func TestDownSamplingWriter_WriteSpan(t *testing.T) { } // This test is to make sure h.hash.Reset() works and same traceID will always hash to the same value. -func TestDownSamplingWriter_hashBytes(_ *testing.T) { +func TestDownSamplingWriter_hashBytes(t *testing.T) { downsamplingOptions := DownsamplingOptions{ Ratio: 1, HashSalt: "", @@ -70,7 +70,12 @@ func TestDownSamplingWriter_hashBytes(_ *testing.T) { } c := NewDownsamplingWriter(&noopWriteSpanStore{}, downsamplingOptions) h := c.sampler.hasherPool.Get().(*hasher) - c.sampler.hasherPool.Put(h) + defer c.sampler.hasherPool.Put(h) + + once := h.hashBytes() + twice := h.hashBytes() + assert.Equal(t, once, twice, "hashBytes should be idempotent for empty buffer") + trace := model.TraceID{ Low: uint64(0), High: uint64(1), @@ -79,7 +84,9 @@ func TestDownSamplingWriter_hashBytes(_ *testing.T) { TraceID: trace, } _, _ = span.TraceID.MarshalTo(h.buffer) - // Same traceID should always be hashed to same uint64 in DownSamplingWriter. + once = h.hashBytes() + twice = h.hashBytes() + assert.Equal(t, once, twice, "hashBytes should be idempotent for non-empty buffer") } func TestDownsamplingWriter_calculateThreshold(t *testing.T) {