From 72aeac8df57f43b8dfb7b78bf6937cd777fcc925 Mon Sep 17 00:00:00 2001
From: Bennett Sala <salabenn@amazon.com>
Date: Mon, 18 Mar 2024 14:38:24 -0700
Subject: [PATCH] Update project to use go 1.22

---
 .github/actions/integration-test/action.yaml          | 4 ++--
 .github/workflows/build.yml                           | 4 ++--
 .github/workflows/unit-test.yml                       | 4 ++--
 Dockerfile                                            | 2 +-
 go.mod                                                | 2 +-
 test/integration/test_app/sidecar-backend/Dockerfile  | 4 ++--
 test/integration/test_app/sidecar-backend/go.mod      | 2 +-
 test/integration/test_app/sidecar-frontend/Dockerfile | 4 ++--
 test/integration/test_app/sidecar-frontend/go.mod     | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/actions/integration-test/action.yaml b/.github/actions/integration-test/action.yaml
index 7eba4833..442804be 100644
--- a/.github/actions/integration-test/action.yaml
+++ b/.github/actions/integration-test/action.yaml
@@ -19,10 +19,10 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: Install Go 1.20
+    - name: Install Go 1.22
       uses: actions/setup-go@v3
       with:
-        go-version: '1.20.*'
+        go-version: '1.22.*'
       id: go
 
     - name: Setup Test Tools
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d56fb761..4c45c6f7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,10 +12,10 @@ jobs:
     name: build
     runs-on: ubuntu-22.04
     steps:
-    - name: Set up Go 1.20
+    - name: Set up Go 1.22
       uses: actions/setup-go@v3
       with:
-        go-version: '1.20.*'
+        go-version: '1.22.*'
       id: go
     - name: checkout code
       uses: actions/checkout@v2
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index c21cfb5b..6ff4c7dd 100644
--- a/.github/workflows/unit-test.yml
+++ b/.github/workflows/unit-test.yml
@@ -12,10 +12,10 @@ jobs:
     name: unit-test
     runs-on: ubuntu-22.04
     steps:
-    - name: setup go 1.20
+    - name: setup go 1.22
       uses: actions/setup-go@v3
       with:
-        go-version: '1.20.*'
+        go-version: '1.22.*'
       id: go
     - name: setup kubebuilder
       run: |
diff --git a/Dockerfile b/Dockerfile
index f67bc0d8..e2f4aa17 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:experimental
 
 # Build the controller binary
-FROM --platform=${BUILDPLATFORM} golang:1.20 as builder
+FROM --platform=${BUILDPLATFORM} golang:1.22 as builder
 
 WORKDIR /workspace
 
diff --git a/go.mod b/go.mod
index 6ede2f32..6464ffa9 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/aws/aws-app-mesh-controller-for-k8s
 
-go 1.20
+go 1.22
 
 require (
 	github.com/aws/aws-sdk-go v1.44.252
diff --git a/test/integration/test_app/sidecar-backend/Dockerfile b/test/integration/test_app/sidecar-backend/Dockerfile
index 25598b51..af990d0c 100644
--- a/test/integration/test_app/sidecar-backend/Dockerfile
+++ b/test/integration/test_app/sidecar-backend/Dockerfile
@@ -4,8 +4,8 @@ RUN yum update -y && \
     yum clean all && \
     rm -rf /var/cache/yum
 
-RUN curl -LO https://golang.org/dl/go1.20.3.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzvf go1.20.3.linux-amd64.tar.gz
+RUN curl -LO https://golang.org/dl/go1.22.1.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzvf go1.22.1.linux-amd64.tar.gz
 
 ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GOPATH="${HOME}/go"
diff --git a/test/integration/test_app/sidecar-backend/go.mod b/test/integration/test_app/sidecar-backend/go.mod
index a226bf46..4d35c881 100644
--- a/test/integration/test_app/sidecar-backend/go.mod
+++ b/test/integration/test_app/sidecar-backend/go.mod
@@ -1,3 +1,3 @@
 module colorapp
 
-go 1.20
+go 1.22
diff --git a/test/integration/test_app/sidecar-frontend/Dockerfile b/test/integration/test_app/sidecar-frontend/Dockerfile
index 710034ca..919d974f 100644
--- a/test/integration/test_app/sidecar-frontend/Dockerfile
+++ b/test/integration/test_app/sidecar-frontend/Dockerfile
@@ -4,8 +4,8 @@ RUN yum update -y && \
     yum clean all && \
     rm -rf /var/cache/yum
 
-RUN curl -LO https://golang.org/dl/go1.20.3.linux-amd64.tar.gz && \
-    tar -C /usr/local -xzvf go1.20.3.linux-amd64.tar.gz
+RUN curl -LO https://golang.org/dl/go1.22.1.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzvf go1.22.1.linux-amd64.tar.gz
 
 ENV PATH="${PATH}:/usr/local/go/bin"
 ENV GOPATH="${HOME}/go"
diff --git a/test/integration/test_app/sidecar-frontend/go.mod b/test/integration/test_app/sidecar-frontend/go.mod
index eac966e2..91a0f575 100644
--- a/test/integration/test_app/sidecar-frontend/go.mod
+++ b/test/integration/test_app/sidecar-frontend/go.mod
@@ -1,6 +1,6 @@
 module feapp
 
-go 1.20
+go 1.22
 
 require (
 	k8s.io/apimachinery v0.25.2