From c21cafd2c343a6779e10b512b68104710af67f8b Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 22 Feb 2022 22:50:43 -0500 Subject: [PATCH] [7.17](backport #30462) Update docker/distribution to 2.8.0 (#30538) * Update docker/distribution to 2.8.0 (#30462) (cherry picked from commit d699e19fd3326e064c99b804ebabaea36344e76e) Co-authored-by: Pier-Hugues Pellerin --- CHANGELOG.next.asciidoc | 4 ++++ NOTICE.txt | 4 ++-- go.mod | 2 +- go.sum | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 525e6b90c64..e6eb96162d8 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -34,6 +34,10 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d *Affecting all Beats* - Fix mixup of TLS validation on multiple hosts configuration {pull}30305[30305] +- Fix field names with `add_network_direction` processor. {issue}29747[29747] {pull}29751[29751] +- Fix a logging bug when `ssl.verification_mode` was set to `full` or `certificate`, the command `test output` incorrectly logged that TLS was disabled. +- Fix the ability for subcommands to be ran properly from the beats containers. {pull}30452[30452] +- Update docker/distribution dependency library to fix a security issues concerning OCI Manifest Type Confusion Issue. {pull}30462[30462] *Auditbeat* diff --git a/NOTICE.txt b/NOTICE.txt index e402d911d5f..cd19d074441 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -24075,11 +24075,11 @@ SOFTWARE. -------------------------------------------------------------------------------- Dependency : github.com/docker/distribution -Version: v2.7.1+incompatible +Version: v2.8.0+incompatible Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/docker/distribution@v2.7.1+incompatible/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/docker/distribution@v2.8.0+incompatible/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 0589e817ea5..a46ee53ea85 100644 --- a/go.mod +++ b/go.mod @@ -217,7 +217,7 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/dgraph-io/ristretto v0.1.0 // indirect github.com/dimchansky/utfbom v1.1.0 // indirect - github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/distribution v2.8.0+incompatible // indirect github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect github.com/eapache/queue v1.1.0 // indirect github.com/evanphx/json-patch v4.9.0+incompatible // indirect diff --git a/go.sum b/go.sum index 0590203214b..ec73ee4beea 100644 --- a/go.sum +++ b/go.sum @@ -396,8 +396,9 @@ github.com/dlclark/regexp2 v1.1.7-0.20171009020623-7632a260cbaf/go.mod h1:2pZnwu github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.0+incompatible h1:l9EaZDICImO1ngI+uTifW+ZYvvz7fKISBAKpg+MbWbY= +github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/engine v0.0.0-20191113042239-ea84732a7725 h1:j0zqmciWFnhB01BT/CyfoXNEONoxerGjkcxM8i6tlXI= github.com/docker/engine v0.0.0-20191113042239-ea84732a7725/go.mod h1:3CPr2caMgTHxxIAZgEMd3uLYPDlRvPqCpyeRf6ncPcY= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=