diff --git a/deps/go.MODULE.bazel b/deps/go.MODULE.bazel index e85d8beecc31..5eb76d32c695 100644 --- a/deps/go.MODULE.bazel +++ b/deps/go.MODULE.bazel @@ -107,7 +107,6 @@ use_repo( "com_github_acobaugh_osrelease", "com_github_alecthomas_participle", "com_github_alecthomas_units", - "com_github_alessio_shellescape", "com_github_aptly_dev_aptly", "com_github_aquasecurity_trivy", "com_github_aquasecurity_trivy_db", @@ -402,6 +401,7 @@ use_repo( "com_gitlab_gitlab_org_api_client_go", "com_google_cloud_go_compute", "com_google_cloud_go_compute_metadata", + "dev_essio_al_pkg_shellescape", "in_gopkg_ini_v1", "in_gopkg_yaml_v3", "in_gopkg_zorkian_go_datadog_api_v2", diff --git a/test/e2e-framework/components/command/BUILD.bazel b/test/e2e-framework/components/command/BUILD.bazel index 50899bf61a89..66cba24c40a7 100644 --- a/test/e2e-framework/components/command/BUILD.bazel +++ b/test/e2e-framework/components/command/BUILD.bazel @@ -17,10 +17,10 @@ go_library( "//test/e2e-framework/common/config", "//test/e2e-framework/common/namer", "//test/e2e-framework/common/utils", - "@com_github_alessio_shellescape//:shellescape", "@com_github_pulumi_pulumi_command_sdk//go/command/local", "@com_github_pulumi_pulumi_command_sdk//go/command/remote", "@com_github_pulumi_pulumi_sdk_v3//go/pulumi", + "@dev_essio_al_pkg_shellescape//:shellescape", ], ) diff --git a/test/e2e-framework/components/command/unixOSCommand.go b/test/e2e-framework/components/command/unixOSCommand.go index a3ee4d1d6d1a..b20d3d474e6d 100644 --- a/test/e2e-framework/components/command/unixOSCommand.go +++ b/test/e2e-framework/components/command/unixOSCommand.go @@ -12,7 +12,7 @@ import ( "github.com/DataDog/datadog-agent/test/e2e-framework/common/utils" - "github.com/alessio/shellescape" + "al.essio.dev/pkg/shellescape" "github.com/pulumi/pulumi-command/sdk/go/command/remote" "github.com/pulumi/pulumi/sdk/v3/go/pulumi" ) diff --git a/test/e2e-framework/go.mod b/test/e2e-framework/go.mod index 44ec2be645b1..6f066104b2b2 100644 --- a/test/e2e-framework/go.mod +++ b/test/e2e-framework/go.mod @@ -3,6 +3,7 @@ module github.com/DataDog/datadog-agent/test/e2e-framework go 1.26.0 require ( + al.essio.dev/pkg/shellescape v1.6.0 cloud.google.com/go/compute v1.64.0 dario.cat/mergo v1.0.2 github.com/DataDog/datadog-agent/pkg/util/option v0.76.0-rc.4 @@ -11,7 +12,6 @@ require ( github.com/DataDog/datadog-agent/test/fakeintake v0.56.0-rc.3 github.com/DataDog/datadog-api-client-go/v2 v2.60.0 github.com/Masterminds/semver/v3 v3.5.0 - github.com/alessio/shellescape v1.4.2 github.com/aws/aws-sdk-go-v2 v1.42.0 github.com/aws/aws-sdk-go-v2/config v1.32.25 github.com/aws/aws-sdk-go-v2/service/ec2 v1.307.0 diff --git a/test/e2e-framework/go.sum b/test/e2e-framework/go.sum index 46885be2c431..922b40d8702d 100644 --- a/test/e2e-framework/go.sum +++ b/test/e2e-framework/go.sum @@ -1,3 +1,5 @@ +al.essio.dev/pkg/shellescape v1.6.0 h1:NxFcEqzFSEVCGN2yq7Huv/9hyCEGVa/TncnOOBBeXHA= +al.essio.dev/pkg/shellescape v1.6.0/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890= cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE= cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU= cloud.google.com/go/auth v0.20.0 h1:kXTssoVb4azsVDoUiF8KvxAqrsQcQtB53DcSgta74CA= @@ -37,8 +39,6 @@ github.com/ProtonMail/go-crypto v1.4.1 h1:9RfcZHqEQUvP8RzecWEUafnZVtEvrBVL9BiF67 github.com/ProtonMail/go-crypto v1.4.1/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= -github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/apparentlymart/go-textseg/v15 v15.0.0 h1:uYvfpb3DyLSCGWnctWKGj857c6ew1u1fNQOlOtuGxQY= @@ -271,6 +271,8 @@ github.com/google/pprof v0.0.0-20260507013755-92041b743c96 h1:YDDnaZ9afWajDboPMt github.com/google/pprof v0.0.0-20260507013755-92041b743c96/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0= github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.15 h1:xolVQTEXusUcAA5UgtyRLjelpFFHWlPQ4XfWGc7MBas= diff --git a/test/new-e2e/go.mod b/test/new-e2e/go.mod index 6934b43d47ba..abc2551cd9c9 100644 --- a/test/new-e2e/go.mod +++ b/test/new-e2e/go.mod @@ -240,6 +240,7 @@ require ( ) require ( + al.essio.dev/pkg/shellescape v1.6.0 // indirect cloud.google.com/go/auth v0.20.0 // indirect cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect cloud.google.com/go/compute v1.64.0 // indirect @@ -281,7 +282,6 @@ require ( github.com/DataDog/go-tuf v1.1.1-0.5.2 // indirect github.com/DataDog/sketches-go v1.4.8 // indirect github.com/Masterminds/semver/v3 v3.5.0 // indirect - github.com/alessio/shellescape v1.4.2 // indirect github.com/antithesishq/antithesis-sdk-go v0.7.0 // indirect github.com/aws/aws-sdk-go v1.55.8 // indirect github.com/aws/aws-sdk-go-v2/service/ecr v1.58.4 // indirect diff --git a/test/new-e2e/go.sum b/test/new-e2e/go.sum index 10461ab7547e..66b56b8d25b0 100644 --- a/test/new-e2e/go.sum +++ b/test/new-e2e/go.sum @@ -1,3 +1,5 @@ +al.essio.dev/pkg/shellescape v1.6.0 h1:NxFcEqzFSEVCGN2yq7Huv/9hyCEGVa/TncnOOBBeXHA= +al.essio.dev/pkg/shellescape v1.6.0/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890= cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE= cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU= cloud.google.com/go/auth v0.20.0 h1:kXTssoVb4azsVDoUiF8KvxAqrsQcQtB53DcSgta74CA= @@ -56,8 +58,6 @@ github.com/ProtonMail/go-crypto v1.4.1 h1:9RfcZHqEQUvP8RzecWEUafnZVtEvrBVL9BiF67 github.com/ProtonMail/go-crypto v1.4.1/go.mod h1:e1OaTyu5SYVrO9gKOEhTc+5UcXtTUa+P3uLudwcgPqo= github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7lmo= github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= -github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0= -github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/antithesishq/antithesis-sdk-go v0.7.0 h1:uWDG8BqLD1lI2ps38WDz2vXflrTX2+vLX0SvZtztJtE= @@ -332,6 +332,8 @@ github.com/google/pprof v0.0.0-20260507013755-92041b743c96 h1:YDDnaZ9afWajDboPMt github.com/google/pprof v0.0.0-20260507013755-92041b743c96/go.mod h1:MxpfABSjhmINe3F1It9d+8exIHFvUqtLIRCdOGNXqiI= github.com/google/s2a-go v0.1.9 h1:LGD7gtMgezd8a/Xak7mEWL0PjoTQFvpRudN895yqKW0= github.com/google/s2a-go v0.1.9/go.mod h1:YA0Ei2ZQL3acow2O62kdp9UlnvMmU7kA6Eutn0dXayM= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= +github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/enterprise-certificate-proxy v0.3.15 h1:xolVQTEXusUcAA5UgtyRLjelpFFHWlPQ4XfWGc7MBas=