diff --git a/go.mod b/go.mod index d4bce3cb59a0b..f7a6e0e8fbc6c 100644 --- a/go.mod +++ b/go.mod @@ -24,6 +24,7 @@ replace ( ) replace ( + github.com/DataDog/datadog-agent/pkg/autodiscovery/common/types => ./pkg/autodiscovery/common/types github.com/DataDog/datadog-agent/pkg/errors => ./pkg/errors github.com/DataDog/datadog-agent/pkg/gohai => ./pkg/gohai github.com/DataDog/datadog-agent/pkg/networkdevice/profile => ./pkg/networkdevice/profile @@ -565,6 +566,7 @@ require github.com/lorenzosaino/go-sysctl v0.3.1 require ( github.com/DATA-DOG/go-sqlmock v1.5.0 github.com/DataDog/agent-payload/v5 v5.0.97 + github.com/DataDog/datadog-agent/pkg/autodiscovery/common/types v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/errors v0.0.0-00010101000000-000000000000 github.com/DataDog/datadog-agent/pkg/networkdevice/profile v0.49.0-rc.2 github.com/DataDog/datadog-agent/pkg/proto v0.49.0-rc.2 diff --git a/pkg/autodiscovery/common/types/go.mod b/pkg/autodiscovery/common/types/go.mod new file mode 100644 index 0000000000000..cf804136329dd --- /dev/null +++ b/pkg/autodiscovery/common/types/go.mod @@ -0,0 +1,22 @@ +module github.com/DataDog/datadog-agent/pkg/autodiscovery/common/types + +go 1.20 + +replace ( + github.com/DataDog/datadog-agent/pkg/util/log => ../../../util/log/ + github.com/DataDog/datadog-agent/pkg/util/scrubber => ../../../util/scrubber/ +) + +require ( + github.com/DataDog/datadog-agent/pkg/util/log v0.0.0-00010101000000-000000000000 + github.com/stretchr/testify v1.8.4 +) + +require ( + github.com/DataDog/datadog-agent/pkg/util/scrubber v0.49.0-rc.2 // indirect + github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/pkg/autodiscovery/common/types/go.sum b/pkg/autodiscovery/common/types/go.sum new file mode 100644 index 0000000000000..17ed8eaff9cbd --- /dev/null +++ b/pkg/autodiscovery/common/types/go.sum @@ -0,0 +1,14 @@ +github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 h1:kHaBemcxl8o/pQ5VM1c8PVE1PubbNx3mjUr09OqWGCs= +github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575/go.mod h1:9d6lWj8KzO/fd/NrVaLscBKmPigpZpn5YawRPw+e3Yo= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= +github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/tasks/modules.py b/tasks/modules.py index f0251ed8e8542..4196dec789f31 100644 --- a/tasks/modules.py +++ b/tasks/modules.py @@ -147,6 +147,7 @@ def dependency_path(self, agent_version): lint_targets=["."], ), "test/fakeintake": GoModule("test/fakeintake", independent=True), + "pkg/autodiscovery/common/types": GoModule("pkg/autodiscovery/common/types", independent=True), "pkg/errors": GoModule("pkg/errors", independent=True), "pkg/obfuscate": GoModule("pkg/obfuscate", independent=True), "pkg/gohai": GoModule("pkg/gohai", independent=True, importable=False),