🌱 Bump to go1.23 (#195)

perdasilva · Per Goncalves da Silva · web-flow · commit be2540bdac3f · 2025-01-13T09:07:57.000Z
* Bump to go1.23

Signed-off-by: Per Goncalves da Silva &lt;pegoncal@redhat.com&gt;

* Update bingo deps

Signed-off-by: Per Goncalves da Silva &lt;pegoncal@redhat.com&gt;

* Address lint errors

Signed-off-by: Per Goncalves da Silva &lt;pegoncal@redhat.com&gt;

* Fix up golangci-lint version in GHA

Signed-off-by: Per Goncalves da Silva &lt;pegoncal@redhat.com&gt;

* address lint issues

Signed-off-by: Per Goncalves da Silva &lt;pegoncal@redhat.com&gt;

---------

Signed-off-by: Per Goncalves da Silva &lt;pegoncal@redhat.com&gt;
Co-authored-by: Per Goncalves da Silva &lt;pegoncal@redhat.com&gt;
diff --git a/.bingo/Variables.mk b/.bingo/Variables.mk
@@ -23,9 +23,9 @@ $(BINGO): $(BINGO_DIR)/bingo.mod
 	@echo "(re)installing $(GOBIN)/bingo-v0.9.0"
 	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=bingo.mod -o=$(GOBIN)/bingo-v0.9.0 "github.com/bwplotka/bingo"
 
-GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.60.3
+GOLANGCI_LINT := $(GOBIN)/golangci-lint-v1.63.4
 $(GOLANGCI_LINT): $(BINGO_DIR)/golangci-lint.mod
 	@# Install binary/ries using Go 1.14+ build command. This is using bwplotka/bingo-controlled, separate go module with pinned dependencies.
-	@echo "(re)installing $(GOBIN)/golangci-lint-v1.60.3"
-	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.60.3 "github.com/golangci/golangci-lint/cmd/golangci-lint"
+	@echo "(re)installing $(GOBIN)/golangci-lint-v1.63.4"
+	@cd $(BINGO_DIR) && GOWORK=off $(GO) build -mod=mod -modfile=golangci-lint.mod -o=$(GOBIN)/golangci-lint-v1.63.4 "github.com/golangci/golangci-lint/cmd/golangci-lint"
 
diff --git a/.bingo/golangci-lint.mod b/.bingo/golangci-lint.mod
@@ -4,4 +4,4 @@ go 1.22.1
 
 toolchain go1.22.3
 
-require github.com/golangci/golangci-lint v1.60.3 // cmd/golangci-lint
+require github.com/golangci/golangci-lint v1.63.4 // cmd/golangci-lint
diff --git a/.bingo/golangci-lint.sum b/.bingo/golangci-lint.sum
diff --git a/.bingo/variables.env b/.bingo/variables.env
@@ -10,5 +10,5 @@ fi
 
 BINGO="${GOBIN}/bingo-v0.9.0"
 
-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.60.3"
+GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.63.4"
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
         go-version-file: "go.mod"
     - uses: golangci/golangci-lint-action@v6
       with:
-        version: v1.57
+        version: v1.63.4
         args: --timeout 5m
 
   go-apidiff:
diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module github.com/operator-framework/operator-lib
 
-go 1.22.0
+go 1.23.0
+
+toolchain go1.23.4
 
 require (
 	github.com/go-logr/logr v1.4.2
diff --git a/internal/annotation/suite_test.go b/internal/annotation/suite_test.go
@@ -34,10 +34,10 @@ func makeCreateEventFor(obj client.Object) event.CreateEvent {
 	return e
 }
 
-func makeUpdateEventFor(old, new client.Object) event.UpdateEvent {
+func makeUpdateEventFor(oldObj, newObj client.Object) event.UpdateEvent {
 	var e event.UpdateEvent
-	e.ObjectOld = old
-	e.ObjectNew = new
+	e.ObjectOld = oldObj
+	e.ObjectNew = newObj
 	return e
 }
 
diff --git a/predicate/predicate_suite_test.go b/predicate/predicate_suite_test.go
@@ -34,10 +34,10 @@ func makeCreateEventFor(obj client.Object) event.CreateEvent {
 	return e
 }
 
-func makeUpdateEventFor(old, new client.Object) event.UpdateEvent {
+func makeUpdateEventFor(oldObj, newObj client.Object) event.UpdateEvent {
 	var e event.UpdateEvent
-	e.ObjectOld = old
-	e.ObjectNew = new
+	e.ObjectOld = oldObj
+	e.ObjectNew = newObj
 	return e
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,4 @@ go 1.22.1`
`4`	`4`
`5`	`5`	`toolchain go1.22.3`
`6`	`6`
`7`		`-require github.com/golangci/golangci-lint v1.60.3 // cmd/golangci-lint`
	`7`	`+require github.com/golangci/golangci-lint v1.63.4 // cmd/golangci-lint`
Original file line number	Diff line number	Diff line change
`@@ -10,5 +10,5 @@ fi`
`10`	`10`
`11`	`11`	`BINGO="${GOBIN}/bingo-v0.9.0"`
`12`	`12`
`13`		`-GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.60.3"`
	`13`	`+GOLANGCI_LINT="${GOBIN}/golangci-lint-v1.63.4"`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,10 @@ func makeCreateEventFor(obj client.Object) event.CreateEvent {`
`34`	`34`	`return e`
`35`	`35`	`}`
`36`	`36`
`37`		`-func makeUpdateEventFor(old, new client.Object) event.UpdateEvent {`
	`37`	`+func makeUpdateEventFor(oldObj, newObj client.Object) event.UpdateEvent {`
`38`	`38`	`var e event.UpdateEvent`
`39`		`- e.ObjectOld = old`
`40`		`- e.ObjectNew = new`
	`39`	`+ e.ObjectOld = oldObj`
	`40`	`+ e.ObjectNew = newObj`
`41`	`41`	`return e`
`42`	`42`	`}`
`43`	`43`