From cf560c731b6324f249313e40afb8ead3188d712d Mon Sep 17 00:00:00 2001 From: Xueqin Cui <72771658+cuixq@users.noreply.github.com> Date: Wed, 8 May 2024 15:05:09 +1000 Subject: [PATCH] Update Go to 1.22.3 (#2179) --- .github/workflows/lint.yaml | 2 +- docker/ci/install_go.sh | 2 +- docker/indexer/Dockerfile | 2 +- docker/indexer/go.mod | 2 +- docker/terraform/Dockerfile | 2 +- docs/go.mod | 2 +- go.work | 2 +- tools/datastore-remover/go.mod | 2 +- tools/indexer-api-caller/go.mod | 2 +- vulnfeeds/cmd/alpine/Dockerfile | 2 +- vulnfeeds/cmd/combine-to-osv/Dockerfile | 2 +- vulnfeeds/cmd/cpe-repo-gen/Dockerfile | 2 +- vulnfeeds/cmd/debian/Dockerfile | 2 +- vulnfeeds/cmd/download-cves/Dockerfile | 2 +- vulnfeeds/cmd/nvd-cve-osv/Dockerfile | 2 +- vulnfeeds/go.mod | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 8ef220453a7..e25c3a23521 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -44,7 +44,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version: '>=1.22.2' + go-version: '>=1.22.3' - name: Set up terraform uses: hashicorp/setup-terraform@v2 - name: Run pylint and yapf, go vet diff --git a/docker/ci/install_go.sh b/docker/ci/install_go.sh index 0e7ba807da5..e31ccf1d436 100755 --- a/docker/ci/install_go.sh +++ b/docker/ci/install_go.sh @@ -19,4 +19,4 @@ set -eux # Download and install Go # https://pkg.go.dev/golang.org/x/tools/cmd/getgo#section-readme -curl -LO https://get.golang.org/$(uname)/go_installer && chmod +x go_installer && SHELL="bash" ./go_installer -version 1.22.2 && rm go_installer +curl -LO https://get.golang.org/$(uname)/go_installer && chmod +x go_installer && SHELL="bash" ./go_installer -version 1.22.3 && rm go_installer diff --git a/docker/indexer/Dockerfile b/docker/indexer/Dockerfile index b39fd1f4df0..0ff44fa8d70 100644 --- a/docker/indexer/Dockerfile +++ b/docker/indexer/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.22.2-alpine@sha256:cdc86d9f363e8786845bea2040312b4efa321b828acdeb26f393faa864d887b0 AS GO_BUILD +FROM golang:1.22.3-alpine@sha256:2a882244fb51835ebbd8313bffee83775b0c076aaf56b497b43d8a4c72db65e1 AS GO_BUILD WORKDIR /build # Cache dependencies in these steps diff --git a/docker/indexer/go.mod b/docker/indexer/go.mod index 8106a59e370..e2f6f056fe7 100644 --- a/docker/indexer/go.mod +++ b/docker/indexer/go.mod @@ -1,6 +1,6 @@ module github.com/google/osv.dev/docker/indexer -go 1.22.2 +go 1.22.3 require ( cloud.google.com/go/datastore v1.15.0 diff --git a/docker/terraform/Dockerfile b/docker/terraform/Dockerfile index 410d423ad43..631cad479c1 100644 --- a/docker/terraform/Dockerfile +++ b/docker/terraform/Dockerfile @@ -1,6 +1,6 @@ # Taken and modified from https://github.com/GoogleCloudPlatform/cloud-builders-community/tree/master/terraform -FROM golang:1.22.2-alpine@sha256:cdc86d9f363e8786845bea2040312b4efa321b828acdeb26f393faa864d887b0 AS GO_BUILD +FROM golang:1.22.3-alpine@sha256:2a882244fb51835ebbd8313bffee83775b0c076aaf56b497b43d8a4c72db65e1 AS GO_BUILD ARG TERRAFORM_VERSION WORKDIR /build/ diff --git a/docs/go.mod b/docs/go.mod index b6f8b0396cd..c570d64e539 100644 --- a/docs/go.mod +++ b/docs/go.mod @@ -1,6 +1,6 @@ module osv.dev/tools -go 1.22.2 +go 1.22.3 require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 diff --git a/go.work b/go.work index 74ea4ba347a..5a1d0d09bbb 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.22.2 +go 1.22.3 use ( ./docker/indexer diff --git a/tools/datastore-remover/go.mod b/tools/datastore-remover/go.mod index 1099b3a48a4..30e9f4b4ffe 100644 --- a/tools/datastore-remover/go.mod +++ b/tools/datastore-remover/go.mod @@ -1,6 +1,6 @@ module github.com/google/datastore-remover -go 1.22.2 +go 1.22.3 require ( cloud.google.com/go/datastore v1.15.0 diff --git a/tools/indexer-api-caller/go.mod b/tools/indexer-api-caller/go.mod index 9826ce91ecd..0dea6fbb2bf 100644 --- a/tools/indexer-api-caller/go.mod +++ b/tools/indexer-api-caller/go.mod @@ -1,3 +1,3 @@ module github.com/google/indexer-api-caller -go 1.22.2 +go 1.22.3 diff --git a/vulnfeeds/cmd/alpine/Dockerfile b/vulnfeeds/cmd/alpine/Dockerfile index 7a3550763ff..fe439853191 100644 --- a/vulnfeeds/cmd/alpine/Dockerfile +++ b/vulnfeeds/cmd/alpine/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.22.2-alpine@sha256:cdc86d9f363e8786845bea2040312b4efa321b828acdeb26f393faa864d887b0 AS GO_BUILD +FROM golang:1.22.3-alpine@sha256:2a882244fb51835ebbd8313bffee83775b0c076aaf56b497b43d8a4c72db65e1 AS GO_BUILD RUN mkdir /src WORKDIR /src diff --git a/vulnfeeds/cmd/combine-to-osv/Dockerfile b/vulnfeeds/cmd/combine-to-osv/Dockerfile index 2f41a017474..c9df35acd8c 100644 --- a/vulnfeeds/cmd/combine-to-osv/Dockerfile +++ b/vulnfeeds/cmd/combine-to-osv/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.22.2-alpine@sha256:cdc86d9f363e8786845bea2040312b4efa321b828acdeb26f393faa864d887b0 AS GO_BUILD +FROM golang:1.22.3-alpine@sha256:2a882244fb51835ebbd8313bffee83775b0c076aaf56b497b43d8a4c72db65e1 AS GO_BUILD RUN mkdir /src WORKDIR /src diff --git a/vulnfeeds/cmd/cpe-repo-gen/Dockerfile b/vulnfeeds/cmd/cpe-repo-gen/Dockerfile index 7b146fcb6ad..6e89801da96 100644 --- a/vulnfeeds/cmd/cpe-repo-gen/Dockerfile +++ b/vulnfeeds/cmd/cpe-repo-gen/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.22.2-alpine@sha256:cdc86d9f363e8786845bea2040312b4efa321b828acdeb26f393faa864d887b0 AS GO_BUILD +FROM golang:1.22.3-alpine@sha256:2a882244fb51835ebbd8313bffee83775b0c076aaf56b497b43d8a4c72db65e1 AS GO_BUILD RUN mkdir /src WORKDIR /src diff --git a/vulnfeeds/cmd/debian/Dockerfile b/vulnfeeds/cmd/debian/Dockerfile index b063d510813..5877b1cd014 100644 --- a/vulnfeeds/cmd/debian/Dockerfile +++ b/vulnfeeds/cmd/debian/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.22.2-alpine@sha256:cdc86d9f363e8786845bea2040312b4efa321b828acdeb26f393faa864d887b0 AS GO_BUILD +FROM golang:1.22.3-alpine@sha256:2a882244fb51835ebbd8313bffee83775b0c076aaf56b497b43d8a4c72db65e1 AS GO_BUILD RUN mkdir /src WORKDIR /src diff --git a/vulnfeeds/cmd/download-cves/Dockerfile b/vulnfeeds/cmd/download-cves/Dockerfile index 7d91bda6dcc..607147d40ae 100644 --- a/vulnfeeds/cmd/download-cves/Dockerfile +++ b/vulnfeeds/cmd/download-cves/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.22.2-alpine@sha256:cdc86d9f363e8786845bea2040312b4efa321b828acdeb26f393faa864d887b0 AS GO_BUILD +FROM golang:1.22.3-alpine@sha256:2a882244fb51835ebbd8313bffee83775b0c076aaf56b497b43d8a4c72db65e1 AS GO_BUILD RUN mkdir /src WORKDIR /src diff --git a/vulnfeeds/cmd/nvd-cve-osv/Dockerfile b/vulnfeeds/cmd/nvd-cve-osv/Dockerfile index c7684f487c5..a5830804480 100644 --- a/vulnfeeds/cmd/nvd-cve-osv/Dockerfile +++ b/vulnfeeds/cmd/nvd-cve-osv/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.22.1-alpine@sha256:5a99b4049412cd34ad6b4e0c9527ae6beb9ae82d787b4bf3f4eff7aa13fc577a AS GO_BUILD +FROM golang:1.22.3-alpine@sha256:2a882244fb51835ebbd8313bffee83775b0c076aaf56b497b43d8a4c72db65e1 AS GO_BUILD WORKDIR /go/src diff --git a/vulnfeeds/go.mod b/vulnfeeds/go.mod index 90ff73379da..7c18879a947 100644 --- a/vulnfeeds/go.mod +++ b/vulnfeeds/go.mod @@ -1,6 +1,6 @@ module github.com/google/osv/vulnfeeds -go 1.22.2 +go 1.22.3 require ( cloud.google.com/go/logging v1.8.1