From a7866a179943fec1659a403b079a98cbb2dd1f13 Mon Sep 17 00:00:00 2001
From: Marko Juraga <mjuraga@haproxy.com>
Date: Thu, 4 Apr 2024 14:49:35 +0200
Subject: [PATCH] BUILD/MEDIUM: go: upgrade golang to 1.22

---
 .gitlab-ci.yml                | 37 ++++++++++++++++++-----------------
 e2e/libs/resource_client.bash |  6 +++---
 go.mod                        |  2 +-
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 22960814..cbf7bbe6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,15 +6,16 @@ variables:
   DOCKER_HOST: tcp://docker:2375
   DOCKER_BASE_IMAGE: $CI_REGISTRY_GO/haproxy-debian
   BATS_VERSION: v1.4.1
-  GO_VERSION: '1.21'
+  GO_VERSION: "1.22"
+  DOCKER_VERSION: "26.0"
 
 diff:
   stage: lint
   image:
-    name: $CI_REGISTRY_GO/docker:stable-go$GO_VERSION
-    entrypoint: [ "" ]
+    name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-go$GO_VERSION
+    entrypoint: [""]
   services:
-    - name: $CI_REGISTRY_GO/docker:20.10.5-dind
+    - name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-dind
       alias: docker
   tags:
     - go
@@ -75,7 +76,7 @@ build:
       - build
   image:
     name: $CI_REGISTRY_GO/golang:$GO_VERSION
-    entrypoint: [ "" ]
+    entrypoint: [""]
   tags:
     - go
   script:
@@ -92,10 +93,10 @@ build:
     paths:
       - build
   image:
-    name: $CI_REGISTRY_GO/docker:stable
-    entrypoint: [ "" ]
+    name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION
+    entrypoint: [""]
   services:
-    - name: $CI_REGISTRY_GO/docker:24.0-dind
+    - name: $CI_REGISTRY_GO/docker:$DOCKER_VERSION-dind
       alias: docker
   variables:
     LOCAL_IP_ADDRESS: docker
@@ -115,59 +116,59 @@ HAProxy_2_1:
   extends: .e2e
   parallel:
     matrix:
-      - TESTPART: [ "1/2", "2/2" ]
+      - TESTPART: ["1/2", "2/2"]
         HAPROXY_VERSION: "2.1"
 HAProxy_2_2:
   extends: .e2e
   parallel:
     matrix:
-      - TESTPART: [ "1/2", "2/2" ]
+      - TESTPART: ["1/2", "2/2"]
         HAPROXY_VERSION: "2.2"
 HAProxy_2_3:
   extends: .e2e
   parallel:
     matrix:
-      - TESTPART: [ "1/2", "2/2" ]
+      - TESTPART: ["1/2", "2/2"]
         HAPROXY_VERSION: "2.3"
 HAProxy_2_4:
   extends: .e2e
   parallel:
     matrix:
-      - TESTPART: [ "1/2", "2/2" ]
+      - TESTPART: ["1/2", "2/2"]
         HAPROXY_VERSION: "2.4"
 HAProxy_2_5:
   extends: .e2e
   parallel:
     matrix:
-      - TESTPART: [ "1/2", "2/2" ]
+      - TESTPART: ["1/2", "2/2"]
         HAPROXY_VERSION: "2.5"
 HAProxy_2_6:
   extends: .e2e
   parallel:
     matrix:
-      - TESTPART: [ "1/2", "2/2" ]
+      - TESTPART: ["1/2", "2/2"]
         HAPROXY_VERSION: "2.6"
 HAProxy_2_7:
   extends: .e2e
   parallel:
     matrix:
-      - TESTPART: [ "1/2", "2/2" ]
+      - TESTPART: ["1/2", "2/2"]
         HAPROXY_VERSION: "2.7"
 HAProxy_2_8:
   extends: .e2e
   parallel:
     matrix:
-      - TESTPART: [ "1/2", "2/2" ]
+      - TESTPART: ["1/2", "2/2"]
         HAPROXY_VERSION: "2.8"
 HAProxy_2_9:
   extends: .e2e
   parallel:
     matrix:
-      - TESTPART: [ "1/2", "2/2" ]
+      - TESTPART: ["1/2", "2/2"]
         HAPROXY_VERSION: "2.9"
 HAProxy_3_0:
   extends: .e2e
   parallel:
     matrix:
-      - TESTPART: [ "1/2", "2/2" ]
+      - TESTPART: ["1/2", "2/2"]
         HAPROXY_VERSION: "3.0"
diff --git a/e2e/libs/resource_client.bash b/e2e/libs/resource_client.bash
index a89729c5..5fc3588f 100644
--- a/e2e/libs/resource_client.bash
+++ b/e2e/libs/resource_client.bash
@@ -37,10 +37,10 @@ function resource_put() {
 }
 
 function resource_delete() {
-  local endpoint;  endpoint="$1"; shift
+	local endpoint;  endpoint="$1"; shift
 	local qs_params; qs_params="$1"
-    get_version
-	run dpa_curl DELETE "$endpoint?$qs_params&version=${VERSION}" "$data"
+	get_version
+	run dpa_curl DELETE "$endpoint?$qs_params&version=${VERSION}"
 	assert_success
 	dpa_curl_status_body '$output'
 }
diff --git a/go.mod b/go.mod
index fe98d88d..d9a20322 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/haproxytech/dataplaneapi
 
-go 1.21
+go 1.22
 
 require (
 	github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5