Skip to content

Commit

Permalink
Use UnmarshalKey in more callsites (DataDog#31148)
Browse files Browse the repository at this point in the history 
Co-authored-by: hush-hush <maxime.mouial@gmail.com>
  • Loading branch information
@dustmop @hush-hush
dustmop and hush-hush authored Nov 22, 2024
1 parent c6c5df5 commit d7c786b
Show file tree
Hide file tree
Showing 40 changed files with 604 additions and 551 deletions.
34 changes: 18 additions & 16 deletions comp/api/authtoken/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ replace (
github.com/DataDog/datadog-agent/pkg/config/model => ../../../pkg/config/model
github.com/DataDog/datadog-agent/pkg/config/nodetreemodel => ../../../pkg/config/nodetreemodel
github.com/DataDog/datadog-agent/pkg/config/setup => ../../../pkg/config/setup
github.com/DataDog/datadog-agent/pkg/config/structure => ../../../pkg/config/structure
github.com/DataDog/datadog-agent/pkg/config/teeconfig => ../../../pkg/config/teeconfig
github.com/DataDog/datadog-agent/pkg/config/utils => ../../../pkg/config/utils
github.com/DataDog/datadog-agent/pkg/util/defaultpaths => ../../../pkg/util/defaultpaths
Expand All @@ -45,34 +46,35 @@ require (
github.com/DataDog/datadog-agent/comp/core/log/mock v0.58.0-devel
github.com/DataDog/datadog-agent/pkg/api v0.56.0
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0
github.com/DataDog/datadog-agent/pkg/util/optional v0.57.1
github.com/DataDog/datadog-agent/pkg/util/optional v0.59.0
github.com/stretchr/testify v1.9.0
go.uber.org/fx v1.22.2
)

require (
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.57.1 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.59.0 // indirect
github.com/DataDog/datadog-agent/comp/def v0.56.0 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/config/env v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/config/mock v0.58.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/config/model v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/env v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/mock v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/model v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.60.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/config/setup v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/config/setup v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/structure v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.60.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/log/setup v0.58.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/version v0.56.0 // indirect
github.com/DataDog/viper v1.13.5 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
Expand Down
34 changes: 18 additions & 16 deletions comp/forwarder/defaultforwarder/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ replace (
github.com/DataDog/datadog-agent/pkg/config/model => ../../../pkg/config/model
github.com/DataDog/datadog-agent/pkg/config/nodetreemodel => ../../../pkg/config/nodetreemodel
github.com/DataDog/datadog-agent/pkg/config/setup => ../../../pkg/config/setup
github.com/DataDog/datadog-agent/pkg/config/structure => ../../../pkg/config/structure
github.com/DataDog/datadog-agent/pkg/config/teeconfig => ../../../pkg/config/teeconfig
github.com/DataDog/datadog-agent/pkg/config/utils => ../../../pkg/config/utils
github.com/DataDog/datadog-agent/pkg/obfuscate => ../../../pkg/obfuscate
Expand Down Expand Up @@ -57,20 +58,20 @@ require (
github.com/DataDog/datadog-agent/comp/core/log/mock v0.0.0-00010101000000-000000000000
github.com/DataDog/datadog-agent/comp/core/status v0.56.0-rc.3
github.com/DataDog/datadog-agent/pkg/api v0.57.1
github.com/DataDog/datadog-agent/pkg/config/mock v0.58.0-devel
github.com/DataDog/datadog-agent/pkg/config/model v0.57.1
github.com/DataDog/datadog-agent/pkg/config/setup v0.57.1
github.com/DataDog/datadog-agent/pkg/config/mock v0.59.0
github.com/DataDog/datadog-agent/pkg/config/model v0.59.0
github.com/DataDog/datadog-agent/pkg/config/setup v0.59.0
github.com/DataDog/datadog-agent/pkg/config/utils v0.57.1
github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.56.0-rc.3
github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.3
github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.3
github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.3
github.com/DataDog/datadog-agent/pkg/util/common v0.56.0-rc.3
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.57.1
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.59.0
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.57.1
github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.3
github.com/DataDog/datadog-agent/pkg/util/optional v0.57.1
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.57.1
github.com/DataDog/datadog-agent/pkg/util/optional v0.59.0
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.59.0
github.com/DataDog/datadog-agent/pkg/version v0.57.1
github.com/golang/protobuf v1.5.3
github.com/hashicorp/go-multierror v1.1.1
Expand All @@ -83,21 +84,22 @@ require (
require (
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.57.1 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/types v0.57.1 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.57.1 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.59.0 // indirect
github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/comp/def v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/config/env v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/env v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.60.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/config/structure v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.60.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/log/setup v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.59.0 // indirect
github.com/DataDog/viper v1.13.5 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
Expand Down
34 changes: 18 additions & 16 deletions comp/forwarder/orchestrator/orchestratorinterface/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ replace (
github.com/DataDog/datadog-agent/pkg/config/model => ../../../../pkg/config/model
github.com/DataDog/datadog-agent/pkg/config/nodetreemodel => ../../../../pkg/config/nodetreemodel
github.com/DataDog/datadog-agent/pkg/config/setup => ../../../../pkg/config/setup
github.com/DataDog/datadog-agent/pkg/config/structure => ../../../../pkg/config/structure
github.com/DataDog/datadog-agent/pkg/config/teeconfig => ../../../../pkg/config/teeconfig
github.com/DataDog/datadog-agent/pkg/config/utils => ../../../../pkg/config/utils
github.com/DataDog/datadog-agent/pkg/obfuscate => ../../../../pkg/obfuscate
Expand Down Expand Up @@ -69,36 +70,37 @@ require (
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.57.1 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/types v0.57.1 // indirect
github.com/DataDog/datadog-agent/comp/core/log/def v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.57.1 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.59.0 // indirect
github.com/DataDog/datadog-agent/comp/core/status v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/comp/core/telemetry v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/comp/def v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/api v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/config/env v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/config/mock v0.58.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/config/model v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/env v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/mock v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/model v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.60.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/config/setup v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/config/setup v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/structure v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.60.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/config/utils v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/orchestrator/model v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/status/health v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/telemetry v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/backoff v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/common v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/http v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/optional v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/log v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/optional v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/pointer v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/version v0.57.1 // indirect
github.com/DataDog/viper v1.13.5 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
Expand Down
38 changes: 19 additions & 19 deletions comp/logs/agent/config/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ replace (

require (
github.com/DataDog/datadog-agent/comp/core/config v0.56.0-rc.3
github.com/DataDog/datadog-agent/pkg/config/model v0.57.0
github.com/DataDog/datadog-agent/pkg/config/setup v0.57.0
github.com/DataDog/datadog-agent/pkg/config/structure v0.0.0-00010101000000-000000000000
github.com/DataDog/datadog-agent/pkg/config/model v0.59.0
github.com/DataDog/datadog-agent/pkg/config/setup v0.59.0
github.com/DataDog/datadog-agent/pkg/config/structure v0.59.0
github.com/DataDog/datadog-agent/pkg/config/utils v0.56.0-rc.3
github.com/DataDog/datadog-agent/pkg/util/fxutil v0.56.0-rc.3
github.com/DataDog/datadog-agent/pkg/util/log v0.57.1
github.com/DataDog/datadog-agent/pkg/util/pointer v0.57.0
github.com/DataDog/datadog-agent/pkg/util/log v0.59.0
github.com/DataDog/datadog-agent/pkg/util/pointer v0.59.0
github.com/DataDog/viper v1.13.5
github.com/stretchr/testify v1.9.0
go.uber.org/fx v1.22.2
Expand All @@ -53,21 +53,21 @@ require (
require (
github.com/DataDog/datadog-agent/comp/core/flare/builder v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/comp/core/flare/types v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.57.0 // indirect
github.com/DataDog/datadog-agent/comp/core/secrets v0.59.0 // indirect
github.com/DataDog/datadog-agent/comp/def v0.56.0-rc.3 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.57.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/env v0.57.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/mock v0.58.0-devel // indirect
github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.0.0-00010101000000-000000000000 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.57.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.57.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/optional v0.57.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.57.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.57.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.57.1 // indirect
github.com/DataDog/datadog-agent/pkg/collector/check/defaults v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/env v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/mock v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/nodetreemodel v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/config/teeconfig v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/executable v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/filesystem v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/hostname/validate v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/optional v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/scrubber v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/system v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/system/socket v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/util/winutil v0.59.0 // indirect
github.com/DataDog/datadog-agent/pkg/version v0.56.0-rc.3 // indirect
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect
Expand Down
Loading

0 comments on commit d7c786b

Please sign in to comment.