From f0aa228dbfc32c23711c8375072cef1a1a998be3 Mon Sep 17 00:00:00 2001 From: James Blair Date: Wed, 8 Mar 2023 22:33:13 +1300 Subject: [PATCH] Updated go to 1.19.7. Mitigates CVE-2023-24532. Signed-off-by: James Blair --- .github/workflows/e2e.yaml | 2 +- .github/workflows/functional.yaml | 2 +- .github/workflows/grpcproxy.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/tests.yaml | 2 +- Makefile | 2 +- api/go.mod | 2 +- client/pkg/go.mod | 2 +- client/v2/go.mod | 2 +- client/v3/go.mod | 2 +- pkg/go.mod | 2 +- raft/go.mod | 2 +- tools/mod/go.mod | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index e0308616c..4e160cadb 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.19.6" + go-version: "1.19.7" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.github/workflows/functional.yaml b/.github/workflows/functional.yaml index 26b68de31..98cd212da 100644 --- a/.github/workflows/functional.yaml +++ b/.github/workflows/functional.yaml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.19.6" + go-version: "1.19.7" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.github/workflows/grpcproxy.yaml b/.github/workflows/grpcproxy.yaml index 1a7725a10..2d67e5b8c 100644 --- a/.github/workflows/grpcproxy.yaml +++ b/.github/workflows/grpcproxy.yaml @@ -12,7 +12,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.19.6" + go-version: "1.19.7" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 9aa0d8718..05b8fbcbf 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,7 +7,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.19.6" + go-version: "1.19.7" - run: | git config --global user.email "github-action@etcd.io" git config --global user.name "Github Action" diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index cbbae79fd..d67c9b67f 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-go@v2 with: - go-version: "1.19.6" + go-version: "1.19.7" - run: date - env: TARGET: ${{ matrix.target }} diff --git a/Makefile b/Makefile index 47deae5ca..4fc5f19c4 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ docker-remove: -GO_VERSION ?= 1.19.6 +GO_VERSION ?= 1.19.7 ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) diff --git a/api/go.mod b/api/go.mod index 25f553d8e..902d4c46d 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/api/v3 -go 1.17 +go 1.19 require ( github.com/coreos/go-semver v0.3.0 diff --git a/client/pkg/go.mod b/client/pkg/go.mod index 3a72d4611..2e41fc4ce 100644 --- a/client/pkg/go.mod +++ b/client/pkg/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/client/pkg/v3 -go 1.17 +go 1.19 require ( github.com/coreos/go-systemd/v22 v22.3.2 diff --git a/client/v2/go.mod b/client/v2/go.mod index 06df9eb82..7c03110c2 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/client/v2 -go 1.17 +go 1.19 require ( github.com/json-iterator/go v1.1.11 diff --git a/client/v3/go.mod b/client/v3/go.mod index ec286316a..f14ba71ec 100644 --- a/client/v3/go.mod +++ b/client/v3/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/client/v3 -go 1.17 +go 1.19 require ( github.com/dustin/go-humanize v1.0.0 diff --git a/pkg/go.mod b/pkg/go.mod index 497e957aa..544549183 100644 --- a/pkg/go.mod +++ b/pkg/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/pkg/v3 -go 1.17 +go 1.19 require ( github.com/creack/pty v1.1.11 diff --git a/raft/go.mod b/raft/go.mod index 62d707e1b..7fa8bf1e3 100644 --- a/raft/go.mod +++ b/raft/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/raft/v3 -go 1.17 +go 1.19 require ( github.com/cockroachdb/datadriven v1.0.2 diff --git a/tools/mod/go.mod b/tools/mod/go.mod index 441f91803..ca2b302c8 100644 --- a/tools/mod/go.mod +++ b/tools/mod/go.mod @@ -1,6 +1,6 @@ module go.etcd.io/etcd/tools/v3 -go 1.17 +go 1.19 require ( github.com/akhenakh/hunspellgo v0.0.0-20160221122622-9db38fa26e19 // indirect