From fdf83e1f65af5e9e1769c366f90d8d4335d0ee02 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Tue, 30 Jan 2024 12:38:16 -0500 Subject: [PATCH] [updatecli] Update to elastic/beats@9f58fef62910 (#12500) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update to elastic/beats@685be2f7fd2b Made with ❤️️ by updatecli * chore: Update to elastic/beats@d4d2ddce3230 Made with ❤️️ by updatecli * chore: Update to elastic/beats@0dc012db7247 Made with ❤️️ by updatecli * chore: Update to elastic/beats@c5e79a25d05d Made with ❤️️ by updatecli * chore: Update to elastic/beats@6d3239a599f7 Made with ❤️️ by updatecli * fix: update client auth setting for lib breaking changes * chore: Update to elastic/beats@9f58fef62910 Made with ❤️️ by updatecli --------- Co-authored-by: apmmachine Co-authored-by: kruskall <99559985+kruskall@users.noreply.github.com> --- NOTICE.txt | 16 ++++++++-------- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- internal/beater/config/config_test.go | 19 ++++++++++++------- 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 13d645b0423..7d458f47f76 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -573,11 +573,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/apm-data@v0.1.1 -------------------------------------------------------------------------------- Dependency : github.com/elastic/beats/v7 -Version: v7.0.0-alpha2.0.20240124140239-90228e66040f +Version: v7.0.0-alpha2.0.20240130132105-9f58fef62910 Licence type (autodetected): Elastic -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240124140239-90228e66040f/LICENSE.txt: +Contents of probable licence file $GOMODCACHE/github.com/elastic/beats/v7@v7.0.0-alpha2.0.20240130132105-9f58fef62910/LICENSE.txt: Source code in this repository is variously licensed under the Apache License Version 2.0, an Apache compatible license, or the Elastic License. Outside of @@ -829,11 +829,11 @@ SOFTWARE -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-agent-libs -Version: v0.7.3 +Version: v0.7.5 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.7.3/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-agent-libs@v0.7.5/LICENSE: Apache License Version 2.0, January 2004 @@ -1673,11 +1673,11 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-docappender@ -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-elasticsearch/v8 -Version: v8.11.1 +Version: v8.12.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.11.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-elasticsearch/v8@v8.12.0/LICENSE: Apache License Version 2.0, January 2004 @@ -9290,11 +9290,11 @@ these terms. -------------------------------------------------------------------------------- Dependency : github.com/elastic/elastic-transport-go/v8 -Version: v8.3.0 +Version: v8.4.0 Licence type (autodetected): Apache-2.0 -------------------------------------------------------------------------------- -Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/v8@v8.3.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/elastic/elastic-transport-go/v8@v8.4.0/LICENSE: Apache License Version 2.0, January 2004 diff --git a/go.mod b/go.mod index 7b941534954..2b9f654a467 100644 --- a/go.mod +++ b/go.mod @@ -10,13 +10,13 @@ require ( github.com/dustin/go-humanize v1.0.1 github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c - github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240124140239-90228e66040f + github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240130132105-9f58fef62910 github.com/elastic/elastic-agent-client/v7 v7.6.0 - github.com/elastic/elastic-agent-libs v0.7.3 + github.com/elastic/elastic-agent-libs v0.7.5 github.com/elastic/elastic-agent-system-metrics v0.9.1 github.com/elastic/gmux v0.3.1 github.com/elastic/go-docappender v0.2.1-0.20231207080152-44217001fa53 - github.com/elastic/go-elasticsearch/v8 v8.11.1 + github.com/elastic/go-elasticsearch/v8 v8.12.0 github.com/elastic/go-sysinfo v1.11.2 github.com/elastic/go-ucfg v0.8.6 github.com/go-sourcemap/sourcemap v2.1.3+incompatible @@ -89,7 +89,7 @@ require ( github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect github.com/eapache/queue v1.1.0 // indirect github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 // indirect - github.com/elastic/elastic-transport-go/v8 v8.3.0 // indirect + github.com/elastic/elastic-transport-go/v8 v8.4.0 // indirect github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f // indirect github.com/elastic/go-structform v0.0.10 // indirect github.com/elastic/go-windows v1.0.1 // indirect diff --git a/go.sum b/go.sum index 6173133af17..049826ab89e 100644 --- a/go.sum +++ b/go.sum @@ -134,26 +134,26 @@ github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6 h1:Js+C3HE github.com/elastic/apm-aggregation v0.0.0-20230815024520-e75a37d9ddd6/go.mod h1:ba3gaJCuhxXN/O5AuiI56xxd6DukQdVOK0NfpzBntNo= github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c h1:R9OfYHW0qCEFJ/bh9Tj/+j4x7o8lnW7yXQNHlvuXjJ0= github.com/elastic/apm-data v0.1.1-0.20240128144153-31b0cd2b927c/go.mod h1:z4iJVl8vyQa5v5o7UapWGHTsycBKsKfJfILuf2TZpYo= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240124140239-90228e66040f h1:WdivpZ1lhWJoVPIAa8jutj4rEw9cDJrgxtq0KQkfpHs= -github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240124140239-90228e66040f/go.mod h1:Gon1vwvNdIFrFhsYEH/YQ66Nb+oQ5POvOxqFLCcULa0= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240130132105-9f58fef62910 h1:jfWpEUAZBssLZUSfbtY5ua5EwFw48g10znSRWlzIOsQ= +github.com/elastic/beats/v7 v7.0.0-alpha2.0.20240130132105-9f58fef62910/go.mod h1:wfgvi7cRCNpBPS9pVyGBYNQc0SKx7rdXtE8l4K4e1c8= github.com/elastic/elastic-agent-autodiscover v0.6.7 h1:+KVjltN0rPsBrU8b156gV4lOTBgG/vt0efFCFARrf3g= github.com/elastic/elastic-agent-autodiscover v0.6.7/go.mod h1:hFeFqneS2r4jD0/QzGkrNk0YVdN0JGh7lCWdsH7zcI4= github.com/elastic/elastic-agent-client/v7 v7.6.0 h1:FEn6FjzynW4TIQo5G096Tr7xYK/P5LY9cSS6wRbXZTc= github.com/elastic/elastic-agent-client/v7 v7.6.0/go.mod h1:GlUKrbVd/O1CRAZonpBeN3J0RlVqP6VGcrBjFWca+aM= -github.com/elastic/elastic-agent-libs v0.7.3 h1:tc6JDXYR+2XFMHJVv+7+M0OwAbZPxm3caLJEd943dlE= -github.com/elastic/elastic-agent-libs v0.7.3/go.mod h1:9hlSaDPm0XTrUWrZjwvckgov1pDHnsGyybzAjNe/1wA= +github.com/elastic/elastic-agent-libs v0.7.5 h1:4UMqB3BREvhwecYTs/L23oQp1hs/XUkcunPlmTZn5yg= +github.com/elastic/elastic-agent-libs v0.7.5/go.mod h1:pGMj5myawdqu+xE+WKvM5FQzKQ/MonikkWOzoFTJxaU= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3 h1:sb+25XJn/JcC9/VL8HX4r4QXSUq4uTNzGS2kxOE7u1U= github.com/elastic/elastic-agent-shipper-client v0.5.1-0.20230228231646-f04347b666f3/go.mod h1:rWarFM7qYxJKsi9WcV6ONcFjH/NA3niDNpTxO+8/GVI= github.com/elastic/elastic-agent-system-metrics v0.9.1 h1:r0ofKHgPpl+W09ie7tzGcCDC0d4NZbQUv37rSgHf4FM= github.com/elastic/elastic-agent-system-metrics v0.9.1/go.mod h1:9C1UEfj0P687HAzZepHszN6zXA+2tN2Lx3Osvq1zby8= -github.com/elastic/elastic-transport-go/v8 v8.3.0 h1:DJGxovyQLXGr62e9nDMPSxRyWION0Bh6d9eCFBriiHo= -github.com/elastic/elastic-transport-go/v8 v8.3.0/go.mod h1:87Tcz8IVNe6rVSLdBux1o/PEItLtyabHU3naC7IoqKI= +github.com/elastic/elastic-transport-go/v8 v8.4.0 h1:EKYiH8CHd33BmMna2Bos1rDNMM89+hdgcymI+KzJCGE= +github.com/elastic/elastic-transport-go/v8 v8.4.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= github.com/elastic/gmux v0.3.1 h1:ghT+5Y9jW5udQTBrhDeMOtQVdRBwk9Y2h1o+4Rb7mhE= github.com/elastic/gmux v0.3.1/go.mod h1:IBFLojLnACU9tsUnoSavOaMdhq63/HOH/Aeiiha36jA= github.com/elastic/go-docappender v0.2.1-0.20231207080152-44217001fa53 h1:3jOfdobdHlfwC4yeTpljD6Ul+IWmhHHGHoUtn/Cb/UY= github.com/elastic/go-docappender v0.2.1-0.20231207080152-44217001fa53/go.mod h1:v+pGb4IkluqgnVN4Qu3o9a2WC1jve91NCu19oKNK/tM= -github.com/elastic/go-elasticsearch/v8 v8.11.1 h1:1VgTgUTbpqQZ4uE+cPjkOvy/8aw1ZvKcU0ZUE5Cn1mc= -github.com/elastic/go-elasticsearch/v8 v8.11.1/go.mod h1:GU1BJHO7WeamP7UhuElYwzzHtvf9SDmeVpSSy9+o6Qg= +github.com/elastic/go-elasticsearch/v8 v8.12.0 h1:krkiCf4peJa7bZwGegy01b5xWWaYpik78wvisTeRO1U= +github.com/elastic/go-elasticsearch/v8 v8.12.0/go.mod h1:wSzJYrrKPZQ8qPuqAqc6KMR4HrBfHnZORvyL+FMFqq0= github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f h1:TsPpU5EAwlt7YZoupKlxZ093qTZYdGou3EhfTF1U0B4= github.com/elastic/go-lumber v0.1.2-0.20220819171948-335fde24ea0f/go.mod h1:HHaWnZamYKWsR9/eZNHqRHob8iQDKnchHmmskT/SKko= github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w= diff --git a/internal/beater/config/config_test.go b/internal/beater/config/config_test.go index 71b4fd03a05..ed99f0caea1 100644 --- a/internal/beater/config/config_test.go +++ b/internal/beater/config/config_test.go @@ -33,6 +33,12 @@ import ( "github.com/elastic/apm-server/internal/elasticsearch" ) +var ( + noneClientAuth = tlscommon.TLSClientAuthNone + optionalClientAuth = tlscommon.TLSClientAuthOptional + requireClientAuth = tlscommon.TLSClientAuthRequired +) + var testdataCertificateConfig = tlscommon.CertificateConfig{ Certificate: "../../testdata/tls/certificate.pem", Key: "../../testdata/tls/key.pem", @@ -290,7 +296,7 @@ func TestUnpackConfig(t *testing.T) { TLS: &tlscommon.ServerConfig{ Enabled: newBool(true), Certificate: testdataCertificateConfig, - ClientAuth: 4, + ClientAuth: &requireClientAuth, CAs: []string{"../../testdata/tls/ca.crt.pem"}, }, AugmentEnabled: true, @@ -445,7 +451,6 @@ func TestUnpackConfig(t *testing.T) { TLS: &tlscommon.ServerConfig{ Enabled: newBool(true), Certificate: testdataCertificateConfig, - ClientAuth: 0, }, AugmentEnabled: true, Expvar: ExpvarConfig{ @@ -628,7 +633,7 @@ func TestTLSSettings(t *testing.T) { "key": "../../testdata/tls/key.pem", "certificate": "../../testdata/tls/certificate.pem", }}, - tls: &tlscommon.ServerConfig{ClientAuth: 0, Certificate: testdataCertificateConfig}, + tls: &tlscommon.ServerConfig{Certificate: testdataCertificateConfig}, }, "ConfiguredToRequired": { config: map[string]interface{}{"ssl": map[string]interface{}{ @@ -636,7 +641,7 @@ func TestTLSSettings(t *testing.T) { "key": "../../testdata/tls/key.pem", "certificate": "../../testdata/tls/certificate.pem", }}, - tls: &tlscommon.ServerConfig{ClientAuth: 4, Certificate: testdataCertificateConfig}, + tls: &tlscommon.ServerConfig{ClientAuth: &requireClientAuth, Certificate: testdataCertificateConfig}, }, "ConfiguredToOptional": { config: map[string]interface{}{"ssl": map[string]interface{}{ @@ -644,7 +649,7 @@ func TestTLSSettings(t *testing.T) { "key": "../../testdata/tls/key.pem", "certificate": "../../testdata/tls/certificate.pem", }}, - tls: &tlscommon.ServerConfig{ClientAuth: 3, Certificate: testdataCertificateConfig}, + tls: &tlscommon.ServerConfig{ClientAuth: &optionalClientAuth, Certificate: testdataCertificateConfig}, }, "DefaultRequiredByCA": { config: map[string]interface{}{"ssl": map[string]interface{}{ @@ -652,7 +657,7 @@ func TestTLSSettings(t *testing.T) { "key": "../../testdata/tls/key.pem", "certificate": "../../testdata/tls/certificate.pem", }}, - tls: &tlscommon.ServerConfig{ClientAuth: 4, Certificate: testdataCertificateConfig}, + tls: &tlscommon.ServerConfig{ClientAuth: &requireClientAuth, Certificate: testdataCertificateConfig}, }, "ConfiguredWithCA": { config: map[string]interface{}{"ssl": map[string]interface{}{ @@ -661,7 +666,7 @@ func TestTLSSettings(t *testing.T) { "key": "../../testdata/tls/key.pem", "certificate": "../../testdata/tls/certificate.pem", }}, - tls: &tlscommon.ServerConfig{ClientAuth: 0, Certificate: testdataCertificateConfig}, + tls: &tlscommon.ServerConfig{ClientAuth: &noneClientAuth, Certificate: testdataCertificateConfig}, }, } { t.Run(name, func(t *testing.T) {