From 8cf9f9baca8c7a68c0494a0b0a42baab88bdfa33 Mon Sep 17 00:00:00 2001 From: Louis Coquerelle Date: Tue, 31 Dec 2024 11:10:21 +0100 Subject: [PATCH] Revert "Remove unneeded deps in go mod files" This reverts commit 28e12025156046eef5222d6b8c81ff449ddd07b6. --- internal/tools/modparser/testdata/match/go.mod | 4 ++++ internal/tools/modparser/testdata/nomatch/go.mod | 5 +++++ .../tools/modparser/testdata/patchgoversion/go.mod | 2 ++ .../tools/modparser/testdata/patchgoversion/go.sum | 2 ++ pkg/updater/service/helper/go.mod | 2 ++ pkg/updater/service/helper/go.sum | 2 ++ test/integration/serverless/recorder-extension/go.mod | 2 +- test/integration/serverless/recorder-extension/go.sum | 5 +++-- test/integration/serverless/src/go.sum | 10 +++++++--- tools/retry_file_dump/go.mod | 5 ++++- tools/retry_file_dump/go.sum | 2 ++ 11 files changed, 34 insertions(+), 7 deletions(-) diff --git a/internal/tools/modparser/testdata/match/go.mod b/internal/tools/modparser/testdata/match/go.mod index f5813559d4562..f6495967c0bca 100644 --- a/internal/tools/modparser/testdata/match/go.mod +++ b/internal/tools/modparser/testdata/match/go.mod @@ -1,3 +1,7 @@ module github.com/DataDog/datadog-agent/internal/tools/modparser/testdata/match go 1.18 + +require ( + github.com/DataDog/datadog-agent/pkg/test v0.65.3 +) diff --git a/internal/tools/modparser/testdata/nomatch/go.mod b/internal/tools/modparser/testdata/nomatch/go.mod index 70471733f814f..b61b339c37d60 100644 --- a/internal/tools/modparser/testdata/nomatch/go.mod +++ b/internal/tools/modparser/testdata/nomatch/go.mod @@ -1,3 +1,8 @@ module github.com/DataDog/datadog-agent/internal/tools/modparser/testdata/nomatch go 1.18 + +require ( + github.com/DataDog/datadog-not-agent/pkg/test v0.65.3 + not/github.com/DataDog/datadog-agent/pkg/test v0.65.3 +) diff --git a/internal/tools/modparser/testdata/patchgoversion/go.mod b/internal/tools/modparser/testdata/patchgoversion/go.mod index f98acb47ca61b..0e6045b288985 100644 --- a/internal/tools/modparser/testdata/patchgoversion/go.mod +++ b/internal/tools/modparser/testdata/patchgoversion/go.mod @@ -1,3 +1,5 @@ module github.com/DataDog/datadog-agent/internal/tools/modparser/testdata/patchgoversion go 1.21.8 + +require golang.org/x/crypto v0.31.0 // indirect diff --git a/internal/tools/modparser/testdata/patchgoversion/go.sum b/internal/tools/modparser/testdata/patchgoversion/go.sum index e69de29bb2d1d..96150059979a3 100644 --- a/internal/tools/modparser/testdata/patchgoversion/go.sum +++ b/internal/tools/modparser/testdata/patchgoversion/go.sum @@ -0,0 +1,2 @@ +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= diff --git a/pkg/updater/service/helper/go.mod b/pkg/updater/service/helper/go.mod index 281f85f1ebfa3..5f67e8b3cb4e6 100644 --- a/pkg/updater/service/helper/go.mod +++ b/pkg/updater/service/helper/go.mod @@ -1,3 +1,5 @@ module github.com/DataDog/datadog-agent/pkg/updater/service/helper go 1.21.7 + +require golang.org/x/crypto v0.31.0 // indirect diff --git a/pkg/updater/service/helper/go.sum b/pkg/updater/service/helper/go.sum index e69de29bb2d1d..96150059979a3 100644 --- a/pkg/updater/service/helper/go.sum +++ b/pkg/updater/service/helper/go.sum @@ -0,0 +1,2 @@ +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= diff --git a/test/integration/serverless/recorder-extension/go.mod b/test/integration/serverless/recorder-extension/go.mod index 4d9489ec39392..546bd3583538f 100644 --- a/test/integration/serverless/recorder-extension/go.mod +++ b/test/integration/serverless/recorder-extension/go.mod @@ -42,5 +42,5 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/philhofer/fwd v1.1.1 // indirect github.com/tinylib/msgp v1.1.6 // indirect - golang.org/x/net v0.21.0 // indirect + golang.org/x/crypto v0.31.0 // indirect ) diff --git a/test/integration/serverless/recorder-extension/go.sum b/test/integration/serverless/recorder-extension/go.sum index 65489d2e1ce55..b4c261561f97e 100644 --- a/test/integration/serverless/recorder-extension/go.sum +++ b/test/integration/serverless/recorder-extension/go.sum @@ -1246,6 +1246,8 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1349,9 +1351,8 @@ golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211111083644-e5c967477495 h1:cjxxlQm6d4kYbhpZ2ghvmI8xnq0AG+jXmzrhzfkyu5A= golang.org/x/net v0.0.0-20211111083644-e5c967477495/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= -golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190130055435-99b60b757ec1/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= diff --git a/test/integration/serverless/src/go.sum b/test/integration/serverless/src/go.sum index 73c04e40ce698..2c5a8259476a5 100644 --- a/test/integration/serverless/src/go.sum +++ b/test/integration/serverless/src/go.sum @@ -148,6 +148,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= @@ -162,7 +163,8 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= -golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -184,7 +186,8 @@ golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= +golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -195,7 +198,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= +golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/tools/retry_file_dump/go.mod b/tools/retry_file_dump/go.mod index b045551f60ceb..fd2a45f5264f7 100644 --- a/tools/retry_file_dump/go.mod +++ b/tools/retry_file_dump/go.mod @@ -9,4 +9,7 @@ go 1.21 require github.com/golang/protobuf v1.4.3 -require google.golang.org/protobuf v1.23.0 // indirect +require ( + golang.org/x/crypto v0.31.0 // indirect + google.golang.org/protobuf v1.23.0 // indirect +) diff --git a/tools/retry_file_dump/go.sum b/tools/retry_file_dump/go.sum index b0bf8852ca70c..c3762a2de5637 100644 --- a/tools/retry_file_dump/go.sum +++ b/tools/retry_file_dump/go.sum @@ -9,6 +9,8 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=