From d687121963f5c229c68e7e054288296b8bab0677 Mon Sep 17 00:00:00 2001 From: Rachel Chen Date: Wed, 3 Apr 2024 20:23:36 -0700 Subject: [PATCH] update go to 1.22.2 due to CVE and upgrade dependencies --- .github/workflows/pipeline.yaml | 8 ++++---- .github/workflows/pull.yaml | 6 +++--- Dockerfile | 2 +- Dockerfile.dev | 2 +- Dockerfile.flyio | 2 +- Dockerfile.validator | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml index b3b9e74..81cd5d4 100644 --- a/.github/workflows/pipeline.yaml +++ b/.github/workflows/pipeline.yaml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] - go: ["1.22.1"] + go: ["1.22.2"] env: OS: ${{ matrix.os }} steps: @@ -50,7 +50,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: "1.22.1" + go-version: "1.22.2" - uses: actions/cache@v3 with: path: | @@ -76,7 +76,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: "1.22.1" + go-version: "1.22.2" - uses: actions/cache@v3 with: path: | @@ -99,7 +99,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: "1.22.1" + go-version: "1.22.2" - uses: actions/cache@v3 with: path: | diff --git a/.github/workflows/pull.yaml b/.github/workflows/pull.yaml index 397f28b..00fca6d 100644 --- a/.github/workflows/pull.yaml +++ b/.github/workflows/pull.yaml @@ -15,7 +15,7 @@ jobs: fail-fast: false matrix: os: ["ubuntu-latest", "macos-latest", "windows-latest"] - go: ["1.22.1"] + go: ["1.22.2"] env: OS: ${{ matrix.os }} steps: @@ -46,7 +46,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: "1.22.1" + go-version: "1.22.2" - uses: actions/cache@v3 with: path: | @@ -68,7 +68,7 @@ jobs: - name: Install Go uses: actions/setup-go@v3 with: - go-version: "1.22.1" + go-version: "1.22.2" - uses: actions/cache@v3 with: path: | diff --git a/Dockerfile b/Dockerfile index 51772c5..e95a0b1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM --platform=$BUILDPLATFORM golang:1.22.1-alpine as builder +FROM --platform=$BUILDPLATFORM golang:1.22.2-alpine as builder RUN apk --no-cache add ca-certificates git WORKDIR /app COPY . . diff --git a/Dockerfile.dev b/Dockerfile.dev index d936ea6..1a27fec 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM golang:1.22.1-bullseye as builder +FROM golang:1.22.2-bullseye as builder RUN apt install ca-certificates gcc WORKDIR /app COPY . . diff --git a/Dockerfile.flyio b/Dockerfile.flyio index 3854b8b..780aaa0 100644 --- a/Dockerfile.flyio +++ b/Dockerfile.flyio @@ -1,4 +1,4 @@ -FROM golang:1.22.1-alpine as builder +FROM golang:1.22.2-alpine as builder RUN apk --no-cache add ca-certificates WORKDIR /app COPY . . diff --git a/Dockerfile.validator b/Dockerfile.validator index e5d3a29..b7e4d05 100644 --- a/Dockerfile.validator +++ b/Dockerfile.validator @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM --platform=$BUILDPLATFORM golang:1.22.1-alpine as builder +FROM --platform=$BUILDPLATFORM golang:1.22.2-alpine as builder RUN apk --no-cache add ca-certificates git WORKDIR /app COPY . . diff --git a/go.mod b/go.mod index e947518..aba8ca2 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/Microsoft/go-winio v0.6.1 - github.com/TheZeroSlave/zapsentry v1.20.2 + github.com/TheZeroSlave/zapsentry v1.22.1 github.com/Yiling-J/theine-go v0.3.2 github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 github.com/avast/retry-go/v4 v4.5.1 @@ -36,7 +36,7 @@ require ( go.uber.org/goleak v1.3.0 go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 - golang.org/x/net v0.22.0 + golang.org/x/net v0.23.0 golang.org/x/sync v0.6.0 golang.org/x/sys v0.18.0 google.golang.org/protobuf v1.33.0 diff --git a/go.sum b/go.sum index 4707615..879f4d4 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/TheZeroSlave/zapsentry v1.20.2 h1:llgC91ZJdoU/OzGxYpUlEhKinf65mw9hJ2KkZ7+cGIk= -github.com/TheZeroSlave/zapsentry v1.20.2/go.mod h1:D1YMfSuu6xnkhwFXxrronesmsiyDhIqo+86I3Ok+r64= +github.com/TheZeroSlave/zapsentry v1.22.1 h1:NB7JW4SDlWCdEZ+7qqbjfS3hkvuJuTRAvHh4RRKo4BY= +github.com/TheZeroSlave/zapsentry v1.22.1/go.mod h1:D1YMfSuu6xnkhwFXxrronesmsiyDhIqo+86I3Ok+r64= github.com/Yiling-J/theine-go v0.3.2 h1:XcSdMPV9DwBD9gqqSxbBfVJnP8CCiqNSqp3C6YpmMHI= github.com/Yiling-J/theine-go v0.3.2/go.mod h1:ygLXqrWPZT/a+PzK5hQ0+a6gu0lpAY5IudTcgnPleqI= github.com/alecthomas/units v0.0.0-20231202071711-9a357b53e9c9 h1:ez/4by2iGztzR4L0zgAOR8lTQK9VlyBVVd7G4omaOQs= @@ -178,8 +178,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=