From 93e44e9bae18eb41a99050b90bc9e522e4ea4f21 Mon Sep 17 00:00:00 2001
From: Srinandan Sridhar <13950006+srinandan@users.noreply.github.com>
Date: Mon, 22 Jan 2024 13:42:39 -0800
Subject: [PATCH 1/2] chore: use go lang 1.21 #376 (#377)

---
 .github/workflows/golangci-lint.yml | 4 ++--
 go.mod                              | 2 +-
 go.sum                              | 1 +
 internal/apiclient/go.mod           | 2 +-
 internal/bundlegen/go.mod           | 2 +-
 internal/client/go.mod              | 2 +-
 internal/clilog/go.mod              | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index cec902037..d66c82b8f 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -27,10 +27,10 @@ jobs:
     steps:
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
           cache: false
       - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: latest
\ No newline at end of file
+          version: latest
diff --git a/go.mod b/go.mod
index e719b6200..3bf6e95a3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/apigee/apigeecli
 
-go 1.20
+go 1.21
 
 require internal/apiclient v1.0.0
 
diff --git a/go.sum b/go.sum
index a7a3d692d..d38e2571d 100644
--- a/go.sum
+++ b/go.sum
@@ -30,6 +30,7 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg=
+github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY=
 github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
diff --git a/internal/apiclient/go.mod b/internal/apiclient/go.mod
index d05eb46dc..cfb291e5f 100644
--- a/internal/apiclient/go.mod
+++ b/internal/apiclient/go.mod
@@ -1,3 +1,3 @@
 module apiclient
 
-go 1.20
\ No newline at end of file
+go 1.21
diff --git a/internal/bundlegen/go.mod b/internal/bundlegen/go.mod
index e1ceae6ef..85e3e6711 100644
--- a/internal/bundlegen/go.mod
+++ b/internal/bundlegen/go.mod
@@ -1,3 +1,3 @@
 module bundlegen
 
-go 1.20
\ No newline at end of file
+go 1.21
diff --git a/internal/client/go.mod b/internal/client/go.mod
index 27b6b3405..e63a869f8 100644
--- a/internal/client/go.mod
+++ b/internal/client/go.mod
@@ -1,3 +1,3 @@
 module client
 
-go 1.20
\ No newline at end of file
+go 1.21
diff --git a/internal/clilog/go.mod b/internal/clilog/go.mod
index 12cdd3c00..315f086d3 100644
--- a/internal/clilog/go.mod
+++ b/internal/clilog/go.mod
@@ -1,3 +1,3 @@
 module clilog
 
-go 1.20
\ No newline at end of file
+go 1.21

From 06a5913c33c97d3945af92d2171d53efc3947e8d Mon Sep 17 00:00:00 2001
From: Srinandan Sridhar <13950006+srinandan@users.noreply.github.com>
Date: Tue, 23 Jan 2024 08:52:09 -0800
Subject: [PATCH 2/2] Update Dockerfile to use go 1.21 (#378)

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6b412d8a9..c33ad2937 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM golang:1.20 as builder
+FROM golang:1.21 as builder
 
 ARG TAG
 ARG COMMIT
@@ -47,4 +47,4 @@ COPY LICENSE.txt /
 COPY third-party-licenses.txt /
 COPY --from=jq /jq /usr/local/bin/jq
 
-ENTRYPOINT [ "apigeecli" ]
\ No newline at end of file
+ENTRYPOINT [ "apigeecli" ]