From b3d69955650027fcefc3ce104cdd7881acf5a396 Mon Sep 17 00:00:00 2001 From: apmmachine <58790750+apmmachine@users.noreply.github.com> Date: Fri, 4 Aug 2023 14:15:43 -0400 Subject: [PATCH 1/6] [Automation] Bump Golang version to 1.20.7 (#36241) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /metricbeat/module/http/_meta/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /dev-tools/kubernetes/filebeat/Dockerfile.debug" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /metricbeat/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /x-pack/functionbeat/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [2] of file "/tmp/updatecli/github/elastic/beats... ... /metricbeat/module/vsphere/_meta/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /dev-tools/kubernetes/metricbeat/Dockerfile.debug" Made with ❤️️ by updatecli * chore: Updated to content ":go-version: 1.20.7" in file "libbeat/docs... ... /version.asciidoc" Made with ❤️️ by updatecli * chore: Updated to content "go 1.20" in file "go.mod" Made with ❤️️ by updatecli * chore: changed lines [5] of file "/tmp/updatecli/github/elastic/beats... ... /x-pack/metricbeat/module/stan/_meta/Dockerfile" Made with ❤️️ by updatecli * chore: Updated to content "1.20.7" in file ".golangci.yml" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /auditbeat/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /heartbeat/Dockerfile" Made with ❤️️ by updatecli * chore: changed lines [5] of file "/tmp/updatecli/github/elastic/beats... ... /metricbeat/module/nats/_meta/Dockerfile" Made with ❤️️ by updatecli * chore: Updated to content "1.20.7" in file ".go-version" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /dev-tools/kubernetes/heartbeat/Dockerfile.debug" Made with ❤️️ by updatecli * chore: changed lines [1] of file "/tmp/updatecli/github/elastic/beats... ... /packetbeat/Dockerfile" Made with ❤️️ by updatecli * Update changelog. --------- Co-authored-by: apmmachine Co-authored-by: Craig MacKenzie (cherry picked from commit a88f111fc6ac29889b103adda54a509802c888be) # Conflicts: # .go-version # .golangci.yml # auditbeat/Dockerfile # dev-tools/kubernetes/filebeat/Dockerfile.debug # dev-tools/kubernetes/heartbeat/Dockerfile.debug # dev-tools/kubernetes/metricbeat/Dockerfile.debug # heartbeat/Dockerfile # libbeat/docs/version.asciidoc # metricbeat/Dockerfile # metricbeat/module/http/_meta/Dockerfile # metricbeat/module/nats/_meta/Dockerfile # metricbeat/module/vsphere/_meta/Dockerfile # packetbeat/Dockerfile # x-pack/functionbeat/Dockerfile # x-pack/metricbeat/module/stan/_meta/Dockerfile --- .go-version | 4 ++++ .golangci.yml | 16 ++++++++++++++++ CHANGELOG.next.asciidoc | 2 ++ auditbeat/Dockerfile | 4 ++++ dev-tools/kubernetes/filebeat/Dockerfile.debug | 4 ++++ dev-tools/kubernetes/heartbeat/Dockerfile.debug | 4 ++++ dev-tools/kubernetes/metricbeat/Dockerfile.debug | 4 ++++ go.mod | 2 +- heartbeat/Dockerfile | 4 ++++ libbeat/docs/version.asciidoc | 4 ++++ metricbeat/Dockerfile | 4 ++++ metricbeat/module/http/_meta/Dockerfile | 4 ++++ metricbeat/module/nats/_meta/Dockerfile | 7 +++++++ metricbeat/module/vsphere/_meta/Dockerfile | 4 ++++ packetbeat/Dockerfile | 4 ++++ x-pack/functionbeat/Dockerfile | 4 ++++ x-pack/metricbeat/module/stan/_meta/Dockerfile | 7 +++++++ 17 files changed, 81 insertions(+), 1 deletion(-) diff --git a/.go-version b/.go-version index 88ebadf2c32..bc8042f5cda 100644 --- a/.go-version +++ b/.go-version @@ -1 +1,5 @@ +<<<<<<< HEAD 1.19.10 +======= +1.20.7 +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) diff --git a/.golangci.yml b/.golangci.yml index 2cd359352da..68723ef301f 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -108,7 +108,11 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.19.10" +======= + go: "1.20.7" +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -126,19 +130,31 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.19.10" +======= + go: "1.20.7" +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.19.10" +======= + go: "1.20.7" +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) # Disabled: # ST1005: error strings should not be capitalized checks: ["all", "-ST1005"] unused: # Select the Go version to target. The default is '1.13'. +<<<<<<< HEAD go: "1.19.10" +======= + go: "1.20.7" +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) gosec: excludes: diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index cf54b887781..2a809df67a0 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -9,6 +9,8 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] ==== Breaking changes *Affecting all Beats* +- Fix status reporting to Elastic-Agent when output configuration is invalid running under Elastic-Agent {pull}35719[35719] +- Upgrade Go to 1.20.7 {pull}36241[36241] *Auditbeat* diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index d410055f8d5..cb978ff030e 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.19.10 +======= +FROM golang:1.20.7 +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) RUN \ apt-get update \ diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index 661ac535c40..a48386a78f5 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:alpine3.15 as builder +======= +FROM golang:1.20.7 as builder +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug index cf61a85af40..dde69300188 100644 --- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:alpine3.15 as builder +======= +FROM golang:1.20.7 as builder +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug index 1462bc18b59..3ddbeb86c02 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:alpine3.15 as builder +======= +FROM golang:1.20.7 as builder +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/go.mod b/go.mod index 99611863897..27da48bd801 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/beats/v7 -go 1.19 +go 1.20 require ( cloud.google.com/go/bigquery v1.44.0 diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index 4f063983998..df48d3ba604 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.19.10 +======= +FROM golang:1.20.7 +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 98c711ca17b..3acc911c64c 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,6 +1,10 @@ :stack-version: 8.9.0 :doc-branch: main +<<<<<<< HEAD :go-version: 1.19.10 +======= +:go-version: 1.20.7 +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index 407d9e4fac8..76ddf4b525e 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.19.10 +======= +FROM golang:1.20.7 +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) RUN \ apt update \ diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index 650c1c7c062..ebe6f3df9d8 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.16.5 +======= +FROM golang:1.20.7 +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) COPY test/main.go main.go diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index 24757de5400..f866f89202c 100644 --- a/metricbeat/module/nats/_meta/Dockerfile +++ b/metricbeat/module/nats/_meta/Dockerfile @@ -2,10 +2,17 @@ ARG NATS_VERSION=2.0.4 FROM nats:$NATS_VERSION # build stage +<<<<<<< HEAD FROM golang:1.13-alpine3.11 AS build-env RUN apk --no-cache add build-base git mercurial gcc RUN cd src && go get -d github.com/nats-io/nats.go/ RUN cd src/github.com/nats-io/nats.go/examples/nats-bench && git checkout tags/v1.10.0 && go build . +======= +FROM golang:1.20.7 AS build-env +RUN apt-get install git mercurial gcc +RUN git clone https://github.com/nats-io/nats.go.git /nats-go +RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build . +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) # create an enhanced container with nc command available since nats is based # on scratch image making healthcheck impossible diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile index d003155c7f7..6326fb2c085 100644 --- a/metricbeat/module/vsphere/_meta/Dockerfile +++ b/metricbeat/module/vsphere/_meta/Dockerfile @@ -1,5 +1,9 @@ ARG VSPHERE_GOLANG_VERSION +<<<<<<< HEAD FROM golang:${VSPHERE_GOLANG_VERSION}-alpine +======= +FROM golang:1.20.7 +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) RUN apk add --no-cache curl git RUN go install github.com/vmware/govmomi/vcsim@v0.30.4 diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 4d6e1f522e0..1b40e5ef254 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.19.10 +======= +FROM golang:1.20.7 +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) RUN \ apt-get update \ diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index 3d0953e88e1..660624481e8 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,4 +1,8 @@ +<<<<<<< HEAD FROM golang:1.19.10 +======= +FROM golang:1.20.7 +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) RUN \ apt-get update \ diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index 030427a7c00..bf94e0ce507 100644 --- a/x-pack/metricbeat/module/stan/_meta/Dockerfile +++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile @@ -2,10 +2,17 @@ ARG STAN_VERSION=0.15.1 FROM nats-streaming:$STAN_VERSION # build stage +<<<<<<< HEAD FROM golang:1.13-alpine3.11 AS build-env RUN apk --no-cache add build-base git mercurial gcc RUN cd src && go get -d github.com/nats-io/stan.go/ RUN cd src/github.com/nats-io/stan.go/examples/stan-bench && git checkout tags/v0.5.2 && go build . +======= +FROM golang:1.20.7 AS build-env +RUN apt-get install git mercurial gcc +RUN git clone https://github.com/nats-io/stan.go.git /stan-go +RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build . +>>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) # create an enhanced container with nc command available since nats is based # on scratch image making healthcheck impossible From 9496bf0a845c719970c0dca349f7bb9c917e2dcd Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Fri, 4 Aug 2023 14:28:19 -0400 Subject: [PATCH 2/6] Update changelog. --- CHANGELOG.next.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 2a809df67a0..15e4826b2ee 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -10,7 +10,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] *Affecting all Beats* - Fix status reporting to Elastic-Agent when output configuration is invalid running under Elastic-Agent {pull}35719[35719] -- Upgrade Go to 1.20.7 {pull}36241[36241] +- Upgrade Go to 1.19.12 {pull}36246[36246] *Auditbeat* From f82bef3ae12d34ae22bd997552a0a1432afbaad8 Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Fri, 4 Aug 2023 14:31:12 -0400 Subject: [PATCH 3/6] Fix conflicts. --- .go-version | 6 +----- .golangci.yml | 24 ++++-------------------- auditbeat/Dockerfile | 6 +----- heartbeat/Dockerfile | 6 +----- libbeat/docs/version.asciidoc | 6 +----- metricbeat/Dockerfile | 6 +----- packetbeat/Dockerfile | 6 +----- x-pack/functionbeat/Dockerfile | 6 +----- 8 files changed, 11 insertions(+), 55 deletions(-) diff --git a/.go-version b/.go-version index bc8042f5cda..e54f3135a7d 100644 --- a/.go-version +++ b/.go-version @@ -1,5 +1 @@ -<<<<<<< HEAD -1.19.10 -======= -1.20.7 ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) +1.19.12 diff --git a/.golangci.yml b/.golangci.yml index 68723ef301f..138569983b1 100755 --- a/.golangci.yml +++ b/.golangci.yml @@ -108,11 +108,7 @@ linters-settings: gosimple: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.19.10" -======= - go: "1.20.7" ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) + go: "1.19.12" nakedret: # make an issue if func has more lines of code than this setting and it has naked returns; default is 30 @@ -130,31 +126,19 @@ linters-settings: staticcheck: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.19.10" -======= - go: "1.20.7" ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) + go: "1.19.12" checks: ["all"] stylecheck: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.19.10" -======= - go: "1.20.7" ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) + go: "1.19.12" # Disabled: # ST1005: error strings should not be capitalized checks: ["all", "-ST1005"] unused: # Select the Go version to target. The default is '1.13'. -<<<<<<< HEAD - go: "1.19.10" -======= - go: "1.20.7" ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) + go: "1.19.12" gosec: excludes: diff --git a/auditbeat/Dockerfile b/auditbeat/Dockerfile index cb978ff030e..17a6f2cc93f 100644 --- a/auditbeat/Dockerfile +++ b/auditbeat/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.19.10 -======= -FROM golang:1.20.7 ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) +FROM golang:1.19.12 RUN \ apt-get update \ diff --git a/heartbeat/Dockerfile b/heartbeat/Dockerfile index df48d3ba604..52a87012c7e 100644 --- a/heartbeat/Dockerfile +++ b/heartbeat/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.19.10 -======= -FROM golang:1.20.7 ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) +FROM golang:1.19.12 RUN \ apt-get update \ diff --git a/libbeat/docs/version.asciidoc b/libbeat/docs/version.asciidoc index 3acc911c64c..96c8f4de446 100644 --- a/libbeat/docs/version.asciidoc +++ b/libbeat/docs/version.asciidoc @@ -1,10 +1,6 @@ :stack-version: 8.9.0 :doc-branch: main -<<<<<<< HEAD -:go-version: 1.19.10 -======= -:go-version: 1.20.7 ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) +:go-version: 1.19.12 :release-state: unreleased :python: 3.7 :docker: 1.12 diff --git a/metricbeat/Dockerfile b/metricbeat/Dockerfile index 76ddf4b525e..9e7997c1562 100644 --- a/metricbeat/Dockerfile +++ b/metricbeat/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.19.10 -======= -FROM golang:1.20.7 ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) +FROM golang:1.19.12 RUN \ apt update \ diff --git a/packetbeat/Dockerfile b/packetbeat/Dockerfile index 1b40e5ef254..a9472f155e5 100644 --- a/packetbeat/Dockerfile +++ b/packetbeat/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.19.10 -======= -FROM golang:1.20.7 ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) +FROM golang:1.19.12 RUN \ apt-get update \ diff --git a/x-pack/functionbeat/Dockerfile b/x-pack/functionbeat/Dockerfile index 660624481e8..a3bb21b33b2 100644 --- a/x-pack/functionbeat/Dockerfile +++ b/x-pack/functionbeat/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.19.10 -======= -FROM golang:1.20.7 ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) +FROM golang:1.19.12 RUN \ apt-get update \ From 719e202f6a594f633771b14c6b8819341c5a99b2 Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Fri, 4 Aug 2023 14:31:39 -0400 Subject: [PATCH 4/6] Remove extra changelog entry. --- CHANGELOG.next.asciidoc | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc index 15e4826b2ee..8b96c9ff279 100644 --- a/CHANGELOG.next.asciidoc +++ b/CHANGELOG.next.asciidoc @@ -9,7 +9,6 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff] ==== Breaking changes *Affecting all Beats* -- Fix status reporting to Elastic-Agent when output configuration is invalid running under Elastic-Agent {pull}35719[35719] - Upgrade Go to 1.19.12 {pull}36246[36246] *Auditbeat* From e59ad560839ef882f5eabe824836b8071d7b1cdb Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Fri, 4 Aug 2023 14:46:01 -0400 Subject: [PATCH 5/6] Fix version in go.mod --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 27da48bd801..99611863897 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/elastic/beats/v7 -go 1.20 +go 1.19 require ( cloud.google.com/go/bigquery v1.44.0 From 6dd513cc35e74503b4c4449274de775f261831e4 Mon Sep 17 00:00:00 2001 From: Craig MacKenzie Date: Fri, 4 Aug 2023 16:44:55 -0400 Subject: [PATCH 6/6] Resolve missed conflicts. --- dev-tools/kubernetes/filebeat/Dockerfile.debug | 4 ---- dev-tools/kubernetes/heartbeat/Dockerfile.debug | 4 ---- dev-tools/kubernetes/metricbeat/Dockerfile.debug | 4 ---- metricbeat/module/http/_meta/Dockerfile | 6 +----- metricbeat/module/nats/_meta/Dockerfile | 7 ------- metricbeat/module/vsphere/_meta/Dockerfile | 4 ---- x-pack/metricbeat/module/stan/_meta/Dockerfile | 7 ------- 7 files changed, 1 insertion(+), 35 deletions(-) diff --git a/dev-tools/kubernetes/filebeat/Dockerfile.debug b/dev-tools/kubernetes/filebeat/Dockerfile.debug index a48386a78f5..661ac535c40 100644 --- a/dev-tools/kubernetes/filebeat/Dockerfile.debug +++ b/dev-tools/kubernetes/filebeat/Dockerfile.debug @@ -1,8 +1,4 @@ -<<<<<<< HEAD FROM golang:alpine3.15 as builder -======= -FROM golang:1.20.7 as builder ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/heartbeat/Dockerfile.debug b/dev-tools/kubernetes/heartbeat/Dockerfile.debug index dde69300188..cf61a85af40 100644 --- a/dev-tools/kubernetes/heartbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/heartbeat/Dockerfile.debug @@ -1,8 +1,4 @@ -<<<<<<< HEAD FROM golang:alpine3.15 as builder -======= -FROM golang:1.20.7 as builder ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/dev-tools/kubernetes/metricbeat/Dockerfile.debug b/dev-tools/kubernetes/metricbeat/Dockerfile.debug index 3ddbeb86c02..1462bc18b59 100644 --- a/dev-tools/kubernetes/metricbeat/Dockerfile.debug +++ b/dev-tools/kubernetes/metricbeat/Dockerfile.debug @@ -1,8 +1,4 @@ -<<<<<<< HEAD FROM golang:alpine3.15 as builder -======= -FROM golang:1.20.7 as builder ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin diff --git a/metricbeat/module/http/_meta/Dockerfile b/metricbeat/module/http/_meta/Dockerfile index ebe6f3df9d8..88b4a998e1f 100644 --- a/metricbeat/module/http/_meta/Dockerfile +++ b/metricbeat/module/http/_meta/Dockerfile @@ -1,8 +1,4 @@ -<<<<<<< HEAD -FROM golang:1.16.5 -======= -FROM golang:1.20.7 ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) +FROM golang:1.19.12 COPY test/main.go main.go diff --git a/metricbeat/module/nats/_meta/Dockerfile b/metricbeat/module/nats/_meta/Dockerfile index f866f89202c..24757de5400 100644 --- a/metricbeat/module/nats/_meta/Dockerfile +++ b/metricbeat/module/nats/_meta/Dockerfile @@ -2,17 +2,10 @@ ARG NATS_VERSION=2.0.4 FROM nats:$NATS_VERSION # build stage -<<<<<<< HEAD FROM golang:1.13-alpine3.11 AS build-env RUN apk --no-cache add build-base git mercurial gcc RUN cd src && go get -d github.com/nats-io/nats.go/ RUN cd src/github.com/nats-io/nats.go/examples/nats-bench && git checkout tags/v1.10.0 && go build . -======= -FROM golang:1.20.7 AS build-env -RUN apt-get install git mercurial gcc -RUN git clone https://github.com/nats-io/nats.go.git /nats-go -RUN cd /nats-go/examples/nats-bench && git checkout tags/v1.10.0 && go build . ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) # create an enhanced container with nc command available since nats is based # on scratch image making healthcheck impossible diff --git a/metricbeat/module/vsphere/_meta/Dockerfile b/metricbeat/module/vsphere/_meta/Dockerfile index 6326fb2c085..d003155c7f7 100644 --- a/metricbeat/module/vsphere/_meta/Dockerfile +++ b/metricbeat/module/vsphere/_meta/Dockerfile @@ -1,9 +1,5 @@ ARG VSPHERE_GOLANG_VERSION -<<<<<<< HEAD FROM golang:${VSPHERE_GOLANG_VERSION}-alpine -======= -FROM golang:1.20.7 ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) RUN apk add --no-cache curl git RUN go install github.com/vmware/govmomi/vcsim@v0.30.4 diff --git a/x-pack/metricbeat/module/stan/_meta/Dockerfile b/x-pack/metricbeat/module/stan/_meta/Dockerfile index bf94e0ce507..030427a7c00 100644 --- a/x-pack/metricbeat/module/stan/_meta/Dockerfile +++ b/x-pack/metricbeat/module/stan/_meta/Dockerfile @@ -2,17 +2,10 @@ ARG STAN_VERSION=0.15.1 FROM nats-streaming:$STAN_VERSION # build stage -<<<<<<< HEAD FROM golang:1.13-alpine3.11 AS build-env RUN apk --no-cache add build-base git mercurial gcc RUN cd src && go get -d github.com/nats-io/stan.go/ RUN cd src/github.com/nats-io/stan.go/examples/stan-bench && git checkout tags/v0.5.2 && go build . -======= -FROM golang:1.20.7 AS build-env -RUN apt-get install git mercurial gcc -RUN git clone https://github.com/nats-io/stan.go.git /stan-go -RUN cd /stan-go/examples/stan-bench && git checkout tags/v0.5.2 && go build . ->>>>>>> a88f111fc6 ([Automation] Bump Golang version to 1.20.7 (#36241)) # create an enhanced container with nc command available since nats is based # on scratch image making healthcheck impossible