chore(deps): bump golang from 1.22.4 to 1.23.0 (#1359)

* chore(deps): bump golang from 1.22.4 to 1.23.0 Bumps golang from 1.22.4 to 1.23.0. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore: fix linter issues --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Patryk Małek <patryk.malek@konghq.com>
Kong · Aug 21, 2024 · bbe779d · bbe779d
1 parent e66ed5e
commit bbe779d
Show file tree

Hide file tree

Showing 11 changed files with 91 additions and 224 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -8,7 +8,7 @@ linters:
   - dogsled
   - durationcheck
   - exhaustive
-  - exportloopref
+  - copyloopvar
   - gci
   - goconst
   - gofmt
@@ -19,7 +19,9 @@ linters:
   - govet
   - importas
   - lll
-  - megacheck
+  - gosimple
+  - staticcheck
+  - unused
   - misspell
   - nakedret
   - nilerr

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.22.4 AS build
+FROM golang:1.23.0 AS build
 WORKDIR /deck
 COPY go.mod ./
 COPY go.sum ./

diff --git a/cmd/common.go b/cmd/common.go
@@ -515,11 +515,11 @@ func checkForRBACResources(content reconcilerUtils.KongRawState,
 		common := "At a time, state file(s) must entirely consist of either proxy " +
 			"configuration or RBAC configuration."
 		if rbacResourcesOnly {
-			return fmt.Errorf("When --rbac-resources-only is used, state file(s) " +
-				"cannot contain any resources other than RBAC resources. " + common)
+			return fmt.Errorf("when --rbac-resources-only is used, state file(s) "+
+				"cannot contain any resources other than RBAC resources. %s", common)
 		}
-		return fmt.Errorf("State file(s) contains RBAC resources. " +
-			"Please use --rbac-resources-only flag to manage these resources. " + common)
+		return fmt.Errorf("state file(s) contains RBAC resources. "+
+			"Please use --rbac-resources-only flag to manage these resources. %s", common)
 	}
 	return nil
 }

diff --git a/convert/convert_test.go b/convert/convert_test.go
@@ -367,9 +367,8 @@ func Test_Convert(t *testing.T) {
 
 func wipeServiceID(content *file.Content) *file.Content {
 	result := content.DeepCopy()
-	result.ServicePackages = nil
+	result.ServicePackages = make([]file.FServicePackage, 0, len(content.ServicePackages))
 	for _, sp := range content.ServicePackages {
-		sp := sp
 		sp = zeroOutID(sp)
 		result.ServicePackages = append(result.ServicePackages, sp)
 	}

diff --git a/kong2kic/route.go b/kong2kic/route.go
@@ -154,7 +154,7 @@ func populateKICIngressesWithAnnotations(content *file.Content, kicContent *KICC
 									Service: &k8snetv1.IngressServiceBackend{
 										Name: *service.Name,
 										Port: k8snetv1.ServiceBackendPort{
-											Number: int32(*service.Port),
+											Number: int32(*service.Port), //nolint:gosec
 										},
 									},
 								},
@@ -203,7 +203,7 @@ func populateKICIngressesWithAnnotations(content *file.Content, kicContent *KICC
 										Service: &k8snetv1.IngressServiceBackend{
 											Name: *service.Name,
 											Port: k8snetv1.ServiceBackendPort{
-												Number: int32(*service.Port),
+												Number: int32(*service.Port), //nolint:gosec
 											},
 										},
 									},
@@ -394,7 +394,7 @@ func populateKICIngressesWithGatewayAPI(content *file.Content, kicContent *KICCo
 				},
 			}
 			if service.Port != nil {
-				portNumber := k8sgwapiv1.PortNumber(*service.Port)
+				portNumber := k8sgwapiv1.PortNumber(*service.Port) //nolint:gosec
 				backendRef.Port = &portNumber
 			}
 

diff --git a/kong2kic/service.go b/kong2kic/service.go
@@ -44,9 +44,11 @@ func populateKICServicesWithAnnotations(content *file.Content, kicContent *KICCo
 
 		if service.Port != nil {
 			sPort := k8scorev1.ServicePort{
-				Protocol:   protocol,
-				Port:       int32(*service.Port),
-				TargetPort: intstr.IntOrString{IntVal: int32(*service.Port)},
+				Protocol: protocol,
+				Port:     int32(*service.Port), //nolint:gosec
+				TargetPort: intstr.IntOrString{
+					IntVal: int32(*service.Port), //nolint:gosec
+				},
 			}
 			k8sService.Spec.Ports = append(k8sService.Spec.Ports, sPort)
 		}

diff --git a/kong2kic/writer.go b/kong2kic/writer.go
@@ -36,7 +36,7 @@ func WriteContentToFile(content *file.Content, filename string, format file.Form
 			return err
 		}
 	default:
-		return fmt.Errorf("unknown file format: " + string(format))
+		return fmt.Errorf("unknown file format: %s", format)
 	}
 
 	if filename == "-" {

diff --git a/tests/integration/lint_test.go b/tests/integration/lint_test.go
@@ -157,7 +157,7 @@ func Test_LintStructured(t *testing.T) {
 				cmpopts.EquateEmpty(),
 			}
 			if diff := cmp.Diff(outputErrors, expectedErrors, cmpOpts...); diff != "" {
-				t.Errorf(diff)
+				t.Errorf("got unexpected diff\n:%s", diff)
 			}
 		})
 	}

diff --git a/tests/integration/reset_test.go b/tests/integration/reset_test.go
@@ -39,9 +39,7 @@ u8S6yNlu2Q==
 func Test_Reset_SkipCACert_2x(t *testing.T) {
 	// setup stage
 	client, err := getTestClient()
-	if err != nil {
-		t.Errorf(err.Error())
-	}
+	require.NoError(t, err)
 
 	tests := []struct {
 		name          string
@@ -75,9 +73,7 @@ func Test_Reset_SkipCACert_2x(t *testing.T) {
 func Test_Reset_SkipCACert_3x(t *testing.T) {
 	// setup stage
 	client, err := getTestClient()
-	if err != nil {
-		t.Errorf(err.Error())
-	}
+	require.NoError(t, err)
 
 	tests := []struct {
 		name          string
@@ -113,9 +109,7 @@ func Test_Reset_ConsumerGroupConsumersWithCustomID(t *testing.T) {
 	setup(t)
 
 	client, err := getTestClient()
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
+	require.NoError(t, err)
 
 	require.NoError(t, sync("testdata/sync/028-consumer-group-consumers-custom_id/kong.yaml"))
 	reset(t)