From 83ba5acdf55b15112068ba4ee64a5fa419606647 Mon Sep 17 00:00:00 2001 From: Google Cloud Healthcare Team Date: Fri, 19 Apr 2024 14:07:56 -0700 Subject: [PATCH] Upgrade Go from 1.14 to 1.21 PiperOrigin-RevId: 626465121 Change-Id: I01801b7957f67be4d26f4311d70c5949d5825fb6 --- .github/workflows/go.yml | 4 ++-- .github/workflows/test.yml | 4 ++-- CHANGELOG.md | 5 +++++ deploy/build-gke-templates/hydra-ic/Dockerfile | 2 +- deploy/build-gke-templates/ic/Dockerfile | 2 +- deploy/build-gke-templates/icdemo/Dockerfile | 2 +- deploy/build-templates/damdemo/Dockerfile | 2 +- deploy/build-templates/hydra/Dockerfile | 2 +- deploy/build-templates/icdemo/Dockerfile | 2 +- deploy/build-templates/personas/Dockerfile | 2 +- 10 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index e5c36432..33f78998 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -7,10 +7,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.14 + - name: Set up Go 1.21 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.21 id: go - name: Check out code into the Go module directory diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cbd1995d..0d4d9b2d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,10 +7,10 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set up Go 1.14 + - name: Set up Go 1.21 uses: actions/setup-go@v1 with: - go-version: 1.14 + go-version: 1.21 id: go - name: Check out code into the Go module directory diff --git a/CHANGELOG.md b/CHANGELOG.md index c237d0d9..fb7f9531 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,11 @@ [Full Changelog](https://github.com/GoogleCloudPlatform/healthcare-federated-access-services/compare/v0.9.11...v0.9.12) +**Migration** + +* Upgrade jose dependency from v2 to v3. +* Upgrade GO version to 1.21: need rebuild all images, includes base image for GAE and Hydra image for GKE. + **Highlight Updates** * [Fix create idp on IC not saving to storage issue](https://github.com/GoogleCloudPlatform/healthcare-federated-access-services/issues/51) diff --git a/deploy/build-gke-templates/hydra-ic/Dockerfile b/deploy/build-gke-templates/hydra-ic/Dockerfile index 8aa8232d..8e131474 100644 --- a/deploy/build-gke-templates/hydra-ic/Dockerfile +++ b/deploy/build-gke-templates/hydra-ic/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.14.1-buster +FROM golang:1.21-bullseye WORKDIR / diff --git a/deploy/build-gke-templates/ic/Dockerfile b/deploy/build-gke-templates/ic/Dockerfile index eadc8449..71dc7e2a 100644 --- a/deploy/build-gke-templates/ic/Dockerfile +++ b/deploy/build-gke-templates/ic/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.14.1-buster +FROM golang:1.21-bullseye # Copy IC COPY . /hcls-fa diff --git a/deploy/build-gke-templates/icdemo/Dockerfile b/deploy/build-gke-templates/icdemo/Dockerfile index 3caa752f..4e0de208 100644 --- a/deploy/build-gke-templates/icdemo/Dockerfile +++ b/deploy/build-gke-templates/icdemo/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.14.1-buster +FROM golang:1.21-bullseye # Copy IC COPY . /hcls-fa diff --git a/deploy/build-templates/damdemo/Dockerfile b/deploy/build-templates/damdemo/Dockerfile index 71ee96a5..16c31f1a 100644 --- a/deploy/build-templates/damdemo/Dockerfile +++ b/deploy/build-templates/damdemo/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.14.1-buster AS build +FROM golang:1.21-bullseye AS build WORKDIR / diff --git a/deploy/build-templates/hydra/Dockerfile b/deploy/build-templates/hydra/Dockerfile index 0a635ad9..0ffed04d 100644 --- a/deploy/build-templates/hydra/Dockerfile +++ b/deploy/build-templates/hydra/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.14.1-buster +FROM golang:1.21-bullseye WORKDIR / diff --git a/deploy/build-templates/icdemo/Dockerfile b/deploy/build-templates/icdemo/Dockerfile index 843eb1aa..178130d2 100644 --- a/deploy/build-templates/icdemo/Dockerfile +++ b/deploy/build-templates/icdemo/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.14.1-buster AS build +FROM golang:1.21-bullseye AS build WORKDIR / diff --git a/deploy/build-templates/personas/Dockerfile b/deploy/build-templates/personas/Dockerfile index 79f3e7d0..faa2c02a 100644 --- a/deploy/build-templates/personas/Dockerfile +++ b/deploy/build-templates/personas/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.14.1-buster AS build +FROM golang:1.21-bullseye AS build WORKDIR /