Merge pull request #5220 from vvoland/v26.1-5218

[26.1 backport] update to go1.21.12
update to go1.21.12
2024-07-03 12:29:49 +02:00 · 2024-07-03 12:17:26 +02:00 · 2024-06-17 10:21:02 +02:00 · 2024-06-13 23:52:54 +02:00
8 changed files with 10 additions and 7 deletions
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@ -64,7 +64,7 @@ jobs:
        name: Set up Go
        uses: actions/setup-go@v5
        with:
-          go-version: 1.21.11
+          go-version: 1.21.12
      -
        name: Test
        run: |
--- a/2
+++ b/2
@ -4,7 +4,7 @@ ARG BASE_VARIANT=alpine
 ARG ALPINE_VERSION=3.20
 ARG BASE_DEBIAN_DISTRO=bookworm

-ARG GO_VERSION=1.21.11
+ARG GO_VERSION=1.21.12
 ARG XX_VERSION=1.4.0
 ARG GOVERSIONINFO_VERSION=v1.3.0
 ARG GOTESTSUM_VERSION=v1.10.0
--- a/cli/command/context/list.go
+++ b/cli/command/context/list.go
@ -1,3 +1,6 @@
+// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
+//go:build go1.19
+
 package context

 import (
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@ -1,5 +1,5 @@
 variable "GO_VERSION" {
-    default = "1.21.11"
+    default = "1.21.12"
 }
 variable "VERSION" {
    default = ""
--- a/dockerfiles/Dockerfile.dev
+++ b/dockerfiles/Dockerfile.dev
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.21.11
+ARG GO_VERSION=1.21.12
 ARG ALPINE_VERSION=3.20

 ARG BUILDX_VERSION=0.12.1
--- a/dockerfiles/Dockerfile.lint
+++ b/dockerfiles/Dockerfile.lint
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.21.11
+ARG GO_VERSION=1.21.12
 ARG ALPINE_VERSION=3.20
 ARG GOLANGCI_LINT_VERSION=v1.55.2

--- a/dockerfiles/Dockerfile.vendor
+++ b/dockerfiles/Dockerfile.vendor
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.21.11
+ARG GO_VERSION=1.21.12
 ARG ALPINE_VERSION=3.20
 ARG MODOUTDATED_VERSION=v0.8.0

--- a/e2e/testdata/Dockerfile.gencerts
+++ b/e2e/testdata/Dockerfile.gencerts
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-ARG GO_VERSION=1.21.11
+ARG GO_VERSION=1.21.12

 FROM golang:${GO_VERSION}-alpine AS generated
 ENV GOTOOLCHAIN=local
Author	SHA1	Message	Date
Sebastiaan van Stijn	a72d7cdbeb	Merge pull request #5220 from vvoland/v26.1-5218 Some checks failed build / prepare-plugins (push) Has been cancelled Details build / plugins (push) Has been cancelled Details codeql / codeql (push) Has been cancelled Details e2e / e2e (alpine, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 23, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 24, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 24, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 24, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 25, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 25, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 25, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 23, experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 24, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 24, experimental) (push) Has been cancelled Details e2e / e2e (debian, 24, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 25, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 25, experimental) (push) Has been cancelled Details e2e / e2e (debian, 25, non-experimental) (push) Has been cancelled Details test / ctn (push) Has been cancelled Details test / host (macos-12) (push) Has been cancelled Details validate / validate (lint) (push) Has been cancelled Details validate / validate (shellcheck) (push) Has been cancelled Details validate / validate (update-authors) (push) Has been cancelled Details validate / validate (validate-vendor) (push) Has been cancelled Details validate / validate-md (push) Has been cancelled Details validate / validate-make (manpages) (push) Has been cancelled Details validate / validate-make (yamldocs) (push) Has been cancelled Details [26.1 backport] update to go1.21.12	2024-07-03 12:29:49 +02:00
Paweł Gronowski	400f12f7a5	update to go1.21.12 - https://github.com/golang/go/issues?q=milestone%3AGo1.21.12+label%3ACherryPickApproved - full diff: https://github.com/golang/go/compare/go1.21.11...go1.21.12 These minor releases include 1 security fixes following the security policy: net/http: denial of service due to improper 100-continue handling The net/http HTTP/1.1 client mishandled the case where a server responds to a request with an "Expect: 100-continue" header with a non-informational (200 or higher) status. This mishandling could leave a client connection in an invalid state, where the next request sent on the connection will fail. An attacker sending a request to a net/http/httputil.ReverseProxy proxy can exploit this mishandling to cause a denial of service by sending "Expect: 100-continue" requests which elicit a non-informational response from the backend. Each such request leaves the proxy with an invalid connection, and causes one subsequent request using that connection to fail. Thanks to Geoff Franks for reporting this issue. This is CVE-2024-24791 and Go issue https://go.dev/issue/67555. View the release notes for more information: https://go.dev/doc/devel/release#go1.21.12 - Description for the changelog ```markdown changelog Update Go runtime to 1.21.12 ``` Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit `d73d7d4ed3`) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2024-07-03 12:17:26 +02:00
Paweł Gronowski	6eb67bf572	Merge pull request #5154 from thaJeztah/26.1_backport_goversion [26.1 backport] cli/command: more go1.19 ("predeclared any")	2024-06-17 10:21:02 +02:00
Nick Sieger	5bab750c2b	cli/command: more go1.19 ("predeclared any") Signed-off-by: Nick Sieger <nick@nicksieger.com> (cherry picked from commit `d0057db3ac`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-06-13 23:52:54 +02:00