From 0c98c9c0254999cc19164b2ec949870c537725cf Mon Sep 17 00:00:00 2001 From: Kacper <89013263+kacper-murzyn@users.noreply.github.com> Date: Sun, 4 Jun 2023 16:09:52 +0200 Subject: [PATCH] Update release.json and Go modules for 6/7.46.0-rc.2 (#17452) --- go.mod | 20 ++++++++++---------- pkg/trace/go.mod | 12 ++++++------ pkg/util/cgroups/go.mod | 6 +++--- pkg/util/log/go.mod | 2 +- release.json | 10 +++++----- test/new-e2e/go.mod | 2 +- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index f418b5a3a64ed9..59caa3946e1dbe 100644 --- a/go.mod +++ b/go.mod @@ -44,15 +44,15 @@ require ( github.com/CycloneDX/cyclonedx-go v0.7.1 github.com/DataDog/agent-payload/v5 v5.0.85 github.com/DataDog/appsec-internal-go v0.0.0-20230215162203-5149228be86a - github.com/DataDog/datadog-agent/pkg/gohai v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/obfuscate v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/security/secl v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/trace v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.46.0-rc.1 + github.com/DataDog/datadog-agent/pkg/gohai v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/obfuscate v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/security/secl v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/trace v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.46.0-rc.2 github.com/DataDog/datadog-go/v5 v5.1.1 github.com/DataDog/datadog-operator v1.0.3 github.com/DataDog/ebpf-manager v0.2.8-0.20230331131947-0cbd4db2728c @@ -566,7 +566,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/proto v0.46.0-rc.1 + github.com/DataDog/datadog-agent/pkg/proto v0.46.0-rc.2 github.com/aquasecurity/trivy v0.0.0-00010101000000-000000000000 github.com/cloudfoundry-community/go-cfclient/v2 v2.0.1-0.20230503155151-3d15366c5820 github.com/godror/godror v0.37.0 diff --git a/pkg/trace/go.mod b/pkg/trace/go.mod index 5b663ad63c9d04..660355b89bd06b 100644 --- a/pkg/trace/go.mod +++ b/pkg/trace/go.mod @@ -10,12 +10,12 @@ go 1.18 replace github.com/docker/distribution => github.com/docker/distribution v2.8.1+incompatible require ( - github.com/DataDog/datadog-agent/pkg/obfuscate v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/cgroups v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/log v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.46.0-rc.1 + github.com/DataDog/datadog-agent/pkg/obfuscate v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/remoteconfig/state v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/cgroups v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/log v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.46.0-rc.2 github.com/DataDog/datadog-go/v5 v5.1.1 github.com/DataDog/opentelemetry-mapping-go/pkg/otlp/attributes v0.2.3 github.com/DataDog/sketches-go v1.4.2 diff --git a/pkg/util/cgroups/go.mod b/pkg/util/cgroups/go.mod index 2f2eda0be65814..e46316f6d2d8c9 100644 --- a/pkg/util/cgroups/go.mod +++ b/pkg/util/cgroups/go.mod @@ -9,8 +9,8 @@ replace ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/log v0.46.0-rc.1 - github.com/DataDog/datadog-agent/pkg/util/pointer v0.46.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/log v0.46.0-rc.2 + github.com/DataDog/datadog-agent/pkg/util/pointer v0.46.0-rc.2 github.com/containerd/cgroups v1.0.4 github.com/google/go-cmp v0.5.8 github.com/karrick/godirwalk v1.17.0 @@ -18,7 +18,7 @@ require ( ) require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.46.0-rc.1 // indirect + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.46.0-rc.2 // indirect github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/pkg/util/log/go.mod b/pkg/util/log/go.mod index f9b7460ba1a183..c3a794c44518c3 100644 --- a/pkg/util/log/go.mod +++ b/pkg/util/log/go.mod @@ -5,7 +5,7 @@ go 1.18 replace github.com/DataDog/datadog-agent/pkg/util/scrubber => ../scrubber require ( - github.com/DataDog/datadog-agent/pkg/util/scrubber v0.46.0-rc.1 + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.46.0-rc.2 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/stretchr/testify v1.8.1 go.uber.org/zap v1.22.0 diff --git a/release.json b/release.json index ca899810012af2..28983fc66f3f73 100644 --- a/release.json +++ b/release.json @@ -29,8 +29,8 @@ "SECURITY_AGENT_POLICIES_VERSION": "master" }, "release-a6": { - "INTEGRATIONS_CORE_VERSION": "7.46.0-rc.1", - "OMNIBUS_SOFTWARE_VERSION": "7.46.0-rc.1", + "INTEGRATIONS_CORE_VERSION": "7.46.0-rc.2", + "OMNIBUS_SOFTWARE_VERSION": "7.46.0-rc.2", "OMNIBUS_RUBY_VERSION": "7.46.0-rc.1", "JMXFETCH_VERSION": "0.47.9", "JMXFETCH_HASH": "fb5c3fc2fb42db1ee5c3a7c6187b316d79d69c50b967db0b7ffde590622d0395", @@ -41,8 +41,8 @@ "WINDOWS_DDNPM_SHASUM": "f12af44306eac3ea15828fd12c24d44ae519692a94a0f1f5d4fa868c3e596b07" }, "release-a7": { - "INTEGRATIONS_CORE_VERSION": "7.46.0-rc.1", - "OMNIBUS_SOFTWARE_VERSION": "7.46.0-rc.1", + "INTEGRATIONS_CORE_VERSION": "7.46.0-rc.2", + "OMNIBUS_SOFTWARE_VERSION": "7.46.0-rc.2", "OMNIBUS_RUBY_VERSION": "7.46.0-rc.1", "JMXFETCH_VERSION": "0.47.9", "JMXFETCH_HASH": "fb5c3fc2fb42db1ee5c3a7c6187b316d79d69c50b967db0b7ffde590622d0395", @@ -82,4 +82,4 @@ "dca-1.9.0": { "SECURITY_AGENT_POLICIES_VERSION": "v0.3" } -} +} \ No newline at end of file diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 2d4c958cf670ff..8e9acf84613075 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -9,7 +9,7 @@ go 1.18 replace github.com/DataDog/datadog-agent/test/fakeintake => ../fakeintake require ( - github.com/DataDog/datadog-agent/test/fakeintake v0.46.0-rc.1 + github.com/DataDog/datadog-agent/test/fakeintake v0.46.0-rc.2 github.com/DataDog/test-infra-definitions v0.0.0-20230526143644-ed785d3a20d5 github.com/aws/aws-sdk-go-v2 v1.18.0 github.com/aws/aws-sdk-go-v2/config v1.18.25