Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Automation] Bump Golang version to 1.21.7 #37913

Merged
merged 36 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from 35 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
4edc260
chore: Update Metricbeat debug Dockerfile
apmmachine Jan 24, 2024
85f85cb
chore: Update .golangci.yml
apmmachine Jan 24, 2024
6b9aa96
chore: Update from vsphere Dockerfile
apmmachine Jan 24, 2024
8c3950d
chore: Update Metricbeat Dockerfile
apmmachine Jan 24, 2024
b22ebcd
chore: Update .go-version
apmmachine Jan 24, 2024
12a4b96
chore: Update Packetbeat Dockerfile
apmmachine Jan 24, 2024
bb49f51
chore: Update Auditbeat Dockerfile
apmmachine Jan 24, 2024
12b013c
chore: Update stan Dockerfile
apmmachine Jan 24, 2024
4171d6a
chore: Update Functionbeat Dockerfile
apmmachine Jan 24, 2024
e69397a
chore: Update go.mod
apmmachine Jan 24, 2024
6e0a2ee
chore: Update HTTP module Dockerfile
apmmachine Jan 24, 2024
647b002
chore: Update .devcontainer/devcontainer.json
apmmachine Jan 24, 2024
1685512
chore: Update Heartbeat debug Dockerfile
apmmachine Jan 24, 2024
2d79af5
chore: Update version.asciidoc
apmmachine Jan 24, 2024
3923bf8
chore: Update NATS module Dockerfile
apmmachine Jan 24, 2024
61d12bb
chore: Update Filebeat debug Dockerfile
apmmachine Jan 24, 2024
d3a1ebf
chore: Update Heartbeat Dockerfile
apmmachine Jan 24, 2024
54f55a2
chore: Update Metricbeat Dockerfile
apmmachine Feb 7, 2024
28d7342
chore: Update Functionbeat Dockerfile
apmmachine Feb 7, 2024
8824e6f
chore: Update Heartbeat Dockerfile
apmmachine Feb 7, 2024
34ce789
chore: Update go.mod
apmmachine Feb 7, 2024
d9adafe
chore: Update NATS module Dockerfile
apmmachine Feb 7, 2024
8243b08
chore: Update Metricbeat debug Dockerfile
apmmachine Feb 7, 2024
9f0dc91
chore: Update Heartbeat debug Dockerfile
apmmachine Feb 7, 2024
b519d74
chore: Update from vsphere Dockerfile
apmmachine Feb 7, 2024
6071982
chore: Update stan Dockerfile
apmmachine Feb 7, 2024
42c99be
chore: Update Packetbeat Dockerfile
apmmachine Feb 7, 2024
c4a951b
chore: Update HTTP module Dockerfile
apmmachine Feb 7, 2024
59a855b
chore: Update .golangci.yml
apmmachine Feb 7, 2024
79ed6d3
chore: Update .go-version
apmmachine Feb 7, 2024
9786c34
chore: Update Filebeat debug Dockerfile
apmmachine Feb 7, 2024
fdbda03
chore: Update version.asciidoc
apmmachine Feb 7, 2024
b72f285
chore: Update .devcontainer/devcontainer.json
apmmachine Feb 7, 2024
6e1dfc6
chore: Update Auditbeat Dockerfile
apmmachine Feb 7, 2024
e5355a3
Update changelog.
cmacknz Feb 7, 2024
9010bcc
Merge branch 'main' into updatecli_bump-golang-version
cmacknz Feb 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.21.6
1.21.7
8 changes: 4 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ linters-settings:

gosimple:
# Select the Go version to target. The default is '1.13'.
go: "1.21.6"
go: "1.21.7"

nakedret:
# make an issue if func has more lines of code than this setting and it has naked returns; default is 30
Expand All @@ -132,19 +132,19 @@ linters-settings:

staticcheck:
# Select the Go version to target. The default is '1.13'.
go: "1.21.6"
go: "1.21.7"
checks: ["all"]

stylecheck:
# Select the Go version to target. The default is '1.13'.
go: "1.21.6"
go: "1.21.7"
# Disabled:
# ST1005: error strings should not be capitalized
checks: ["all", "-ST1005"]

unused:
# Select the Go version to target. The default is '1.13'.
go: "1.21.6"
go: "1.21.7"

gosec:
excludes:
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ https://github.com/elastic/beats/compare/v8.8.1\...main[Check the HEAD diff]

*Affecting all Beats*

- Upgrade to Go 1.21.6. Removes support for Windows 8.1. See https://tip.golang.org/doc/go1.21#windows. {pull}37615[37615]
- Upgrade to Go 1.21.7. Removes support for Windows 8.1. See https://tip.golang.org/doc/go1.21#windows. {pull}37913[37913]

*Auditbeat*

Expand Down
2 changes: 1 addition & 1 deletion auditbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.6
FROM golang:1.21.7

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/filebeat/Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.6 as builder
FROM golang:1.21.7 as builder

ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/heartbeat/Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.6 as builder
FROM golang:1.21.7 as builder

ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin

Expand Down
2 changes: 1 addition & 1 deletion dev-tools/kubernetes/metricbeat/Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.6 as builder
FROM golang:1.21.7 as builder

ENV PATH=/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/go/bin:/usr/local/go/bin

Expand Down
2 changes: 1 addition & 1 deletion heartbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.6
FROM golang:1.21.7

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion libbeat/docs/version.asciidoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
:stack-version: 8.13.0
:doc-branch: main
:go-version: 1.21.6
:go-version: 1.21.7
:release-state: unreleased
:python: 3.7
:docker: 1.12
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.6
FROM golang:1.21.7

RUN \
apt update \
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/http/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.6
FROM golang:1.21.7

COPY test/main.go main.go

Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/nats/_meta/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG NATS_VERSION=2.0.4
FROM nats:$NATS_VERSION

# build stage
FROM golang:1.21.6 AS build-env
FROM golang:1.21.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 .
Expand Down
2 changes: 1 addition & 1 deletion metricbeat/module/vsphere/_meta/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG VSPHERE_GOLANG_VERSION
FROM golang:1.21.6
FROM golang:1.21.7

RUN apt-get install curl git
RUN go install github.com/vmware/govmomi/vcsim@v0.30.4
Expand Down
2 changes: 1 addition & 1 deletion packetbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.6
FROM golang:1.21.7

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion x-pack/functionbeat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.21.6
FROM golang:1.21.7

RUN \
apt-get update \
Expand Down
2 changes: 1 addition & 1 deletion x-pack/metricbeat/module/stan/_meta/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG STAN_VERSION=0.15.1
FROM nats-streaming:$STAN_VERSION

# build stage
FROM golang:1.21.6 AS build-env
FROM golang:1.21.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 .
Expand Down