From bc5cf811a0e9e3a7fb82582e7ed180b6bcc13e04 Mon Sep 17 00:00:00 2001
From: Or Shachar <or.shachar@wiz.io>
Date: Fri, 25 Oct 2024 09:22:52 -0400
Subject: [PATCH] chore: update to Golang 1.23 (#485)

* chore: update to Golang 1.23

* chore: configure cci to build with 1.23

Signed-off-by: Or Shachar <orchoock@gmail.com>

* Update config.yml

---------

Signed-off-by: Or Shachar <orchoock@gmail.com>
Co-authored-by: Scott Blum <dragonsinth@gmail.com>
---
 .circleci/config.yml | 23 +++++++----------------
 Dockerfile           |  2 +-
 Makefile             |  4 ++--
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index defe0a84..30441dd2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,22 +9,22 @@ shared_configs:
 # Use the latest 2.1 version of CircleCI pipeline process engine. See: https://circleci.com/docs/2.0/configuration-reference
 version: 2.1
 jobs:
-  build-1-19:
+  build-1-21:
     working_directory: ~/repo
     docker:
-      - image: cimg/go:1.19
+      - image: cimg/go:1.21
     steps: *simple_job_steps
 
-  build-1-20:
+  build-1-22:
     working_directory: ~/repo
     docker:
-      - image: cimg/go:1.20
+      - image: cimg/go:1.22
     steps: *simple_job_steps
 
-  build-1-21:
+  build-1-23:
     working_directory: ~/repo
     docker:
-      - image: cimg/go:1.21
+      - image: cimg/go:1.23
     steps:
       - checkout
       - run:
@@ -32,18 +32,9 @@ jobs:
           command: |
             make ci
 
-  # TODO: Need updates to some static analyzer tools to support 1.22. After those
-  #       are updated, move the full linting from 1.21 to this latest release.
-  build-1-22:
-    working_directory: ~/repo
-    docker:
-      - image: cimg/go:1.22
-    steps: *simple_job_steps
-
 workflows:
   pr-build-test:
     jobs:
-      - build-1-19
-      - build-1-20
       - build-1-21
       - build-1-22
+      - build-1-23
diff --git a/Dockerfile b/Dockerfile
index e5515d0b..1d6ac4c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21-alpine as builder
+FROM golang:1.23-alpine as builder
 MAINTAINER Fullstory Engineering
 
 # create non-privileged group and user
diff --git a/Makefile b/Makefile
index 45081232..18d80801 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ vet:
 
 .PHONY: staticcheck
 staticcheck:
-	@go install honnef.co/go/tools/cmd/staticcheck@v0.4.3
+	@go install honnef.co/go/tools/cmd/staticcheck@v0.5.1
 	staticcheck ./...
 
 .PHONY: ineffassign
@@ -77,7 +77,7 @@ ineffassign:
 
 .PHONY: predeclared
 predeclared:
-	@go install github.com/nishanths/predeclared@5f2f810c9ae6
+	@go install github.com/nishanths/predeclared@245576f9a85c
 	predeclared ./...
 
 # Intentionally omitted from CI, but target here for ad-hoc reports.