From f894a8d41b04f08ecf9bccb8f331bf9bdc2543a7 Mon Sep 17 00:00:00 2001
From: Charles Sibbald <123247+casibbald@users.noreply.github.com>
Date: Mon, 16 Dec 2024 17:22:02 +0200
Subject: [PATCH] Codeql adhere to1.n.p syntax fixes (#4250)

* Update for 1.N.P Syntax
---
 .golangci.yaml                  | 4 ++--
 Makefile                        | 2 +-
 gitops-bucket-server.dockerfile | 2 +-
 gitops-server.dockerfile        | 2 +-
 go.mod                          | 2 +-
 test/library/libtest.dockerfile | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.golangci.yaml b/.golangci.yaml
index 98b38522a7..da40f69c9a 100644
--- a/.golangci.yaml
+++ b/.golangci.yaml
@@ -1,6 +1,6 @@
 run:
   timeout: 5m
-  go: '1.23'
+  go: '1.23.2'
 
 linters:
   disable-all: true
@@ -83,7 +83,7 @@ linters-settings:
       - performance
       - style
   gofumpt:
-    lang-version: "1.23"
+    lang-version: "1.23.2"
     extra-rules: true
   lll:
     line-length: 150
diff --git a/Makefile b/Makefile
index 4ccf7500b7..98078b4bfa 100644
--- a/Makefile
+++ b/Makefile
@@ -141,7 +141,7 @@ proto: ## Generate protobuf files
 # Sometimes we get whitespace differences when running this on linux vs mac
 # So here's how you can do it under linux, on mac
 proto-linux:
-	docker run --rm -v "$(CURRENT_DIR):/app" -w /app golang:1.20 make proto
+	docker run --rm -v "$(CURRENT_DIR):/app" -w /app golang:1.23.2 make proto
 
 ##@ Docker
 _docker:
diff --git a/gitops-bucket-server.dockerfile b/gitops-bucket-server.dockerfile
index d451af4965..e668624ba2 100644
--- a/gitops-bucket-server.dockerfile
+++ b/gitops-bucket-server.dockerfile
@@ -1,5 +1,5 @@
 # Go build
-FROM golang:1.23@sha256:574185e5c6b9d09873f455a7c205ea0514bfd99738c5dc7750196403a44ed4b7 AS go-build
+FROM golang:1.23.2@sha256:ad5c126b5cf501a8caef751a243bb717ec204ab1aa56dc41dc11be089fafcb4f AS go-build
 
 # Add known_hosts entries for GitHub and GitLab
 RUN mkdir ~/.ssh
diff --git a/gitops-server.dockerfile b/gitops-server.dockerfile
index 3b2d877b23..84bb7bc95c 100644
--- a/gitops-server.dockerfile
+++ b/gitops-server.dockerfile
@@ -15,7 +15,7 @@ COPY --chown=node:node ui /home/app/ui
 RUN --mount=type=cache,target=/home/app/ui/.parcel-cache make ui
 
 # Go build
-FROM golang:1.23@sha256:574185e5c6b9d09873f455a7c205ea0514bfd99738c5dc7750196403a44ed4b7 AS go-build
+FROM golang:1.23.2@sha256:ad5c126b5cf501a8caef751a243bb717ec204ab1aa56dc41dc11be089fafcb4f AS go-build
 
 # Add known_hosts entries for GitHub and GitLab
 RUN mkdir ~/.ssh
diff --git a/go.mod b/go.mod
index adcdfc2135..831c1a7c6f 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/weaveworks/weave-gitops
 
-go 1.23
+go 1.23.2
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
diff --git a/test/library/libtest.dockerfile b/test/library/libtest.dockerfile
index bb6a8aaacc..d8f2cab1ef 100644
--- a/test/library/libtest.dockerfile
+++ b/test/library/libtest.dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23@sha256:574185e5c6b9d09873f455a7c205ea0514bfd99738c5dc7750196403a44ed4b7
+FROM golang:1.23.2@sha256:ad5c126b5cf501a8caef751a243bb717ec204ab1aa56dc41dc11be089fafcb4f
 RUN apt-get update
 RUN apt-get -y install curl gnupg
 RUN curl -sL https://deb.nodesource.com/setup_14.x  | bash -