From 00e71abf5510889e1d05940ca3db4dbb6ef4158b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Bedn=C3=A1=C5=99?= <jakub.bednar@gmail.com>
Date: Fri, 20 Sep 2024 14:05:55 +0200
Subject: [PATCH] chore(build): upgrade Go to 1.22.7 (#6108)

* chore: upgrade Ubuntu image due the EOL
---
 .circleci/config.yml                            | 16 ++++++++--------
 .github/workflows/chronograf-cypress-tests.yaml |  2 +-
 etc/Dockerfile_build                            |  2 +-
 etc/scripts/docker/run.sh                       |  2 +-
 go.mod                                          |  2 +-
 server/protoboards_test.go                      |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b2c7185406..bcba211060 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,10 +72,10 @@ workflows:
 jobs:
   build:
     environment:
-      DOCKER_TAG: chronograf-20240710
+      DOCKER_TAG: chronograf-20240919
       GO111MODULE: "ON"
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2204:current
     steps:
       - checkout
       - run: |
@@ -96,10 +96,10 @@ jobs:
 
   deploy-nightly:
     environment:
-      DOCKER_TAG: chronograf-20240710
+      DOCKER_TAG: chronograf-20240919
       GO111MODULE: "ON"
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2204:current
     steps:
       - attach_workspace:
           at: /home/circleci
@@ -125,10 +125,10 @@ jobs:
 
   deploy-pre-release:
     environment:
-      DOCKER_TAG: chronograf-20240710
+      DOCKER_TAG: chronograf-20240919
       GO111MODULE: "ON"
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2204:current
     steps:
       - attach_workspace:
           at: /home/circleci
@@ -160,10 +160,10 @@ jobs:
 
   deploy-release:
     environment:
-      DOCKER_TAG: chronograf-20240710
+      DOCKER_TAG: chronograf-20240919
       GO111MODULE: "ON"
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2204:current
     steps:
       - attach_workspace:
           at: /home/circleci
diff --git a/.github/workflows/chronograf-cypress-tests.yaml b/.github/workflows/chronograf-cypress-tests.yaml
index 9fb137e20f..84255708e5 100644
--- a/.github/workflows/chronograf-cypress-tests.yaml
+++ b/.github/workflows/chronograf-cypress-tests.yaml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.21.12'
+          go-version: '1.22.7'
 
       - uses: actions/setup-node@v2
         with:
diff --git a/etc/Dockerfile_build b/etc/Dockerfile_build
index b59ca9cedf..ec708f9c57 100644
--- a/etc/Dockerfile_build
+++ b/etc/Dockerfile_build
@@ -34,7 +34,7 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
 
 # Install go
 ENV GOPATH /root/go
-ENV GO_VERSION 1.21.12
+ENV GO_VERSION 1.22.7
 ENV GO_ARCH amd64
 ENV GO111MODULES ON
 RUN wget https://golang.org/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz; \
diff --git a/etc/scripts/docker/run.sh b/etc/scripts/docker/run.sh
index 99296fa42d..f62db82f00 100755
--- a/etc/scripts/docker/run.sh
+++ b/etc/scripts/docker/run.sh
@@ -14,7 +14,7 @@ test -z $SSH_KEY_PATH && SSH_KEY_PATH="$HOME/.ssh/id_rsa"
 echo "Using SSH key located at: $SSH_KEY_PATH"
 
 # Default docker tag if not specified
-test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20240710"
+test -z "$DOCKER_TAG" && DOCKER_TAG="chronograf-20240919"
 
 docker run \
        -e AWS_ACCESS_KEY_ID \
diff --git a/go.mod b/go.mod
index 92f9a47c12..401f3d356f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/influxdata/chronograf
 
-go 1.21
+go 1.22
 
 require (
 	cloud.google.com/go/bigtable v1.10.0 // indirect
diff --git a/server/protoboards_test.go b/server/protoboards_test.go
index 9c850f5709..ad6750660c 100644
--- a/server/protoboards_test.go
+++ b/server/protoboards_test.go
@@ -239,7 +239,7 @@ func Test_ProtoboardsID(t *testing.T) {
 			wants: wants{
 				statusCode:  http.StatusOK,
 				contentType: "application/json",
-				body:        `{"id":"1","meta":{"name":"","version":"","dashboardVersion":""},"data":{"cells":null},"links":{"self":"/chronograf/v1/protoboards/1"}}`,
+				body:        `{"id":"1","meta":{"name":"","version":"","measurements":null,"dashboardVersion":""},"data":{"cells":null,"templates":null},"links":{"self":"/chronograf/v1/protoboards/1"}}`,
 			},
 			args: args{
 				id: "1",