From ee1c053323f61d56167150ec0cfba9ec1f8867fc Mon Sep 17 00:00:00 2001 From: "agent-platform-auto-pr[bot]" Date: Wed, 13 Nov 2024 11:50:33 +0000 Subject: [PATCH 01/21] Update Go version to 1.23.3 --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 88 +++++++++---------- .go-version | 2 +- .wwhrd.yml | 2 +- README.md | 2 +- cmd/process-agent/README.md | 2 +- comp/core/log/impl-trace/go.mod | 2 +- comp/core/status/statusimpl/go.mod | 2 +- comp/netflow/payload/go.mod | 2 +- devenv/scripts/Install-DevEnv.ps1 | 2 +- docs/dev/agent_dev_env.md | 2 +- docs/public/setup.md | 2 +- go.mod | 4 +- internal/tools/go.mod | 2 +- internal/tools/independent-lint/go.mod | 2 +- internal/tools/modformatter/go.mod | 2 +- internal/tools/modparser/go.mod | 2 +- internal/tools/proto/go.mod | 2 +- pkg/config/remote/go.mod | 2 +- pkg/errors/go.mod | 2 +- pkg/gohai/go.mod | 2 +- pkg/linters/components/pkgconfigusage/go.mod | 2 +- pkg/logs/launchers/windowsevent/README.md | 2 +- pkg/networkdevice/profile/go.mod | 2 +- pkg/security/secl/go.mod | 2 +- pkg/security/seclwin/go.mod | 2 +- pkg/util/cache/go.mod | 2 +- pkg/util/flavor/go.mod | 2 +- pkg/util/grpc/go.mod | 2 +- pkg/util/uuid/go.mod | 2 +- .../bump-go-to-1.23.3-6c42ba4e8efe3ffd.yaml | 4 + tasks/go.py | 2 +- tasks/unit_tests/modules_tests.py | 2 +- test/fakeintake/Dockerfile | 2 +- test/fakeintake/docs/README.md | 2 +- test/fakeintake/go.mod | 2 +- test/new-e2e/go.mod | 4 +- tools/gdb/Dockerfile | 2 +- tools/retry_file_dump/go.mod | 2 +- 39 files changed, 85 insertions(+), 85 deletions(-) create mode 100644 releasenotes/notes/bump-go-to-1.23.3-6c42ba4e8efe3ffd.yaml diff --git a/.circleci/config.yml b/.circleci/config.yml index 35827b8042436..3b150edeb15ef 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ experimental: templates: job_template: &job_template docker: - - image: gcr.io/datadoghq/agent-circleci-runner:v48262719-bfb00f80 + - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v48883349-6ba172ff environment: USE_SYSTEM_LIBS: "1" working_directory: /go/src/github.com/DataDog/datadog-agent diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab738a582229a..aa2b0dbf53b79 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -171,51 +171,51 @@ variables: # Build images versions # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only - DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BUILDIMAGES: v48262719-bfb00f80 - DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v48262719-bfb00f80 - DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v48262719-bfb00f80 - DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v48262719-bfb00f80 - DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v48262719-bfb00f80 + DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_BUILDIMAGES: v48883349-6ba172ff + DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_WINBUILDIMAGES: v48883349-6ba172ff + DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_ARMBUILDIMAGES: v48883349-6ba172ff + DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v48883349-6ba172ff + DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only" + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v48883349-6ba172ff # New images to enable different version per image - not used yet - CI_IMAGE_BTF_GEN: v48262719-bfb00f80 - CI_IMAGE_BTF_GEN_SUFFIX: "" - CI_IMAGE_DEB_X64: v48262719-bfb00f80 - CI_IMAGE_DEB_X64_SUFFIX: "" - CI_IMAGE_DEB_ARM64: v48262719-bfb00f80 - CI_IMAGE_DEB_ARM64_SUFFIX: "" - CI_IMAGE_DEB_ARMHF: v48262719-bfb00f80 - CI_IMAGE_DEB_ARMHF_SUFFIX: "" - CI_IMAGE_DD_AGENT_TESTING: v48262719-bfb00f80 - CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "" - CI_IMAGE_DOCKER_X64: v48262719-bfb00f80 - CI_IMAGE_DOCKER_X64_SUFFIX: "" - CI_IMAGE_DOCKER_ARM64: v48262719-bfb00f80 - CI_IMAGE_DOCKER_ARM64_SUFFIX: "" - CI_IMAGE_GITLAB_AGENT_DEPLOY: v48262719-bfb00f80 - CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "" - CI_IMAGE_LINUX_GLIBC_2_17_X64: v48262719-bfb00f80 - CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "" - CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v48262719-bfb00f80 - CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "" - CI_IMAGE_SYSTEM_PROBE_X64: v48262719-bfb00f80 - CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "" - CI_IMAGE_SYSTEM_PROBE_ARM64: v48262719-bfb00f80 - CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "" - CI_IMAGE_RPM_X64: v48262719-bfb00f80 - CI_IMAGE_RPM_X64_SUFFIX: "" - CI_IMAGE_RPM_ARM64: v48262719-bfb00f80 - CI_IMAGE_RPM_ARM64_SUFFIX: "" - CI_IMAGE_RPM_ARMHF: v48262719-bfb00f80 - CI_IMAGE_RPM_ARMHF_SUFFIX: "" - CI_IMAGE_WIN_1809_X64: v48262719-bfb00f80 - CI_IMAGE_WIN_1809_X64_SUFFIX: "" - CI_IMAGE_WIN_LTSC2022_X64: v48262719-bfb00f80 - CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "" + CI_IMAGE_BTF_GEN: v48883349-6ba172ff + CI_IMAGE_BTF_GEN_SUFFIX: "_test_only" + CI_IMAGE_DEB_X64: v48883349-6ba172ff + CI_IMAGE_DEB_X64_SUFFIX: "_test_only" + CI_IMAGE_DEB_ARM64: v48883349-6ba172ff + CI_IMAGE_DEB_ARM64_SUFFIX: "_test_only" + CI_IMAGE_DEB_ARMHF: v48883349-6ba172ff + CI_IMAGE_DEB_ARMHF_SUFFIX: "_test_only" + CI_IMAGE_DD_AGENT_TESTING: v48883349-6ba172ff + CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "_test_only" + CI_IMAGE_DOCKER_X64: v48883349-6ba172ff + CI_IMAGE_DOCKER_X64_SUFFIX: "_test_only" + CI_IMAGE_DOCKER_ARM64: v48883349-6ba172ff + CI_IMAGE_DOCKER_ARM64_SUFFIX: "_test_only" + CI_IMAGE_GITLAB_AGENT_DEPLOY: v48883349-6ba172ff + CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "_test_only" + CI_IMAGE_LINUX_GLIBC_2_17_X64: v48883349-6ba172ff + CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "_test_only" + CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v48883349-6ba172ff + CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "_test_only" + CI_IMAGE_SYSTEM_PROBE_X64: v48883349-6ba172ff + CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "_test_only" + CI_IMAGE_SYSTEM_PROBE_ARM64: v48883349-6ba172ff + CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "_test_only" + CI_IMAGE_RPM_X64: v48883349-6ba172ff + CI_IMAGE_RPM_X64_SUFFIX: "_test_only" + CI_IMAGE_RPM_ARM64: v48883349-6ba172ff + CI_IMAGE_RPM_ARM64_SUFFIX: "_test_only" + CI_IMAGE_RPM_ARMHF: v48883349-6ba172ff + CI_IMAGE_RPM_ARMHF_SUFFIX: "_test_only" + CI_IMAGE_WIN_1809_X64: v48883349-6ba172ff + CI_IMAGE_WIN_1809_X64_SUFFIX: "_test_only" + CI_IMAGE_WIN_LTSC2022_X64: v48883349-6ba172ff + CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "_test_only" DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded DEB_GPG_KEY_ID: c0962c7d diff --git a/.go-version b/.go-version index 229a27c6f2047..ac1df3fce34b7 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.22.8 +1.23.3 diff --git a/.wwhrd.yml b/.wwhrd.yml index 814b73843d3fe..85b1253962755 100644 --- a/.wwhrd.yml +++ b/.wwhrd.yml @@ -45,4 +45,4 @@ exceptions: additional: # list here paths to additional licenses - golang/go: "raw.githubusercontent.com/golang/go/go1.22.8/LICENSE" + golang/go: "raw.githubusercontent.com/golang/go/go1.23.3/LICENSE" diff --git a/README.md b/README.md index ab137bbe48339..67f5bc5209579 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ and development, is located under [the docs directory](docs) of the present repo ## Getting started To build the Agent you need: - * [Go](https://golang.org/doc/install) 1.22 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path. + * [Go](https://golang.org/doc/install) 1.23 or later. You'll also need to set your `$GOPATH` and have `$GOPATH/bin` in your path. * Python 3.11+ along with development libraries for tooling. You will also need Python 2.7 if you are building the Agent with Python 2 support. * Python dependencies. You may install these with `pip install -r requirements.txt` This will also pull in [Invoke](http://www.pyinvoke.org) if not yet installed. diff --git a/cmd/process-agent/README.md b/cmd/process-agent/README.md index efe1219fc7ddd..f157634ae6a7b 100644 --- a/cmd/process-agent/README.md +++ b/cmd/process-agent/README.md @@ -8,7 +8,7 @@ See the [Live Processes docs](https://docs.datadoghq.com/graphing/infrastructure Pre-requisites: -* `go >= 1.22` +* `go >= 1.23` * `invoke` Check out the repo in your `$GOPATH` diff --git a/comp/core/log/impl-trace/go.mod b/comp/core/log/impl-trace/go.mod index 366ef8c853ae8..f2a14c64237b7 100644 --- a/comp/core/log/impl-trace/go.mod +++ b/comp/core/log/impl-trace/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/comp/core/log/impl-trace -go 1.22.0 +go 1.23.0 replace ( github.com/DataDog/datadog-agent/comp/api/api/def => ../../../api/api/def diff --git a/comp/core/status/statusimpl/go.mod b/comp/core/status/statusimpl/go.mod index ab1836b963877..b6e3f9c6061f2 100644 --- a/comp/core/status/statusimpl/go.mod +++ b/comp/core/status/statusimpl/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/comp/core/status/statusimpl -go 1.22.0 +go 1.23.0 replace ( github.com/DataDog/datadog-agent/comp/api/api/def => ../../../api/api/def diff --git a/comp/netflow/payload/go.mod b/comp/netflow/payload/go.mod index cfcfcc36b8e62..a652785dfb405 100644 --- a/comp/netflow/payload/go.mod +++ b/comp/netflow/payload/go.mod @@ -1,3 +1,3 @@ module github.com/DataDog/datadog-agent/comp/netflow/payload -go 1.22.0 +go 1.23.0 diff --git a/devenv/scripts/Install-DevEnv.ps1 b/devenv/scripts/Install-DevEnv.ps1 index 87ab88208b694..e977850a7e5ec 100644 --- a/devenv/scripts/Install-DevEnv.ps1 +++ b/devenv/scripts/Install-DevEnv.ps1 @@ -45,7 +45,7 @@ Write-Host -ForegroundColor Yellow -BackgroundColor DarkGreen '- Installing Gola $ErrorActionPreference = 'Stop' $ProgressPreference = 'SilentlyContinue' -$go_version = "1.22.8" +$go_version = "1.23.3" Write-Host -ForegroundColor Green "Installing go $go_version" $gozip = "https://dl.google.com/go/go$go_version.windows-amd64.zip" diff --git a/docs/dev/agent_dev_env.md b/docs/dev/agent_dev_env.md index 2674bee851c5a..674b1332202e0 100644 --- a/docs/dev/agent_dev_env.md +++ b/docs/dev/agent_dev_env.md @@ -138,7 +138,7 @@ This procedure ensures you not only get the correct version of `invoke`, but als ### Golang -You must [install Golang](https://golang.org/doc/install) version `1.22.8` or +You must [install Golang](https://golang.org/doc/install) version `1.23.3` or higher. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any additional tool it might need. diff --git a/docs/public/setup.md b/docs/public/setup.md index 38e2306335195..e42ff8e9885cc 100644 --- a/docs/public/setup.md +++ b/docs/public/setup.md @@ -101,7 +101,7 @@ This procedure ensures you not only get the correct version of `invoke`, but als ### Golang -You must [install Golang](https://golang.org/doc/install) version `1.22.8` or higher. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any additional tool it might need. +You must [install Golang](https://golang.org/doc/install) version `1.23.3` or higher. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any additional tool it might need. !!! note Versions of Golang that aren't an exact match to the version specified in our build images (see e.g. [here](https://github.com/DataDog/datadog-agent-buildimages/blob/c025473ee467ee6d884d532e4c12c7d982ce8fe1/circleci/Dockerfile#L43)) may not be able to build the agent and/or the [rtloader](https://github.com/DataDog/datadog-agent/tree/main/rtloader) binary properly. diff --git a/go.mod b/go.mod index 6089ad4ab18f6..714fd1a64cdd1 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/DataDog/datadog-agent -go 1.22.1 - -toolchain go1.22.8 +go 1.23.0 // v0.8.0 was tagged long ago, and appared on pkg.go.dev. We do not want any tagged version // to appear there. The trick to accomplish this is to make a new version (in this case v0.9.0) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 1f9bbe2b7fc31..7ff99f72d89f6 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/internal/tools -go 1.22.0 +go 1.23.0 require ( github.com/frapposelli/wwhrd v0.4.0 diff --git a/internal/tools/independent-lint/go.mod b/internal/tools/independent-lint/go.mod index e035f74983bc1..e636d0f6d7b73 100644 --- a/internal/tools/independent-lint/go.mod +++ b/internal/tools/independent-lint/go.mod @@ -1,5 +1,5 @@ module github.com/DataDog/datadog-agent/cmd/independent-lint -go 1.22.0 +go 1.23.0 require golang.org/x/mod v0.21.0 diff --git a/internal/tools/modformatter/go.mod b/internal/tools/modformatter/go.mod index 1dbf6a3b0e80f..fe19b61e298d3 100644 --- a/internal/tools/modformatter/go.mod +++ b/internal/tools/modformatter/go.mod @@ -1,5 +1,5 @@ module github.com/DataDog/datadog-agent/internal/tools/modformatter -go 1.22.0 +go 1.23.0 require golang.org/x/mod v0.21.0 diff --git a/internal/tools/modparser/go.mod b/internal/tools/modparser/go.mod index c90dcf4ebb177..db4fdafc5814f 100644 --- a/internal/tools/modparser/go.mod +++ b/internal/tools/modparser/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/internal/tools/modparser -go 1.22.0 +go 1.23.0 require ( github.com/stretchr/testify v1.9.0 diff --git a/internal/tools/proto/go.mod b/internal/tools/proto/go.mod index 81da9e02f95db..c2159ad20c314 100644 --- a/internal/tools/proto/go.mod +++ b/internal/tools/proto/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/internal/tools/proto -go 1.22.0 +go 1.23.0 require ( github.com/favadi/protoc-go-inject-tag v1.4.0 diff --git a/pkg/config/remote/go.mod b/pkg/config/remote/go.mod index e8b932262da4e..c844cd6e33ba0 100644 --- a/pkg/config/remote/go.mod +++ b/pkg/config/remote/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/pkg/config/remote -go 1.22.0 +go 1.23.0 replace ( github.com/DataDog/datadog-agent/comp/api/api/def => ../../../comp/api/api/def diff --git a/pkg/errors/go.mod b/pkg/errors/go.mod index 60ed78514353b..1a518bc2f9603 100644 --- a/pkg/errors/go.mod +++ b/pkg/errors/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/pkg/errors -go 1.22.0 +go 1.23.0 require github.com/stretchr/testify v1.9.0 diff --git a/pkg/gohai/go.mod b/pkg/gohai/go.mod index ed6c54f3af0d0..2b2ee99a28dd7 100644 --- a/pkg/gohai/go.mod +++ b/pkg/gohai/go.mod @@ -2,7 +2,7 @@ module github.com/DataDog/datadog-agent/pkg/gohai // we don't want to just use the agent's go version because gohai might be used outside of it // eg. opentelemetry -go 1.22.0 +go 1.23.0 require ( github.com/DataDog/datadog-agent/pkg/util/log v0.56.0-rc.3 diff --git a/pkg/linters/components/pkgconfigusage/go.mod b/pkg/linters/components/pkgconfigusage/go.mod index ebd58ea2986bf..1e9d9b414ed10 100644 --- a/pkg/linters/components/pkgconfigusage/go.mod +++ b/pkg/linters/components/pkgconfigusage/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/pkg/linters/components/pkgconfigusage -go 1.22.0 +go 1.23.0 require ( github.com/golangci/plugin-module-register v0.1.1 diff --git a/pkg/logs/launchers/windowsevent/README.md b/pkg/logs/launchers/windowsevent/README.md index 1329dd9f4f17c..316b2e820224b 100644 --- a/pkg/logs/launchers/windowsevent/README.md +++ b/pkg/logs/launchers/windowsevent/README.md @@ -1,7 +1,7 @@ # How to setup a windows eventlog dev environment Cross compilation from mac is not easy, an easier path is to use a linux vm for that (for instance `ubuntu/trusty64` vagrant vm). -Requirements are to install go 1.22+, and to install `mingw-w64` with apt. +Requirements are to install go 1.23+, and to install `mingw-w64` with apt. Once those requirements are met, to build, run: ``` diff --git a/pkg/networkdevice/profile/go.mod b/pkg/networkdevice/profile/go.mod index a597437498afe..edac4a8784d67 100644 --- a/pkg/networkdevice/profile/go.mod +++ b/pkg/networkdevice/profile/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/pkg/networkdevice/profile -go 1.22.0 +go 1.23.0 require ( github.com/invopop/jsonschema v0.10.0 diff --git a/pkg/security/secl/go.mod b/pkg/security/secl/go.mod index 4ac35d61a22e1..b80d286a03367 100644 --- a/pkg/security/secl/go.mod +++ b/pkg/security/secl/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/pkg/security/secl -go 1.22.0 +go 1.23.0 require ( github.com/Masterminds/semver/v3 v3.3.0 diff --git a/pkg/security/seclwin/go.mod b/pkg/security/seclwin/go.mod index 6112fa987cda2..174d361f3255d 100644 --- a/pkg/security/seclwin/go.mod +++ b/pkg/security/seclwin/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/pkg/security/seclwin -go 1.22.0 +go 1.23.0 replace github.com/DataDog/datadog-agent/pkg/security/secl => ../secl diff --git a/pkg/util/cache/go.mod b/pkg/util/cache/go.mod index c9235e5db8314..7d9f733c3040d 100644 --- a/pkg/util/cache/go.mod +++ b/pkg/util/cache/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/pkg/util/cache -go 1.22.0 +go 1.23.0 require ( github.com/patrickmn/go-cache v2.1.0+incompatible diff --git a/pkg/util/flavor/go.mod b/pkg/util/flavor/go.mod index a15f499635d45..dd3edc2a0846e 100644 --- a/pkg/util/flavor/go.mod +++ b/pkg/util/flavor/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/pkg/util/flavor -go 1.22.0 +go 1.23.0 replace ( github.com/DataDog/datadog-agent/comp/api/api/def => ../../../comp/api/api/def diff --git a/pkg/util/grpc/go.mod b/pkg/util/grpc/go.mod index a92f6b863421e..009109165f264 100644 --- a/pkg/util/grpc/go.mod +++ b/pkg/util/grpc/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/pkg/util/grpc -go 1.22.0 +go 1.23.0 replace ( github.com/DataDog/datadog-agent/pkg/proto => ../../proto diff --git a/pkg/util/uuid/go.mod b/pkg/util/uuid/go.mod index 2da6b01d5dc8a..34c78b6042962 100644 --- a/pkg/util/uuid/go.mod +++ b/pkg/util/uuid/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/pkg/util/uuid -go 1.22.0 +go 1.23.0 replace ( github.com/DataDog/datadog-agent/pkg/util/cache => ../cache diff --git a/releasenotes/notes/bump-go-to-1.23.3-6c42ba4e8efe3ffd.yaml b/releasenotes/notes/bump-go-to-1.23.3-6c42ba4e8efe3ffd.yaml new file mode 100644 index 0000000000000..869e93f23df2b --- /dev/null +++ b/releasenotes/notes/bump-go-to-1.23.3-6c42ba4e8efe3ffd.yaml @@ -0,0 +1,4 @@ +--- +enhancements: +- | + Agents are now built with Go ``1.23.3``. diff --git a/tasks/go.py b/tasks/go.py index eee8afc40f7c1..d017ff4fc6a81 100644 --- a/tasks/go.py +++ b/tasks/go.py @@ -450,7 +450,7 @@ def tidy(ctx): @task def check_go_version(ctx): go_version_output = ctx.run('go version') - # result is like "go version go1.22.8 linux/amd64" + # result is like "go version go1.23.3 linux/amd64" running_go_version = go_version_output.stdout.split(' ')[2] with open(".go-version") as f: diff --git a/tasks/unit_tests/modules_tests.py b/tasks/unit_tests/modules_tests.py index ee5889b71f1b3..1cd0e368b88b1 100644 --- a/tasks/unit_tests/modules_tests.py +++ b/tasks/unit_tests/modules_tests.py @@ -13,7 +13,7 @@ { "Module": {"Path": "github.com/DataDog/datadog-agent"}, - "Go": "1.22", + "Go": "1.23", "Require": [ {"Path": "github.com/DataDog/datadog-agent/pkg/config/logs", "Version": "v0.51.0-rc.2"}, {"Path": "k8s.io/kms", "Version": "v0.27.6", "Indirect": true}, diff --git a/test/fakeintake/Dockerfile b/test/fakeintake/Dockerfile index 851c43495c0ee..292aac1e5eeef 100644 --- a/test/fakeintake/Dockerfile +++ b/test/fakeintake/Dockerfile @@ -2,7 +2,7 @@ # syntax=docker/dockerfile:1 ## Build -FROM golang:1.22.8-alpine3.20 AS build +FROM golang:1.23.3-alpine3.20 AS build # need gcc to build with CGO_ENABLED=1 # need musl-dev to get stdlib.h diff --git a/test/fakeintake/docs/README.md b/test/fakeintake/docs/README.md index 1edd2453c6b6d..af4219d148281 100644 --- a/test/fakeintake/docs/README.md +++ b/test/fakeintake/docs/README.md @@ -4,7 +4,7 @@ Exposes a catch-all API for Datadog Agent POST requests. ## Requirements -- [Golang 1.22](https://go.dev/dl/) +- [Golang 1.23](https://go.dev/dl/) ## How to run diff --git a/test/fakeintake/go.mod b/test/fakeintake/go.mod index 77a23f143589e..fb6db20e09b39 100644 --- a/test/fakeintake/go.mod +++ b/test/fakeintake/go.mod @@ -1,6 +1,6 @@ module github.com/DataDog/datadog-agent/test/fakeintake -go 1.22.0 +go 1.23.0 // every datadog-agent module replaced in the fakeintake go.mod needs to be copied in the Dockerfile replace ( diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index b31bcd112bc3c..b1b9e0e257aa8 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -1,8 +1,6 @@ module github.com/DataDog/datadog-agent/test/new-e2e -go 1.22.5 - -toolchain go1.22.8 +go 1.23.0 // Do not upgrade Pulumi plugins to versions different from `test-infra-definitions`. // The plugin versions NEED to be aligned. diff --git a/tools/gdb/Dockerfile b/tools/gdb/Dockerfile index b91ac4b06514a..b8a50a020edc5 100644 --- a/tools/gdb/Dockerfile +++ b/tools/gdb/Dockerfile @@ -6,7 +6,7 @@ RUN rm -vf /etc/ssl/openssl.cnf RUN DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y gdb build-essential strace less vim # Install go -RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.22.8.linux-amd64.tar.gz +RUN curl -fSL -o golang.tgz https://go.dev/dl/go1.23.3.linux-amd64.tar.gz RUN tar xzvf golang.tgz RUN ln -s /go /goroot diff --git a/tools/retry_file_dump/go.mod b/tools/retry_file_dump/go.mod index ed65fca4950b0..e3424cae2f29d 100644 --- a/tools/retry_file_dump/go.mod +++ b/tools/retry_file_dump/go.mod @@ -5,7 +5,7 @@ module github.com/DataDog/datadog-agent/tools/retry_file_dump -go 1.22.0 +go 1.23.0 require github.com/golang/protobuf v1.4.3 From b8add439b6c508b9891d48e654848b1b9eb55953 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Thu, 14 Nov 2024 15:43:09 +0100 Subject: [PATCH 02/21] Upgrading golangci-lint to a version that support go 1.23 --- .custom-gcl.yml | 2 +- internal/tools/go.mod | 46 +++++++++++++++++++++---------------------- internal/tools/go.sum | 25 +++++++++++++++++++++++ 3 files changed, 49 insertions(+), 24 deletions(-) diff --git a/.custom-gcl.yml b/.custom-gcl.yml index 45466d9aef0ce..482aa6f432b75 100644 --- a/.custom-gcl.yml +++ b/.custom-gcl.yml @@ -1,4 +1,4 @@ -version: v1.59.1 +version: v1.60.3 name: golangci-lint diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 7ff99f72d89f6..7627075779f3f 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -5,7 +5,7 @@ go 1.23.0 require ( github.com/frapposelli/wwhrd v0.4.0 github.com/go-enry/go-license-detector/v4 v4.3.0 - github.com/golangci/golangci-lint v1.59.1 + github.com/golangci/golangci-lint v1.60.3 github.com/goware/modvendor v0.5.0 github.com/stormcat24/protodep v0.1.8 github.com/vektra/mockery/v2 v2.40.1 @@ -23,11 +23,11 @@ require ( 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/Antonboom/testifylint v1.4.3 // indirect + github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect + github.com/Crocmagnon/fatcontext v0.4.0 // indirect github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect - github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0 // indirect + github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect github.com/Masterminds/semver/v3 v3.2.1 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect @@ -42,7 +42,7 @@ require ( github.com/bitfield/gotestdox v0.2.1 // indirect github.com/bkielbasa/cyclop v1.2.1 // indirect github.com/blizzy78/varnamelen v0.8.0 // indirect - github.com/bombsimon/wsl/v4 v4.2.1 // indirect + github.com/bombsimon/wsl/v4 v4.4.1 // indirect github.com/breml/bidichk v0.2.7 // indirect github.com/breml/errchkjson v0.3.6 // indirect github.com/briandowns/spinner v1.23.0 // indirect @@ -87,12 +87,12 @@ require ( 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/gofrs/flock v0.12.1 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect github.com/golang/protobuf v1.5.3 // indirect github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect - github.com/golangci/gofmt v0.0.0-20231018234816-f50ced29576e // indirect + github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // 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 @@ -120,7 +120,7 @@ require ( 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/jjti/go-spancheck v0.6.2 // indirect github.com/julz/importas v0.1.0 // indirect github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect @@ -144,11 +144,11 @@ require ( github.com/mattn/go-runewidth v0.0.9 // indirect github.com/mattn/go-zglob v0.0.2-0.20191112051448-a8912a37f9e7 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/mgechev/revive v1.3.7 // indirect + github.com/mgechev/revive v1.3.9 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/montanaflynn/stats v0.0.0-20151014174947-eeaced052adb // indirect - github.com/moricho/tparallel v0.3.1 // indirect + github.com/moricho/tparallel v0.3.2 // indirect github.com/nakabonne/nestif v0.3.1 // indirect github.com/nishanths/exhaustive v0.12.0 // indirect github.com/nishanths/predeclared v0.2.2 // indirect @@ -158,7 +158,7 @@ require ( github.com/pjbgf/sha1cd v0.3.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/polyfloyd/go-errorlint v1.5.2 // indirect + github.com/polyfloyd/go-errorlint v1.6.0 // 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 @@ -170,25 +170,25 @@ require ( github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect github.com/rs/zerolog v1.29.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/ryancurrah/gomodguard v1.3.2 // indirect + github.com/ryancurrah/gomodguard v1.3.3 // 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.26.0 // indirect - github.com/securego/gosec/v2 v2.20.1-0.20240525090044-5f0084eb01a9 // indirect + github.com/sashamelentyev/usestdlibvars v1.27.0 // indirect + github.com/securego/gosec/v2 v2.20.1-0.20240822074752-ab3f6c1c83a0 // indirect github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect github.com/shogo82148/go-shuffle v0.0.0-20170808115208-59829097ff3b // indirect github.com/sirupsen/logrus v1.9.3 // indirect github.com/sivchari/containedctx v1.0.3 // indirect - github.com/sivchari/tenv v1.7.1 // indirect + github.com/sivchari/tenv v1.10.0 // indirect github.com/skeema/knownhosts v1.2.2 // indirect github.com/sonatard/noctx v0.0.2 // indirect github.com/sourcegraph/go-diff v0.7.0 // 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/cobra v1.8.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.15.0 // indirect @@ -202,11 +202,11 @@ require ( 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.3 // indirect + github.com/tomarrell/wrapcheck/v2 v2.9.0 // 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.1.1 // indirect - github.com/uudashr/gocognit v1.1.2 // indirect + github.com/uudashr/gocognit v1.1.3 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xen0n/gosmopolitan v1.2.2 // indirect github.com/yagipy/maintidx v1.0.0 // indirect @@ -214,7 +214,7 @@ require ( 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-simpler.org/sloglint v0.7.2 // 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 @@ -230,13 +230,13 @@ require ( golang.org/x/text v0.19.0 // indirect golang.org/x/tools v0.26.0 // indirect gonum.org/v1/gonum v0.7.0 // indirect - google.golang.org/protobuf v1.33.0 // indirect + google.golang.org/protobuf v1.34.2 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/neurosnap/sentences.v1 v1.0.6 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - honnef.co/go/tools v0.4.7 // indirect - mvdan.cc/gofumpt v0.6.0 // indirect + honnef.co/go/tools v0.5.1 // indirect + mvdan.cc/gofumpt v0.7.0 // indirect mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect ) diff --git a/internal/tools/go.sum b/internal/tools/go.sum index be27183a31753..4ccb676a47b98 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -48,16 +48,20 @@ github.com/Antonboom/nilnil v0.1.9 h1:eKFMejSxPSA9eLSensFmjW2XTgTwJMjZ8hUHtV4s/S 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/Antonboom/testifylint v1.4.3/go.mod h1:+8Q9+AOLsz5ZiQiiYujJKs9mNz398+M6UgslP4qgJLA= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= 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/toml v1.4.1-0.20240526193622-a339e1f7089c/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/Crocmagnon/fatcontext v0.4.0/go.mod h1:ZtWrXkgyfsYPzS6K3O88va6t2GEglG93vnII/F94WC0= 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.2.0 h1:sATXp1x6/axKxz2Gjxv8MALP0bXaNRfQinEwyfMcx8c= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0/go.mod h1:Nl76DrGNJTA1KJ0LePKBw/vznBX1EHbAZX8mwjR82nI= +github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0/go.mod h1:ONJg5sxcbsdQQ4pOW8TGdTidT2TMAUy/2Xhr8mrYaao= github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190129172621-c8b1d7a94ddf/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo= 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= @@ -112,6 +116,7 @@ github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= 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/bombsimon/wsl/v4 v4.4.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= @@ -149,6 +154,7 @@ github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBS github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= 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/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo= github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc= @@ -266,6 +272,7 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -305,8 +312,11 @@ github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= 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/gofmt v0.0.0-20240816233607-d8596aa466a9/go.mod h1:Oesb/0uFAyWoaw1U1qS5zyjCg5NP9C9iwjnI4tIsXEE= 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/golangci-lint v1.60.3 h1:l38A5de24ZeDlcFF+EB7m3W5joPD99/hS5SIHJPyZa0= +github.com/golangci/golangci-lint v1.60.3/go.mod h1:J4vOpcjzRI+lDL2DKNGBZVB3EQSBfCBCMpaydWLtJNo= 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= @@ -411,6 +421,7 @@ github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9B 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/jjti/go-spancheck v0.6.2/go.mod h1:+X7lvIrR5ZdUTkxFYqzJ0abr8Sb5LOo80uOhWNqIrYA= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= @@ -490,6 +501,7 @@ github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0j github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= 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/mgechev/revive v1.3.9/go.mod h1:+uxEIr5UH0TjXWHTno3xh4u7eg6jDpXKzQccA9UGhHU= 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= @@ -503,6 +515,7 @@ github.com/montanaflynn/stats v0.0.0-20151014174947-eeaced052adb h1:bsjNADsjHq0g github.com/montanaflynn/stats v0.0.0-20151014174947-eeaced052adb/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/moricho/tparallel v0.3.1 h1:fQKD4U1wRMAYNngDonW5XupoB/ZGJHdpzrWqgyg9krA= github.com/moricho/tparallel v0.3.1/go.mod h1:leENX2cUv7Sv2qDgdi0D0fCftN8fRC67Bcn8pqzeYNI= +github.com/moricho/tparallel v0.3.2/go.mod h1:OQ+K3b4Ln3l2TZveGCywybl68glfLEwFGqvnjok8b+U= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U= @@ -541,6 +554,7 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= 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/polyfloyd/go-errorlint v1.6.0/go.mod h1:HR7u8wuP1kb1NeN1zqTd1ZMlqUKPPHF+Id4vIPvDqVw= 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= @@ -587,6 +601,7 @@ github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryancurrah/gomodguard v1.3.2 h1:CuG27ulzEB1Gu5Dk5gP8PFxSOZ3ptSdP5iI/3IXxM18= github.com/ryancurrah/gomodguard v1.3.2/go.mod h1:LqdemiFomEjcxOqirbQCb3JFvSxH2JUYMerTFd3sF2o= +github.com/ryancurrah/gomodguard v1.3.3/go.mod h1:rsKQjj4l3LXe8N344Ow7agAy5p9yjsWOtRzUMYmA0QY= 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= @@ -597,8 +612,10 @@ github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tM github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ= github.com/sashamelentyev/usestdlibvars v1.26.0 h1:LONR2hNVKxRmzIrZR0PhSF3mhCAzvnr+DcUiHgREfXE= github.com/sashamelentyev/usestdlibvars v1.26.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8= +github.com/sashamelentyev/usestdlibvars v1.27.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/securego/gosec/v2 v2.20.1-0.20240822074752-ab3f6c1c83a0/go.mod h1:iyeMMRw8QEmueUSZ2VqmkQMiDyDcobfPnG00CV/NWdE= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4= @@ -619,6 +636,7 @@ github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+W github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4= github.com/sivchari/tenv v1.7.1 h1:PSpuD4bu6fSmtWMxSGWcvqUUgIn7k3yOJhOIzVWn8Ak= github.com/sivchari/tenv v1.7.1/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= +github.com/sivchari/tenv v1.10.0/go.mod h1:tdY24masnVoZFxYrHv/nD6Tc8FbkEtAQEEziXpyMgqY= github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A= github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= github.com/sonatard/noctx v0.0.2 h1:L7Dz4De2zDQhW8S0t+KUjY0MAQJd6SgVwhzNIc4ok00= @@ -631,6 +649,7 @@ 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= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -680,6 +699,7 @@ github.com/timonwong/loggercheck v0.9.4 h1:HKKhqrjcVj8sxL7K77beXh0adEm6DLjV/QOGe github.com/timonwong/loggercheck v0.9.4/go.mod h1:caz4zlPcgvpEkXgVnAJGowHAMW2NwHaNlpS8xDbVhTg= 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/tomarrell/wrapcheck/v2 v2.9.0/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= @@ -688,6 +708,7 @@ github.com/ultraware/whitespace v0.1.1 h1:bTPOGejYFulW3PkcrqkeQwOd6NKOOXvmGD9bo/ 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/uudashr/gocognit v1.1.3/go.mod h1:aKH8/e8xbTRBwjbCkwZ8qt4l2EpKXl31KMHgSS+lZ2U= github.com/vektra/mockery/v2 v2.40.1 h1:8D01rBqloDLDHKZGXkyUD9Yj5Z+oDXBqDZ+tRXYM/oA= github.com/vektra/mockery/v2 v2.40.1/go.mod h1:dPzGtjT0/Uu4hqpF6QNHwz+GLago7lq1bxdj9wHbGKo= github.com/wadey/gocovmerge v0.0.0-20160331181800-b5bfa59ec0ad h1:W0LEBv82YCGEtcmPA3uNZBI33/qF//HAAs3MawDjRa0= @@ -718,6 +739,7 @@ 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-simpler.org/sloglint v0.7.2/go.mod h1:US+9C80ppl7VsThQclkM7BkCHQAzuz8kHLsW3ppuluo= 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= @@ -1125,6 +1147,7 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1163,8 +1186,10 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.4.7 h1:9MDAWxMoSnB6QoSqiVr7P5mtkT9pOc1kSxchzPCnqJs= honnef.co/go/tools v0.4.7/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= +honnef.co/go/tools v0.5.1/go.mod h1:e9irvo83WDG9/irijV44wr3tbhcFeRnfpVlRqVwpzMs= mvdan.cc/gofumpt v0.6.0 h1:G3QvahNDmpD+Aek/bNOLrFR2XC6ZAdo62dZu65gmwGo= mvdan.cc/gofumpt v0.6.0/go.mod h1:4L0wf+kgIPZtcCWXynNS2e6bhmj73umwnuXSZarixzA= +mvdan.cc/gofumpt v0.7.0/go.mod h1:txVFJy/Sc/mvaycET54pV8SW8gWxTlUuGHVEcncmNUo= 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= From c247c383099ea608560bd0794713136a89a5a1ae Mon Sep 17 00:00:00 2001 From: Olivier G Date: Thu, 14 Nov 2024 15:45:31 +0100 Subject: [PATCH 03/21] SA1006: printf-style function with dynamic format string and no further arguments should use print-style function instead (staticcheck) --- pkg/networkpath/traceroute/traceroute_darwin.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/networkpath/traceroute/traceroute_darwin.go b/pkg/networkpath/traceroute/traceroute_darwin.go index cf0ef5d3e325e..d5144e7de2c04 100644 --- a/pkg/networkpath/traceroute/traceroute_darwin.go +++ b/pkg/networkpath/traceroute/traceroute_darwin.go @@ -9,7 +9,7 @@ package traceroute import ( "context" - "fmt" + "errors" "github.com/DataDog/datadog-agent/comp/core/telemetry" "github.com/DataDog/datadog-agent/pkg/networkpath/payload" @@ -40,7 +40,7 @@ func New(cfg Config, telemetry telemetry.Component) (*MacTraceroute, error) { // TCP is not supported at the moment due to the // way go listensn for TCP in our implementation on BSD systems if cfg.Protocol == payload.ProtocolTCP { - return nil, fmt.Errorf(tcpNotSupportedMsg) + return nil, errors.New(tcpNotSupportedMsg) } return &MacTraceroute{ @@ -58,7 +58,7 @@ func (m *MacTraceroute) Run(ctx context.Context) (payload.NetworkPath, error) { // TCP is not supported at the moment due to the // way go listens for TCP in our implementation on BSD systems if m.cfg.Protocol == payload.ProtocolTCP { - return payload.NetworkPath{}, fmt.Errorf(tcpNotSupportedMsg) + return payload.NetworkPath{}, errors.New(tcpNotSupportedMsg) } return m.runner.RunTraceroute(ctx, m.cfg) From 78969ed512fb69ea271e05bfcff44023a6406506 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Thu, 14 Nov 2024 15:48:24 +0100 Subject: [PATCH 04/21] SA6006: use io.Writer.Write instead of converting from []byte to string to use io.WriteString --- pkg/util/cloudproviders/gce/gce_tags_test.go | 3 +-- pkg/util/ec2/ec2_tags_test.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/util/cloudproviders/gce/gce_tags_test.go b/pkg/util/cloudproviders/gce/gce_tags_test.go index 2eae7092d0b92..83b9535fbfef5 100644 --- a/pkg/util/cloudproviders/gce/gce_tags_test.go +++ b/pkg/util/cloudproviders/gce/gce_tags_test.go @@ -10,7 +10,6 @@ package gce import ( "context" "fmt" - "io" "net/http" "net/http/httptest" "os" @@ -68,7 +67,7 @@ func mockMetadataRequest(t *testing.T) *httptest.Server { assert.Contains(t, r.URL.String(), "/?recursive=true") assert.Equal(t, "Google", r.Header.Get("Metadata-Flavor")) w.Header().Set("Content-Type", "application/json") - io.WriteString(w, string(content)) + w.Write(content) })) metadataURL = ts.URL return ts diff --git a/pkg/util/ec2/ec2_tags_test.go b/pkg/util/ec2/ec2_tags_test.go index cce8a5800df2c..556a8c719d71a 100644 --- a/pkg/util/ec2/ec2_tags_test.go +++ b/pkg/util/ec2/ec2_tags_test.go @@ -56,7 +56,7 @@ func TestGetSecurityCreds(t *testing.T) { w.Header().Set("Content-Type", "text/plain") content, err := os.ReadFile("payloads/security_cred.json") require.NoError(t, err, fmt.Sprintf("failed to load json in payloads/security_cred.json: %v", err)) - io.WriteString(w, string(content)) + w.Write(content) } else { w.WriteHeader(http.StatusInternalServerError) } @@ -79,7 +79,7 @@ func TestGetInstanceIdentity(t *testing.T) { w.Header().Set("Content-Type", "text/plain") content, err := os.ReadFile("payloads/instance_indentity.json") require.NoError(t, err, fmt.Sprintf("failed to load json in payloads/instance_indentity.json: %v", err)) - io.WriteString(w, string(content)) + w.Write(content) })) defer ts.Close() instanceIdentityURL = ts.URL From f4985bf5d452eec52e79bbfd608abe2fc0a1768f Mon Sep 17 00:00:00 2001 From: Olivier G Date: Thu, 14 Nov 2024 15:56:53 +0100 Subject: [PATCH 05/21] SA4032: due to the file's build constraints, runtime.GOOS will never equal "windows" --- .../corechecks/servicediscovery/usm/service_test.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkg/collector/corechecks/servicediscovery/usm/service_test.go b/pkg/collector/corechecks/servicediscovery/usm/service_test.go index 6a35749695a5b..e62d21c002857 100644 --- a/pkg/collector/corechecks/servicediscovery/usm/service_test.go +++ b/pkg/collector/corechecks/servicediscovery/usm/service_test.go @@ -13,7 +13,6 @@ import ( "io/fs" "path" "path/filepath" - "runtime" "testing" "github.com/stretchr/testify/require" @@ -615,10 +614,6 @@ func TestExtractServiceMetadata(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - if tt.skipOnWindows && runtime.GOOS == "windows" { - t.Skip("Not supported on Windows") - } - var fs fs.SubFS fs = RealFs{} if tt.fs != nil { From d96560163087e523369a528b29689bc885244d68 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Thu, 14 Nov 2024 16:01:28 +0100 Subject: [PATCH 06/21] should omit nil check; len() for ZXW is defined as zero (gosimple) --- comp/languagedetection/client/clientimpl/util.go | 2 +- pkg/remoteconfig/state/repository.go | 4 ++-- pkg/trace/api/otlp.go | 2 +- pkg/trace/transform/transform.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/comp/languagedetection/client/clientimpl/util.go b/comp/languagedetection/client/clientimpl/util.go index b06cf5191f7b9..06aa3a6f2f5f7 100644 --- a/comp/languagedetection/client/clientimpl/util.go +++ b/comp/languagedetection/client/clientimpl/util.go @@ -94,5 +94,5 @@ func getContainerInfoFromPod(cid string, pod *workloadmeta.KubernetesPod) (strin } func podHasOwner(pod *workloadmeta.KubernetesPod) bool { - return pod.Owners != nil && len(pod.Owners) > 0 + return len(pod.Owners) > 0 } diff --git a/pkg/remoteconfig/state/repository.go b/pkg/remoteconfig/state/repository.go index 6c37a5080150d..0b9ed190fc3c5 100644 --- a/pkg/remoteconfig/state/repository.go +++ b/pkg/remoteconfig/state/repository.go @@ -67,7 +67,7 @@ type Update struct { // isEmpty returns whether or not all the fields of `Update` are empty func (u *Update) isEmpty() bool { - return len(u.TUFRoots) == 0 && len(u.TUFTargets) == 0 && (u.TargetFiles == nil || len(u.TargetFiles) == 0) && len(u.ClientConfigs) == 0 + return len(u.TUFRoots) == 0 && len(u.TUFTargets) == 0 && len(u.TargetFiles) == 0 && len(u.ClientConfigs) == 0 } // Repository is a remote config client used in a downstream process to retrieve @@ -250,7 +250,7 @@ func (r *Repository) Update(update Update) ([]string, error) { // TUF: Store the updated roots now that everything has validated if r.tufVerificationEnabled { r.tufRootsClient = tmpRootClient - } else if update.TUFRoots != nil && len(update.TUFRoots) > 0 { + } else if len(update.TUFRoots) > 0 { v, err := extractRootVersion(update.TUFRoots[len(update.TUFRoots)-1]) if err != nil { return nil, err diff --git a/pkg/trace/api/otlp.go b/pkg/trace/api/otlp.go index 9dda5532f1338..2506b9d92005d 100644 --- a/pkg/trace/api/otlp.go +++ b/pkg/trace/api/otlp.go @@ -79,7 +79,7 @@ func NewOTLPReceiver(out chan<- *Payload, cfg *config.AgentConfig, statsd statsd } _ = statsd.Gauge("datadog.trace_agent.otlp.span_name_as_resource_name_enabled", spanNameAsResourceNameEnabledVal, nil, 1) spanNameRemappingsEnabledVal := 0.0 - if cfg.OTLPReceiver.SpanNameRemappings != nil && len(cfg.OTLPReceiver.SpanNameRemappings) > 0 { + if len(cfg.OTLPReceiver.SpanNameRemappings) > 0 { if operationAndResourceNamesV2GateEnabled { log.Warnf("Detected SpanNameRemappings in config - this feature will be deprecated in a future version. Please remove it to access functionality from feature gate \"enable_operation_and_resource_name_logic_v2\".") } else { diff --git a/pkg/trace/transform/transform.go b/pkg/trace/transform/transform.go index dd2d5a5f08367..e98401781bb82 100644 --- a/pkg/trace/transform/transform.go +++ b/pkg/trace/transform/transform.go @@ -25,7 +25,7 @@ import ( // OperationAndResourceNameV2Enabled checks if the new operation and resource name logic should be used func OperationAndResourceNameV2Enabled(conf *config.AgentConfig) bool { - return !conf.OTLPReceiver.SpanNameAsResourceName && (conf.OTLPReceiver.SpanNameRemappings == nil || len(conf.OTLPReceiver.SpanNameRemappings) == 0) && conf.HasFeature("enable_operation_and_resource_name_logic_v2") + return !conf.OTLPReceiver.SpanNameAsResourceName && len(conf.OTLPReceiver.SpanNameRemappings) == 0 && conf.HasFeature("enable_operation_and_resource_name_logic_v2") } // OtelSpanToDDSpanMinimal otelSpanToDDSpan converts an OTel span to a DD span. From 8a013463e5526755716b7f0bc627b8500212928e Mon Sep 17 00:00:00 2001 From: Olivier G Date: Thu, 14 Nov 2024 16:10:54 +0100 Subject: [PATCH 07/21] SA1019: reflect.PtrTo has been deprecated since Go 1.22 and an alternative has been available since Go 1.18: Superseded by [PointerTo] --- pkg/gohai/utils/common.go | 2 +- test/new-e2e/pkg/e2e/suite.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/gohai/utils/common.go b/pkg/gohai/utils/common.go index 2fdb333112fbd..4da85373fb0ad 100644 --- a/pkg/gohai/utils/common.go +++ b/pkg/gohai/utils/common.go @@ -49,7 +49,7 @@ func canBeRendered(ty reflect.Kind) bool { func getValueMethod(fieldTy reflect.StructField) (reflect.Method, bool) { // check that a pointer to the field type has a Value method // (Value is a method on *Value[T]) - valueMethod, ok := reflect.PtrTo(fieldTy.Type).MethodByName("Value") + valueMethod, ok := reflect.PointerTo(fieldTy.Type).MethodByName("Value") if !ok || valueMethod.Type.NumIn() != 1 || valueMethod.Type.NumOut() != 2 { return reflect.Method{}, false } diff --git a/test/new-e2e/pkg/e2e/suite.go b/test/new-e2e/pkg/e2e/suite.go index e9963e0e8c9bd..e83a083f9d2be 100644 --- a/test/new-e2e/pkg/e2e/suite.go +++ b/test/new-e2e/pkg/e2e/suite.go @@ -375,7 +375,7 @@ func (bs *BaseSuite[Env]) createEnv() (*Env, []reflect.StructField, []reflect.Va importKeyFromTag := field.Tag.Get(importKey) isImportable := field.Type.Implements(reflect.TypeOf((*components.Importable)(nil)).Elem()) - isPtrImportable := reflect.PtrTo(field.Type).Implements(reflect.TypeOf((*components.Importable)(nil)).Elem()) + isPtrImportable := reflect.PointerTo(field.Type).Implements(reflect.TypeOf((*components.Importable)(nil)).Elem()) // Produce meaningful error in case we have an importKey but field is not importable if importKeyFromTag != "" && !isImportable { From 43e6b3515dd42ec6801b9a8f7145338082f4fd9f Mon Sep 17 00:00:00 2001 From: Olivier G Date: Thu, 14 Nov 2024 17:00:53 +0100 Subject: [PATCH 08/21] ast.Object is deprecated --- pkg/security/secl/compiler/generators/accessors/accessors.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/security/secl/compiler/generators/accessors/accessors.go b/pkg/security/secl/compiler/generators/accessors/accessors.go index f1cc6fe601060..0db4f61b867cd 100644 --- a/pkg/security/secl/compiler/generators/accessors/accessors.go +++ b/pkg/security/secl/compiler/generators/accessors/accessors.go @@ -57,7 +57,7 @@ type AstFiles struct { } // LookupSymbol lookups symbol -func (af *AstFiles) LookupSymbol(symbol string) *ast.Object { +func (af *AstFiles) LookupSymbol(symbol string) *ast.Object { //nolint:staticcheck for _, file := range af.files { if obj := file.Scope.Lookup(symbol); obj != nil { return obj From eac248bab48396ee53b21df61cb4b7a216265b1d Mon Sep 17 00:00:00 2001 From: Olivier G Date: Thu, 14 Nov 2024 17:32:45 +0100 Subject: [PATCH 09/21] run inv tidy --- internal/tools/go.mod | 1 - internal/tools/go.sum | 95 ++++++++++++++++--------------------------- 2 files changed, 34 insertions(+), 62 deletions(-) diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 7627075779f3f..f5efbc0e5175c 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -197,7 +197,6 @@ require ( 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.16 // indirect github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 4ccb676a47b98..4b0a10059ae41 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -46,21 +46,17 @@ github.com/Antonboom/errname v0.1.13 h1:JHICqsewj/fNckzrfVSe+T33svwQxmjC+1ntDsHO 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/Antonboom/testifylint v1.4.3 h1:ohMt6AHuHgttaQ1xb6SSnxCeK4/rnK7KKzbvs7DmEck= github.com/Antonboom/testifylint v1.4.3/go.mod h1:+8Q9+AOLsz5ZiQiiYujJKs9mNz398+M6UgslP4qgJLA= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -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/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs= github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/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/Crocmagnon/fatcontext v0.4.0 h1:4ykozu23YHA0JB6+thiuEv7iT6xq995qS1vcuWZq0tg= github.com/Crocmagnon/fatcontext v0.4.0/go.mod h1:ZtWrXkgyfsYPzS6K3O88va6t2GEglG93vnII/F94WC0= 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.2.0 h1:sATXp1x6/axKxz2Gjxv8MALP0bXaNRfQinEwyfMcx8c= -github.com/GaijinEntertainment/go-exhaustruct/v3 v3.2.0/go.mod h1:Nl76DrGNJTA1KJ0LePKBw/vznBX1EHbAZX8mwjR82nI= +github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 h1:/fTUt5vmbkAcMBt4YQiuC23cV0kEsN1MVMNqeOW43cU= github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0/go.mod h1:ONJg5sxcbsdQQ4pOW8TGdTidT2TMAUy/2Xhr8mrYaao= github.com/GoogleCloudPlatform/cloudsql-proxy v0.0.0-20190129172621-c8b1d7a94ddf/go.mod h1:aJ4qN3TfrelA6NZ6AXsXRfmEVaYin3EDbSPJrKS8OXo= github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0= @@ -114,8 +110,7 @@ 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/v4 v4.2.1 h1:Cxg6u+XDWff75SIFFmNsqnIOgob+Q9hG6y/ioKbRFiM= -github.com/bombsimon/wsl/v4 v4.2.1/go.mod h1:Xu/kDxGZTofQcDGCtQe9KCzhHphIe0fDuyWTxER9Feo= +github.com/bombsimon/wsl/v4 v4.4.1 h1:jfUaCkN+aUpobrMO24zwyAMwMAV5eSziCkOKEauOLdw= github.com/bombsimon/wsl/v4 v4.4.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= @@ -153,7 +148,6 @@ github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vc github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= 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/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo= @@ -199,8 +193,8 @@ github.com/firefart/nonamedreturns v1.0.5 h1:tM+Me2ZaXs8tfdDw3X6DOX++wMCOqzYUho6 github.com/firefart/nonamedreturns v1.0.5/go.mod h1:gHJjDqhGM4WyPt639SOZs+G89Ko7QKH5R5BhnO6xJhw= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= -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/frankban/quicktest v1.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= +github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= github.com/frapposelli/wwhrd v0.4.0 h1:Vn4hjT/tHNeOnTxFBO0ys1NBH8/Inxqqi1Q0eJmCImo= github.com/frapposelli/wwhrd v0.4.0/go.mod h1:Bzwvr3hY1yoBsBbIMkckeHUI6jf1cLRueaaMxZ3N9FY= github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU= @@ -238,8 +232,10 @@ 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.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI= +github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI= @@ -270,8 +266,7 @@ github.com/go-xmlfmt/xmlfmt v1.1.2/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6C github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= -github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E= github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= @@ -310,11 +305,8 @@ 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/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/gofmt v0.0.0-20240816233607-d8596aa466a9 h1:/1322Qns6BtQxUZDTAT4SdcoxknUki7IAoK4SAXr8ME= github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9/go.mod h1:Oesb/0uFAyWoaw1U1qS5zyjCg5NP9C9iwjnI4tIsXEE= -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/golangci-lint v1.60.3 h1:l38A5de24ZeDlcFF+EB7m3W5joPD99/hS5SIHJPyZa0= github.com/golangci/golangci-lint v1.60.3/go.mod h1:J4vOpcjzRI+lDL2DKNGBZVB3EQSBfCBCMpaydWLtJNo= github.com/golangci/misspell v0.6.0 h1:JCle2HUTNWirNlDIAUO44hUsKhOFqGPoC4LZxlaSXDs= @@ -361,8 +353,8 @@ 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-20240424215950-a892ee059fd6 h1:k7nVchz72niMH6YLQNvHSdIE7iqsQxK1P41mySCvssg= -github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6/go.mod h1:kf6iHlnVGwgKolg33glAes7Yg/8iWP8ukqeldJSO7jw= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 h1:FKHo8hFI3A+7w0aUQuYXQ+6EN5stWmeY/AZqtM8xk9k= +github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73Fdn/EKuT8nrFqBihUSKXoLYU0BuatOYo= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= @@ -419,8 +411,7 @@ 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/jjti/go-spancheck v0.6.2 h1:iYtoxqPMzHUPp7St+5yA8+cONdyXD3ug6KK15n7Pklk= github.com/jjti/go-spancheck v0.6.2/go.mod h1:+X7lvIrR5ZdUTkxFYqzJ0abr8Sb5LOo80uOhWNqIrYA= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -499,8 +490,7 @@ github.com/mattn/go-zglob v0.0.2-0.20191112051448-a8912a37f9e7 h1:6HgbBMgs3hI9y1 github.com/mattn/go-zglob v0.0.2-0.20191112051448-a8912a37f9e7/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo= 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/mgechev/revive v1.3.7 h1:502QY0vQGe9KtYJ9FpxMz9rL+Fc/P13CI5POL4uHCcE= -github.com/mgechev/revive v1.3.7/go.mod h1:RJ16jUbF0OWC3co/+XTxmFNgEpUPwnnA0BRllX2aDNA= +github.com/mgechev/revive v1.3.9 h1:18Y3R4a2USSBF+QZKFQwVkBROUda7uoBlkEuBD+YD1A= github.com/mgechev/revive v1.3.9/go.mod h1:+uxEIr5UH0TjXWHTno3xh4u7eg6jDpXKzQccA9UGhHU= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -513,8 +503,7 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.0.0-20151014174947-eeaced052adb h1:bsjNADsjHq0gjU7KO7zwoX5k3HtFdf6TDzB3ncl5iUs= github.com/montanaflynn/stats v0.0.0-20151014174947-eeaced052adb/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/moricho/tparallel v0.3.1 h1:fQKD4U1wRMAYNngDonW5XupoB/ZGJHdpzrWqgyg9krA= -github.com/moricho/tparallel v0.3.1/go.mod h1:leENX2cUv7Sv2qDgdi0D0fCftN8fRC67Bcn8pqzeYNI= +github.com/moricho/tparallel v0.3.2 h1:odr8aZVFA3NZrNybggMkYO3rgPRcqjeQUlBBFVxKHTI= github.com/moricho/tparallel v0.3.2/go.mod h1:OQ+K3b4Ln3l2TZveGCywybl68glfLEwFGqvnjok8b+U= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= @@ -531,10 +520,10 @@ github.com/nunnatsa/ginkgolinter v0.16.2 h1:8iLqHIZvN4fTLDC0Ke9tbSZVcyVHoBs0HIbn 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.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/onsi/ginkgo/v2 v2.20.0 h1:PE84V2mHqoT1sglvHc8ZdQtPcwmvvt29WLEEO3xmdZw= +github.com/onsi/ginkgo/v2 v2.20.0/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI= +github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k= +github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY= github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU= github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w= @@ -552,8 +541,7 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polyfloyd/go-errorlint v1.5.2 h1:SJhVik3Umsjh7mte1vE0fVZ5T1gznasQG3PV7U5xFdA= -github.com/polyfloyd/go-errorlint v1.5.2/go.mod h1:sH1QC1pxxi0fFecsVIzBmxtrgd9IF/SkJpA6wqyKAJs= +github.com/polyfloyd/go-errorlint v1.6.0 h1:tftWV9DE7txiFzPpztTAwyoRLKNj9gpVm2cg8/OwcYY= github.com/polyfloyd/go-errorlint v1.6.0/go.mod h1:HR7u8wuP1kb1NeN1zqTd1ZMlqUKPPHF+Id4vIPvDqVw= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g= github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U= @@ -599,8 +587,7 @@ github.com/rs/zerolog v1.29.0/go.mod h1:NILgTygv/Uej1ra5XxGf82ZFSLk58MFGAUS2o6us github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryancurrah/gomodguard v1.3.2 h1:CuG27ulzEB1Gu5Dk5gP8PFxSOZ3ptSdP5iI/3IXxM18= -github.com/ryancurrah/gomodguard v1.3.2/go.mod h1:LqdemiFomEjcxOqirbQCb3JFvSxH2JUYMerTFd3sF2o= +github.com/ryancurrah/gomodguard v1.3.3 h1:eiSQdJVNr9KTNxY2Niij8UReSwR8Xrte3exBrAZfqpg= github.com/ryancurrah/gomodguard v1.3.3/go.mod h1:rsKQjj4l3LXe8N344Ow7agAy5p9yjsWOtRzUMYmA0QY= github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU= github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ= @@ -610,11 +597,9 @@ github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6Ng 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.26.0 h1:LONR2hNVKxRmzIrZR0PhSF3mhCAzvnr+DcUiHgREfXE= -github.com/sashamelentyev/usestdlibvars v1.26.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8= +github.com/sashamelentyev/usestdlibvars v1.27.0 h1:t/3jZpSXtRPRf2xr0m63i32ZrusyurIGT9E5wAvXQnI= github.com/sashamelentyev/usestdlibvars v1.27.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/securego/gosec/v2 v2.20.1-0.20240822074752-ab3f6c1c83a0 h1:VqD4JMoqwuuCz8GZlBDsIDyE6K4YUsWJpbNtuOWHoFk= github.com/securego/gosec/v2 v2.20.1-0.20240822074752-ab3f6c1c83a0/go.mod h1:iyeMMRw8QEmueUSZ2VqmkQMiDyDcobfPnG00CV/NWdE= github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8= @@ -634,8 +619,7 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+Wwfd0XE= github.com/sivchari/containedctx v1.0.3/go.mod h1:c1RDvCbnJLtH4lLcYD/GqwiBSSf4F5Qk0xld2rBqzJ4= -github.com/sivchari/tenv v1.7.1 h1:PSpuD4bu6fSmtWMxSGWcvqUUgIn7k3yOJhOIzVWn8Ak= -github.com/sivchari/tenv v1.7.1/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= +github.com/sivchari/tenv v1.10.0 h1:g/hzMA+dBCKqGXgW8AV/1xIWhAvDrx0zFKNR48NFMg0= github.com/sivchari/tenv v1.10.0/go.mod h1:tdY24masnVoZFxYrHv/nD6Tc8FbkEtAQEEziXpyMgqY= github.com/skeema/knownhosts v1.2.2 h1:Iug2P4fLmDw9f41PB6thxUkNUkJzB5i+1/exaj40L3A= github.com/skeema/knownhosts v1.2.2/go.mod h1:xYbVRSPxqBZFrdmDyMmsOs+uX1UZC3nTN3ThzgDxUwo= @@ -647,8 +631,7 @@ 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= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -683,8 +666,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT 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= -github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c/go.mod h1:SbErYREK7xXdsRiigaQiQkI9McGRzYMvlKYaP3Nimdk= github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM= github.com/tdakkota/asciicheck v0.2.0/go.mod h1:Qb7Y9EgjCLJGup51gDHFzbI08/gbGhL/UVhYIPWG2rg= github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA= @@ -697,8 +678,7 @@ github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+n 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.3 h1:5ov+Cbhlgi7s/a42BprYoxsr73CbdMUTzE3bRDFASUs= -github.com/tomarrell/wrapcheck/v2 v2.8.3/go.mod h1:g9vNIyhb5/9TQgumxQyOEqDHsmGYcGsVMOx/xGkqdMo= +github.com/tomarrell/wrapcheck/v2 v2.9.0 h1:801U2YCAjLhdN8zhZ/7tdjB3EnAoRlJHt/s+9hijLQ4= github.com/tomarrell/wrapcheck/v2 v2.9.0/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= @@ -706,8 +686,7 @@ github.com/ultraware/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81v github.com/ultraware/funlen v0.1.0/go.mod h1:XJqmOQja6DpxarLj6Jj1U7JuoS8PvL4nEqDaQhy22p4= github.com/ultraware/whitespace v0.1.1 h1:bTPOGejYFulW3PkcrqkeQwOd6NKOOXvmGD9bo/Gk8VQ= github.com/ultraware/whitespace v0.1.1/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8= -github.com/uudashr/gocognit v1.1.2 h1:l6BAEKJqQH2UpKAPKdMfZf5kE4W/2xk8pfU1OVLvniI= -github.com/uudashr/gocognit v1.1.2/go.mod h1:aAVdLURqcanke8h3vg35BC++eseDm66Z7KmchI5et4k= +github.com/uudashr/gocognit v1.1.3 h1:l+a111VcDbKfynh+airAy/DJQKaXh2m9vkoysMPSZyM= github.com/uudashr/gocognit v1.1.3/go.mod h1:aKH8/e8xbTRBwjbCkwZ8qt4l2EpKXl31KMHgSS+lZ2U= github.com/vektra/mockery/v2 v2.40.1 h1:8D01rBqloDLDHKZGXkyUD9Yj5Z+oDXBqDZ+tRXYM/oA= github.com/vektra/mockery/v2 v2.40.1/go.mod h1:dPzGtjT0/Uu4hqpF6QNHwz+GLago7lq1bxdj9wHbGKo= @@ -737,8 +716,7 @@ 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-simpler.org/sloglint v0.7.2 h1:Wc9Em/Zeuu7JYpl+oKoYOsQSy2X560aVueCW/m6IijY= go-simpler.org/sloglint v0.7.2/go.mod h1:US+9C80ppl7VsThQclkM7BkCHQAzuz8kHLsW3ppuluo= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -947,7 +925,6 @@ golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1049,7 +1026,6 @@ golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA= golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k= @@ -1145,8 +1121,7 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= -google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg= google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1184,11 +1159,9 @@ 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.7 h1:9MDAWxMoSnB6QoSqiVr7P5mtkT9pOc1kSxchzPCnqJs= -honnef.co/go/tools v0.4.7/go.mod h1:+rnGS1THNh8zMwnd2oVOTL9QF6vmfyG6ZXBULae2uc0= +honnef.co/go/tools v0.5.1 h1:4bH5o3b5ZULQ4UrBmP+63W9r7qIkqJClEA9ko5YKx+I= honnef.co/go/tools v0.5.1/go.mod h1:e9irvo83WDG9/irijV44wr3tbhcFeRnfpVlRqVwpzMs= -mvdan.cc/gofumpt v0.6.0 h1:G3QvahNDmpD+Aek/bNOLrFR2XC6ZAdo62dZu65gmwGo= -mvdan.cc/gofumpt v0.6.0/go.mod h1:4L0wf+kgIPZtcCWXynNS2e6bhmj73umwnuXSZarixzA= +mvdan.cc/gofumpt v0.7.0 h1:bg91ttqXmi9y2xawvkuMXyvAA/1ZGJqYAEGjXuP0JXU= mvdan.cc/gofumpt v0.7.0/go.mod h1:txVFJy/Sc/mvaycET54pV8SW8gWxTlUuGHVEcncmNUo= mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f h1:lMpcwN6GxNbWtbpI1+xzFLSW8XzX0u72NttUGVFjO3U= mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f/go.mod h1:RSLa7mKKCNeTTMHBw5Hsy2rfJmd6O2ivt9Dw9ZqCQpQ= From db13a483c4fd81fb845906b225246a2d91d90d36 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Thu, 14 Nov 2024 18:00:54 +0100 Subject: [PATCH 10/21] Run inv -e go-deps.generate --- cmd/serverless/dependencies_linux_amd64.txt | 7 +++++-- cmd/serverless/dependencies_linux_arm64.txt | 8 ++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/cmd/serverless/dependencies_linux_amd64.txt b/cmd/serverless/dependencies_linux_amd64.txt index 7d7a4a8164e65..e759915d5f6e1 100644 --- a/cmd/serverless/dependencies_linux_amd64.txt +++ b/cmd/serverless/dependencies_linux_amd64.txt @@ -24,6 +24,8 @@ crypto/internal/boring/bbig crypto/internal/boring/sig crypto/internal/edwards25519 crypto/internal/edwards25519/field +crypto/internal/hpke +crypto/internal/mlkem768 crypto/internal/nistec crypto/internal/nistec/fiat crypto/internal/randutil @@ -1028,6 +1030,7 @@ html/template io io/fs io/ioutil +iter k8s.io/apimachinery/pkg/runtime/schema k8s.io/apimachinery/pkg/util/sets log @@ -1070,10 +1073,8 @@ regexp/syntax runtime runtime/cgo runtime/debug -runtime/internal/atomic runtime/internal/math runtime/internal/sys -runtime/internal/syscall runtime/metrics runtime/pprof runtime/trace @@ -1092,6 +1093,7 @@ time unicode unicode/utf16 unicode/utf8 +unique unsafe vendor/golang.org/x/crypto/chacha20 vendor/golang.org/x/crypto/chacha20poly1305 @@ -1100,6 +1102,7 @@ vendor/golang.org/x/crypto/cryptobyte/asn1 vendor/golang.org/x/crypto/hkdf vendor/golang.org/x/crypto/internal/alias vendor/golang.org/x/crypto/internal/poly1305 +vendor/golang.org/x/crypto/sha3 vendor/golang.org/x/net/dns/dnsmessage vendor/golang.org/x/net/http/httpguts vendor/golang.org/x/net/http/httpproxy diff --git a/cmd/serverless/dependencies_linux_arm64.txt b/cmd/serverless/dependencies_linux_arm64.txt index b430ede1ab554..a8f65ce9565fa 100644 --- a/cmd/serverless/dependencies_linux_arm64.txt +++ b/cmd/serverless/dependencies_linux_arm64.txt @@ -24,6 +24,8 @@ crypto/internal/boring/bbig crypto/internal/boring/sig crypto/internal/edwards25519 crypto/internal/edwards25519/field +crypto/internal/hpke +crypto/internal/mlkem768 crypto/internal/nistec crypto/internal/nistec/fiat crypto/internal/randutil @@ -1027,6 +1029,7 @@ html/template io io/fs io/ioutil +iter k8s.io/apimachinery/pkg/runtime/schema k8s.io/apimachinery/pkg/util/sets log @@ -1069,10 +1072,8 @@ regexp/syntax runtime runtime/cgo runtime/debug -runtime/internal/atomic runtime/internal/math runtime/internal/sys -runtime/internal/syscall runtime/metrics runtime/pprof runtime/trace @@ -1091,6 +1092,7 @@ time unicode unicode/utf16 unicode/utf8 +unique unsafe vendor/golang.org/x/crypto/chacha20 vendor/golang.org/x/crypto/chacha20poly1305 @@ -1099,11 +1101,13 @@ vendor/golang.org/x/crypto/cryptobyte/asn1 vendor/golang.org/x/crypto/hkdf vendor/golang.org/x/crypto/internal/alias vendor/golang.org/x/crypto/internal/poly1305 +vendor/golang.org/x/crypto/sha3 vendor/golang.org/x/net/dns/dnsmessage vendor/golang.org/x/net/http/httpguts vendor/golang.org/x/net/http/httpproxy vendor/golang.org/x/net/http2/hpack vendor/golang.org/x/net/idna +vendor/golang.org/x/sys/cpu vendor/golang.org/x/text/secure/bidirule vendor/golang.org/x/text/transform vendor/golang.org/x/text/unicode/bidi From 94dbcb7b6a95ff433e5eadab5fdf329fa3a10fa8 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Thu, 14 Nov 2024 18:03:08 +0100 Subject: [PATCH 11/21] SA4032: due to the file's build constraints, runtime.GOOS will never equal "darwin" --- .../admission/controllers/webhook/controller_v1_test.go | 4 ---- .../admission/controllers/webhook/controller_v1beta1_test.go | 4 ---- 2 files changed, 8 deletions(-) diff --git a/pkg/clusteragent/admission/controllers/webhook/controller_v1_test.go b/pkg/clusteragent/admission/controllers/webhook/controller_v1_test.go index 62ea3440551de..5743b6a4a5c52 100644 --- a/pkg/clusteragent/admission/controllers/webhook/controller_v1_test.go +++ b/pkg/clusteragent/admission/controllers/webhook/controller_v1_test.go @@ -10,7 +10,6 @@ package webhook import ( "context" "reflect" - "runtime" "testing" "time" @@ -97,9 +96,6 @@ func TestCreateWebhookV1(t *testing.T) { } func TestUpdateOutdatedWebhookV1(t *testing.T) { - if runtime.GOOS == "darwin" { - t.Skip("Skipping flaky test on macOS") - } f := newFixtureV1(t) data, err := certificate.GenerateSecretData(time.Now(), time.Now().Add(365*24*time.Hour), []string{"my.svc.dns"}) diff --git a/pkg/clusteragent/admission/controllers/webhook/controller_v1beta1_test.go b/pkg/clusteragent/admission/controllers/webhook/controller_v1beta1_test.go index f136568f3031f..b17eedfb489b9 100644 --- a/pkg/clusteragent/admission/controllers/webhook/controller_v1beta1_test.go +++ b/pkg/clusteragent/admission/controllers/webhook/controller_v1beta1_test.go @@ -10,7 +10,6 @@ package webhook import ( "context" "reflect" - "runtime" "testing" "time" @@ -92,9 +91,6 @@ func TestCreateWebhookV1beta1(t *testing.T) { } func TestUpdateOutdatedWebhookV1beta1(t *testing.T) { - if runtime.GOOS == "darwin" { - t.Skip("Skipping flaky test on macOS") - } f := newFixtureV1beta1(t) data, err := certificate.GenerateSecretData(time.Now(), time.Now().Add(365*24*time.Hour), []string{"my.svc.dns"}) From 78b8e887a6b357afb2b7aeb2e5c84fdc7fc32ebf Mon Sep 17 00:00:00 2001 From: Olivier G Date: Fri, 15 Nov 2024 15:50:07 +0100 Subject: [PATCH 12/21] Add missing argument. --- pkg/security/ebpf/compile_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/security/ebpf/compile_test.go b/pkg/security/ebpf/compile_test.go index 77fa4256da806..cd12d6f64223e 100644 --- a/pkg/security/ebpf/compile_test.go +++ b/pkg/security/ebpf/compile_test.go @@ -20,7 +20,7 @@ import ( func TestLoaderCompile(t *testing.T) { ebpftest.TestBuildMode(t, ebpftest.RuntimeCompiled, "", func(t *testing.T) { - _, err := sysconfig.New("") + _, err := sysconfig.New("", "") require.NoError(t, err) cfg, err := config.NewConfig() require.NoError(t, err) From 2b1aec8303e439bbd48a84a21671f7c65cb30311 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Wed, 20 Nov 2024 18:26:28 +0100 Subject: [PATCH 13/21] Gofmt on dump.go --- pkg/network/tracer/connection/dump.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/network/tracer/connection/dump.go b/pkg/network/tracer/connection/dump.go index a9a9b1aff1337..07261bc46f399 100644 --- a/pkg/network/tracer/connection/dump.go +++ b/pkg/network/tracer/connection/dump.go @@ -22,7 +22,6 @@ import ( "github.com/DataDog/datadog-agent/pkg/util/log" ) - func dumpMapsHandler(w io.Writer, _ *manager.Manager, mapName string, currentMap *ebpf.Map) { switch mapName { From 9862d7fe467ce7d656cd103b05e0b74137d72138 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Wed, 20 Nov 2024 18:32:53 +0100 Subject: [PATCH 14/21] Fix provide_comp_test --- pkg/util/fxutil/provide_comp_test.go | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/util/fxutil/provide_comp_test.go b/pkg/util/fxutil/provide_comp_test.go index 32055ce007a1b..0e3ad2bd272d8 100644 --- a/pkg/util/fxutil/provide_comp_test.go +++ b/pkg/util/fxutil/provide_comp_test.go @@ -66,10 +66,10 @@ func TestGetConstructorTypes(t *testing.T) { expect := `struct {}` require.Equal(t, expect, ctorTypes.inPlain.String()) - expect = `struct { In dig.In }` + expect = `struct { dig.In }` require.Equal(t, expect, ctorTypes.inFx.String()) - expect = `struct { Out dig.Out; FirstComp fxutil.FirstComp }` + expect = `struct { dig.Out; FirstComp fxutil.FirstComp }` require.Equal(t, expect, ctorTypes.outFx.String()) // constructor needs a `requires` struct and returns 1 component interface @@ -79,10 +79,10 @@ func TestGetConstructorTypes(t *testing.T) { expect = `struct { FirstComp fxutil.FirstComp }` require.Equal(t, expect, ctorTypes.inPlain.String()) - expect = `struct { In dig.In; FirstComp fxutil.FirstComp }` + expect = `struct { dig.In; FirstComp fxutil.FirstComp }` require.Equal(t, expect, ctorTypes.inFx.String()) - expect = `struct { Out dig.Out; SecondComp fxutil.SecondComp }` + expect = `struct { dig.Out; SecondComp fxutil.SecondComp }` require.Equal(t, expect, ctorTypes.outFx.String()) // constructor returns a struct that has 3 total components @@ -92,10 +92,10 @@ func TestGetConstructorTypes(t *testing.T) { expect = `struct {}` require.Equal(t, expect, ctorTypes.inPlain.String()) - expect = `struct { In dig.In }` + expect = `struct { dig.In }` require.Equal(t, expect, ctorTypes.inFx.String()) - expect = `struct { Out dig.Out; A fxutil.Apple; B fxutil.Banana; C struct { Out dig.Out; E fxutil.Egg } }` + expect = `struct { dig.Out; A fxutil.Apple; B fxutil.Banana; C struct { dig.Out; E fxutil.Egg } }` require.Equal(t, expect, ctorTypes.outFx.String()) // constructor needs a `requiresLc` struct and returns 1 component interface @@ -105,10 +105,10 @@ func TestGetConstructorTypes(t *testing.T) { expect = `fxutil.requiresLc` require.Equal(t, expect, ctorTypes.inPlain.String()) - expect = `struct { In dig.In; Lc compdef.Lifecycle }` + expect = `struct { dig.In; Lc compdef.Lifecycle }` require.Equal(t, expect, ctorTypes.inFx.String()) - expect = `struct { Out dig.Out; SecondComp fxutil.SecondComp }` + expect = `struct { dig.Out; SecondComp fxutil.SecondComp }` require.Equal(t, expect, ctorTypes.outFx.String()) } @@ -122,10 +122,10 @@ func TestConstructCompdefIn(t *testing.T) { })) require.NoError(t, err) - expect := `struct { In dig.In; Second fxutil.SecondComp }` + expect := `struct { dig.In; Second fxutil.SecondComp }` require.Equal(t, expect, ctorTypes.inFx.String()) - expect = `struct { Out dig.Out; First fxutil.FirstComp }` + expect = `struct { dig.Out; First fxutil.FirstComp }` require.Equal(t, expect, ctorTypes.outFx.String()) } @@ -142,10 +142,10 @@ func TestConstructCompdefOut(t *testing.T) { expect := `struct {}` require.Equal(t, expect, ctorTypes.inPlain.String()) - expect = `struct { In dig.In }` + expect = `struct { dig.In }` require.Equal(t, expect, ctorTypes.inFx.String()) - expect = `struct { Out dig.Out; First fxutil.FirstComp }` + expect = `struct { dig.Out; First fxutil.FirstComp }` require.Equal(t, expect, ctorTypes.outFx.String()) } From b2d38f9c68b83bf1d3933c49c0ffdc923ca80460 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Mon, 25 Nov 2024 18:29:13 +0100 Subject: [PATCH 15/21] SA4032: due to the file's build constraints, runtime.GOOS will never equal "windows" (staticcheck) --- pkg/security/tests/rule_filters_test.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/security/tests/rule_filters_test.go b/pkg/security/tests/rule_filters_test.go index 5a8b5e70b539f..0fe5187e1a183 100644 --- a/pkg/security/tests/rule_filters_test.go +++ b/pkg/security/tests/rule_filters_test.go @@ -55,11 +55,7 @@ func TestSECLRuleFilter(t *testing.T) { }, ) assert.NoError(t, err) - if runtime.GOOS == "windows" { - assert.False(t, result) - } else { - assert.True(t, result) - } + assert.True(t, result) }) for _, os := range []string{"windows", "linux"} { From e3fd90f0d8c685e803ac96f015e5e0eda67bc996 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Mon, 25 Nov 2024 18:38:19 +0100 Subject: [PATCH 16/21] Fix typos --- docs/dev/agent_dev_env.md | 2 +- docs/public/setup.md | 2 +- tasks/update_go.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/dev/agent_dev_env.md b/docs/dev/agent_dev_env.md index 674b1332202e0..d377808f09bf9 100644 --- a/docs/dev/agent_dev_env.md +++ b/docs/dev/agent_dev_env.md @@ -139,7 +139,7 @@ This procedure ensures you not only get the correct version of `invoke`, but als ### Golang You must [install Golang](https://golang.org/doc/install) version `1.23.3` or -higher. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` +later. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any additional tool it might need. **Please note that versions of Golang that aren't an exact match to the version diff --git a/docs/public/setup.md b/docs/public/setup.md index e42ff8e9885cc..e9ee454a1fa5e 100644 --- a/docs/public/setup.md +++ b/docs/public/setup.md @@ -101,7 +101,7 @@ This procedure ensures you not only get the correct version of `invoke`, but als ### Golang -You must [install Golang](https://golang.org/doc/install) version `1.23.3` or higher. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any additional tool it might need. +You must [install Golang](https://golang.org/doc/install) version `1.23.3` or later. Make sure that `$GOPATH/bin` is in your `$PATH` otherwise `invoke` cannot use any additional tool it might need. !!! note Versions of Golang that aren't an exact match to the version specified in our build images (see e.g. [here](https://github.com/DataDog/datadog-agent-buildimages/blob/c025473ee467ee6d884d532e4c12c7d982ce8fe1/circleci/Dockerfile#L43)) may not be able to build the agent and/or the [rtloader](https://github.com/DataDog/datadog-agent/tree/main/rtloader) binary properly. diff --git a/tasks/update_go.py b/tasks/update_go.py index a723653716559..8e2d638bbddd7 100644 --- a/tasks/update_go.py +++ b/tasks/update_go.py @@ -32,7 +32,7 @@ ("./cmd/process-agent/README.md", "`go >= ", "`", False), ("./pkg/logs/launchers/windowsevent/README.md", "install go ", "+,", False), ("./.wwhrd.yml", "raw.githubusercontent.com/golang/go/go", "/LICENSE", True), - ("./docs/public/setup.md", "version `", "` or higher", True), + ("./docs/public/setup.md", "version `", "` or later", True), ] PATTERN_MAJOR_MINOR = r'1\.\d+' From 52843033a41cea889941a767839d03631e095521 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Fri, 29 Nov 2024 10:52:00 +0100 Subject: [PATCH 17/21] Go mod tidy --- go.mod | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index e74571475f069..d235472589376 100644 --- a/go.mod +++ b/go.mod @@ -563,9 +563,9 @@ require ( go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.31.0 go.opentelemetry.io/otel/exporters/prometheus v0.54.0 // indirect - go.opentelemetry.io/otel/metric v1.32.0 + go.opentelemetry.io/otel/metric v1.32.0 // indirect go.opentelemetry.io/otel/sdk v1.32.0 - go.opentelemetry.io/otel/sdk/metric v1.32.0 + go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect go.opentelemetry.io/otel/trace v1.32.0 go.opentelemetry.io/proto/otlp v1.3.1 // indirect golang.org/x/crypto v0.29.0 // indirect @@ -616,10 +616,7 @@ require ( go.opentelemetry.io/collector/config/configtelemetry v0.114.0 ) -require ( - go.opentelemetry.io/collector/component/componenttest v0.114.0 - go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 -) +require go.opentelemetry.io/collector/component/componenttest v0.114.0 require ( go.opentelemetry.io/collector/extension/extensiontest v0.114.0 // indirect @@ -1028,6 +1025,7 @@ require ( go.opentelemetry.io/contrib/config v0.10.0 // indirect go.opentelemetry.io/contrib/zpages v0.56.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.7.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.32.0 // indirect go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.32.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutlog v0.7.0 // indirect go.opentelemetry.io/otel/exporters/stdout/stdoutmetric v1.32.0 // indirect From cf8428525444e0e9ef081cab1919c39abc39292a Mon Sep 17 00:00:00 2001 From: Olivier G Date: Tue, 3 Dec 2024 13:52:03 +0100 Subject: [PATCH 18/21] run inv generate-licenses --- LICENSE-3rdparty.csv | 161 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index 4d234625e0d52..d7078ec0f1b71 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -2996,6 +2996,7 @@ core,gopkg.in/warnings.v0,BSD-2-Clause,Copyright (c) 2016 Péter Surányi core,gopkg.in/yaml.v2,Apache-2.0,Copyright 2011-2016 Canonical Ltd core,gopkg.in/yaml.v3,MIT,Copyright (c) 2006-2010 Kirill Simonov | Copyright 2011-2016 Canonical Ltd core,gopkg.in/zorkian/go-datadog-api.v2,BSD-3-Clause,Copyright (c) 2013 by authors and contributors | Copyright 2013-2019 by authors and contributors +core,honnef.co/go/tools/analysis/callcheck,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/analysis/code,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/analysis/edit,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/analysis/facts/deprecated,MIT,Copyright (c) 2016 Dominik Honnef @@ -3028,13 +3029,173 @@ core,honnef.co/go/tools/lintcmd/version,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/pattern,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/printf,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/quickfix,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1001,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1002,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1003,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1004,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1005,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1006,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1007,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1008,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1009,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1010,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1011,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/quickfix/qf1012,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/sarif,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/simple,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1000,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1001,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1002,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1003,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1004,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1005,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1006,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1007,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1008,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1009,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1010,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1011,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1012,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1016,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1017,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1018,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1019,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1020,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1021,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1023,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1024,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1025,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1028,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1029,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1030,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1031,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1032,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1033,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1034,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1035,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1036,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1037,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1038,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1039,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/simple/s1040,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/staticcheck,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/staticcheck/fakejson,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/staticcheck/fakereflect,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/staticcheck/fakexml,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1000,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1001,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1002,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1003,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1004,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1005,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1006,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1007,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1008,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1010,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1011,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1012,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1013,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1014,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1015,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1016,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1017,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1018,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1019,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1020,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1021,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1023,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1024,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1025,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1026,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1027,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1028,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1029,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1030,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1031,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa1032,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa2000,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa2001,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa2002,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa2003,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa3000,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa3001,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4000,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4001,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4003,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4004,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4005,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4006,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4008,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4009,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4010,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4011,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4012,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4013,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4014,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4015,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4016,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4017,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4018,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4019,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4020,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4021,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4022,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4023,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4024,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4025,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4026,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4027,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4028,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4029,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4030,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4031,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa4032,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5000,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5001,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5002,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5003,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5004,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5005,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5007,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5008,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5009,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5010,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5011,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa5012,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa6000,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa6001,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa6002,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa6003,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa6005,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa6006,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa9001,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa9002,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa9003,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa9004,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa9005,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa9006,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa9007,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa9008,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/staticcheck/sa9009,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/stylecheck,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1000,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1001,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1003,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1005,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1006,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1008,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1011,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1012,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1013,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1015,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1016,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1017,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1018,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1019,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1020,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1021,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1022,MIT,Copyright (c) 2016 Dominik Honnef +core,honnef.co/go/tools/stylecheck/st1023,MIT,Copyright (c) 2016 Dominik Honnef core,honnef.co/go/tools/unused,MIT,Copyright (c) 2016 Dominik Honnef core,k8s.io/api/admission/v1,Apache-2.0,Copyright 2014 The Kubernetes Authors. core,k8s.io/api/admission/v1beta1,Apache-2.0,Copyright 2014 The Kubernetes Authors. From 2c6c36fd5604158fb37e822d3a03a201f66c9705 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Wed, 4 Dec 2024 10:05:49 +0100 Subject: [PATCH 19/21] Use latest image --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 88 ++++++++++++++++++++++---------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 947d882386d21..6f4316d031a52 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ experimental: templates: job_template: &job_template docker: - - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v48883349-6ba172ff + - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v50304588-1a30c934 environment: USE_SYSTEM_LIBS: "1" working_directory: /go/src/github.com/DataDog/datadog-agent diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4bdd975cde997..715eaa1bdeae8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -172,51 +172,51 @@ variables: # Build images versions # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only - DATADOG_AGENT_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_BUILDIMAGES: v48883349-6ba172ff - DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_WINBUILDIMAGES: v48883349-6ba172ff - DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_ARMBUILDIMAGES: v48883349-6ba172ff - DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v48883349-6ba172ff - DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "_test_only" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v48883349-6ba172ff + DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_BUILDIMAGES: v50304588-1a30c934 + DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_WINBUILDIMAGES: v50304588-1a30c934 + DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_ARMBUILDIMAGES: v50304588-1a30c934 + DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v50304588-1a30c934 + DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v50304588-1a30c934 # New images to enable different version per image - not used yet - CI_IMAGE_BTF_GEN: v48883349-6ba172ff - CI_IMAGE_BTF_GEN_SUFFIX: "_test_only" - CI_IMAGE_DEB_X64: v48883349-6ba172ff - CI_IMAGE_DEB_X64_SUFFIX: "_test_only" - CI_IMAGE_DEB_ARM64: v48883349-6ba172ff - CI_IMAGE_DEB_ARM64_SUFFIX: "_test_only" - CI_IMAGE_DEB_ARMHF: v48883349-6ba172ff - CI_IMAGE_DEB_ARMHF_SUFFIX: "_test_only" - CI_IMAGE_DD_AGENT_TESTING: v48883349-6ba172ff - CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "_test_only" - CI_IMAGE_DOCKER_X64: v48883349-6ba172ff - CI_IMAGE_DOCKER_X64_SUFFIX: "_test_only" - CI_IMAGE_DOCKER_ARM64: v48883349-6ba172ff - CI_IMAGE_DOCKER_ARM64_SUFFIX: "_test_only" - CI_IMAGE_GITLAB_AGENT_DEPLOY: v48883349-6ba172ff - CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "_test_only" - CI_IMAGE_LINUX_GLIBC_2_17_X64: v48883349-6ba172ff - CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "_test_only" - CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v48883349-6ba172ff - CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "_test_only" - CI_IMAGE_SYSTEM_PROBE_X64: v48883349-6ba172ff - CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "_test_only" - CI_IMAGE_SYSTEM_PROBE_ARM64: v48883349-6ba172ff - CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "_test_only" - CI_IMAGE_RPM_X64: v48883349-6ba172ff - CI_IMAGE_RPM_X64_SUFFIX: "_test_only" - CI_IMAGE_RPM_ARM64: v48883349-6ba172ff - CI_IMAGE_RPM_ARM64_SUFFIX: "_test_only" - CI_IMAGE_RPM_ARMHF: v48883349-6ba172ff - CI_IMAGE_RPM_ARMHF_SUFFIX: "_test_only" - CI_IMAGE_WIN_1809_X64: v48883349-6ba172ff - CI_IMAGE_WIN_1809_X64_SUFFIX: "_test_only" - CI_IMAGE_WIN_LTSC2022_X64: v48883349-6ba172ff - CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "_test_only" + CI_IMAGE_BTF_GEN: v50304588-1a30c934 + CI_IMAGE_BTF_GEN_SUFFIX: "" + CI_IMAGE_DEB_X64: v50304588-1a30c934 + CI_IMAGE_DEB_X64_SUFFIX: "" + CI_IMAGE_DEB_ARM64: v50304588-1a30c934 + CI_IMAGE_DEB_ARM64_SUFFIX: "" + CI_IMAGE_DEB_ARMHF: v50304588-1a30c934 + CI_IMAGE_DEB_ARMHF_SUFFIX: "" + CI_IMAGE_DD_AGENT_TESTING: v50304588-1a30c934 + CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "" + CI_IMAGE_DOCKER_X64: v50304588-1a30c934 + CI_IMAGE_DOCKER_X64_SUFFIX: "" + CI_IMAGE_DOCKER_ARM64: v50304588-1a30c934 + CI_IMAGE_DOCKER_ARM64_SUFFIX: "" + CI_IMAGE_GITLAB_AGENT_DEPLOY: v50304588-1a30c934 + CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "" + CI_IMAGE_LINUX_GLIBC_2_17_X64: v50304588-1a30c934 + CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "" + CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v50304588-1a30c934 + CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "" + CI_IMAGE_SYSTEM_PROBE_X64: v50304588-1a30c934 + CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "" + CI_IMAGE_SYSTEM_PROBE_ARM64: v50304588-1a30c934 + CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "" + CI_IMAGE_RPM_X64: v50304588-1a30c934 + CI_IMAGE_RPM_X64_SUFFIX: "" + CI_IMAGE_RPM_ARM64: v50304588-1a30c934 + CI_IMAGE_RPM_ARM64_SUFFIX: "" + CI_IMAGE_RPM_ARMHF: v50304588-1a30c934 + CI_IMAGE_RPM_ARMHF_SUFFIX: "" + CI_IMAGE_WIN_1809_X64: v50304588-1a30c934 + CI_IMAGE_WIN_1809_X64_SUFFIX: "" + CI_IMAGE_WIN_LTSC2022_X64: v50304588-1a30c934 + CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "" DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded DEB_GPG_KEY_ID: c0962c7d From 5cbbf2aa0e768ca86d0540e0584a2ef188e64f96 Mon Sep 17 00:00:00 2001 From: Olivier G Date: Wed, 4 Dec 2024 10:52:27 +0100 Subject: [PATCH 20/21] Use the correct build image tag --- .circleci/config.yml | 2 +- .gitlab-ci.yml | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6f4316d031a52..35bb11b593907 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ experimental: templates: job_template: &job_template docker: - - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v50304588-1a30c934 + - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v50263243-1a30c934 environment: USE_SYSTEM_LIBS: "1" working_directory: /go/src/github.com/DataDog/datadog-agent diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 715eaa1bdeae8..7437412fbfe46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -173,49 +173,49 @@ variables: # To use images from datadog-agent-buildimages dev branches, set the corresponding # SUFFIX variable to _test_only DATADOG_AGENT_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BUILDIMAGES: v50304588-1a30c934 + DATADOG_AGENT_BUILDIMAGES: v50263243-1a30c934 DATADOG_AGENT_WINBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_WINBUILDIMAGES: v50304588-1a30c934 + DATADOG_AGENT_WINBUILDIMAGES: v50263243-1a30c934 DATADOG_AGENT_ARMBUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_ARMBUILDIMAGES: v50304588-1a30c934 + DATADOG_AGENT_ARMBUILDIMAGES: v50263243-1a30c934 DATADOG_AGENT_SYSPROBE_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v50304588-1a30c934 + DATADOG_AGENT_SYSPROBE_BUILDIMAGES: v50263243-1a30c934 DATADOG_AGENT_BTF_GEN_BUILDIMAGES_SUFFIX: "" - DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v50304588-1a30c934 + DATADOG_AGENT_BTF_GEN_BUILDIMAGES: v50263243-1a30c934 # New images to enable different version per image - not used yet - CI_IMAGE_BTF_GEN: v50304588-1a30c934 + CI_IMAGE_BTF_GEN: v50263243-1a30c934 CI_IMAGE_BTF_GEN_SUFFIX: "" - CI_IMAGE_DEB_X64: v50304588-1a30c934 + CI_IMAGE_DEB_X64: v50263243-1a30c934 CI_IMAGE_DEB_X64_SUFFIX: "" - CI_IMAGE_DEB_ARM64: v50304588-1a30c934 + CI_IMAGE_DEB_ARM64: v50263243-1a30c934 CI_IMAGE_DEB_ARM64_SUFFIX: "" - CI_IMAGE_DEB_ARMHF: v50304588-1a30c934 + CI_IMAGE_DEB_ARMHF: v50263243-1a30c934 CI_IMAGE_DEB_ARMHF_SUFFIX: "" - CI_IMAGE_DD_AGENT_TESTING: v50304588-1a30c934 + CI_IMAGE_DD_AGENT_TESTING: v50263243-1a30c934 CI_IMAGE_DD_AGENT_TESTING_SUFFIX: "" - CI_IMAGE_DOCKER_X64: v50304588-1a30c934 + CI_IMAGE_DOCKER_X64: v50263243-1a30c934 CI_IMAGE_DOCKER_X64_SUFFIX: "" - CI_IMAGE_DOCKER_ARM64: v50304588-1a30c934 + CI_IMAGE_DOCKER_ARM64: v50263243-1a30c934 CI_IMAGE_DOCKER_ARM64_SUFFIX: "" - CI_IMAGE_GITLAB_AGENT_DEPLOY: v50304588-1a30c934 + CI_IMAGE_GITLAB_AGENT_DEPLOY: v50263243-1a30c934 CI_IMAGE_GITLAB_AGENT_DEPLOY_SUFFIX: "" - CI_IMAGE_LINUX_GLIBC_2_17_X64: v50304588-1a30c934 + CI_IMAGE_LINUX_GLIBC_2_17_X64: v50263243-1a30c934 CI_IMAGE_LINUX_GLIBC_2_17_X64_SUFFIX: "" - CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v50304588-1a30c934 + CI_IMAGE_LINUX_GLIBC_2_23_ARM64: v50263243-1a30c934 CI_IMAGE_LINUX_GLIBC_2_23_ARM64_SUFFIX: "" - CI_IMAGE_SYSTEM_PROBE_X64: v50304588-1a30c934 + CI_IMAGE_SYSTEM_PROBE_X64: v50263243-1a30c934 CI_IMAGE_SYSTEM_PROBE_X64_SUFFIX: "" - CI_IMAGE_SYSTEM_PROBE_ARM64: v50304588-1a30c934 + CI_IMAGE_SYSTEM_PROBE_ARM64: v50263243-1a30c934 CI_IMAGE_SYSTEM_PROBE_ARM64_SUFFIX: "" - CI_IMAGE_RPM_X64: v50304588-1a30c934 + CI_IMAGE_RPM_X64: v50263243-1a30c934 CI_IMAGE_RPM_X64_SUFFIX: "" - CI_IMAGE_RPM_ARM64: v50304588-1a30c934 + CI_IMAGE_RPM_ARM64: v50263243-1a30c934 CI_IMAGE_RPM_ARM64_SUFFIX: "" - CI_IMAGE_RPM_ARMHF: v50304588-1a30c934 + CI_IMAGE_RPM_ARMHF: v50263243-1a30c934 CI_IMAGE_RPM_ARMHF_SUFFIX: "" - CI_IMAGE_WIN_1809_X64: v50304588-1a30c934 + CI_IMAGE_WIN_1809_X64: v50263243-1a30c934 CI_IMAGE_WIN_1809_X64_SUFFIX: "" - CI_IMAGE_WIN_LTSC2022_X64: v50304588-1a30c934 + CI_IMAGE_WIN_LTSC2022_X64: v50263243-1a30c934 CI_IMAGE_WIN_LTSC2022_X64_SUFFIX: "" DATADOG_AGENT_EMBEDDED_PATH: /opt/datadog-agent/embedded From 0fde3718f14666573b9104c67ff02d2c00473d7f Mon Sep 17 00:00:00 2001 From: Olivier G Date: Wed, 4 Dec 2024 11:50:05 +0100 Subject: [PATCH 21/21] Fix circleci image --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 35bb11b593907..2ce2e610724c6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ experimental: templates: job_template: &job_template docker: - - image: gcr.io/datadoghq/agent-circleci-runner_test_only:v50263243-1a30c934 + - image: gcr.io/datadoghq/agent-circleci-runner:v50263243-1a30c934 environment: USE_SYSTEM_LIBS: "1" working_directory: /go/src/github.com/DataDog/datadog-agent