Merge pull request #480 from cpanato/fix

cpanato · web-flow · commit fc5ec371194d · 2025-01-15T11:15:36.000+01:00
update golangci-lint
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
         with:
-          go-version: '1.22'
+          go-version: '1.23'
           check-latest: true
 
       - name: Run GoReleaser
diff --git a/hack/verify-golangci-lint.sh b/hack/verify-golangci-lint.sh
@@ -18,7 +18,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-VERSION=v1.58.0
+VERSION=v1.63.4
 URL_BASE=https://raw.githubusercontent.com/golangci/golangci-lint
 URL=$URL_BASE/$VERSION/install.sh
 
diff --git a/klient/wait/conditions/conditions.go b/klient/wait/conditions/conditions.go
@@ -208,7 +208,7 @@ func (c *Condition) JobConditionMatch(job k8s.Object, conditionType batchv1.JobC
 		if err := c.resources.Get(ctx, job.GetName(), job.GetNamespace(), job); err != nil {
 			return false, err
 		}
-		status := job.(*batchv1.Job).Status
+		status := job.(*batchv1.Job).Status // nolint: errcheck
 		log.V(4).InfoS("Current Status of the job resource", "status", status)
 		for _, cond := range status.Conditions {
 			if cond.Type == conditionType && cond.Status == conditionState {
@@ -225,7 +225,7 @@ func (c *Condition) DeploymentConditionMatch(deployment k8s.Object, conditionTyp
 		if err := c.resources.Get(ctx, deployment.GetName(), deployment.GetNamespace(), deployment); err != nil {
 			return false, err
 		}
-		for _, cond := range deployment.(*appsv1.Deployment).Status.Conditions {
+		for _, cond := range deployment.(*appsv1.Deployment).Status.Conditions { // nolint: errcheck
 			if cond.Type == conditionType && cond.Status == conditionState {
 				done = true
 			}
@@ -242,7 +242,7 @@ func (c *Condition) PodConditionMatch(pod k8s.Object, conditionType v1.PodCondit
 		if err := c.resources.Get(ctx, pod.GetName(), pod.GetNamespace(), pod); err != nil {
 			return false, err
 		}
-		status := pod.(*v1.Pod).Status
+		status := pod.(*v1.Pod).Status // nolint: errcheck
 		log.V(4).InfoS("Current Status of the pod resource", "status", status)
 		for _, cond := range status.Conditions {
 			if cond.Type == conditionType && cond.Status == conditionState {
@@ -262,8 +262,8 @@ func (c *Condition) PodPhaseMatch(pod k8s.Object, phase v1.PodPhase) apimachiner
 		if err := c.resources.Get(context.Background(), pod.GetName(), pod.GetNamespace(), pod); err != nil {
 			return false, err
 		}
-		log.V(4).InfoS("Current phase", "phase", pod.(*v1.Pod).Status.Phase)
-		return pod.(*v1.Pod).Status.Phase == phase, nil
+		log.V(4).InfoS("Current phase", "phase", pod.(*v1.Pod).Status.Phase) // nolint: errcheck
+		return pod.(*v1.Pod).Status.Phase == phase, nil                      // nolint: errcheck
 	}
 }
 
@@ -310,7 +310,7 @@ func (c *Condition) DaemonSetReady(daemonset k8s.Object) apimachinerywait.Condit
 		if err := c.resources.Get(ctx, daemonset.GetName(), daemonset.GetNamespace(), daemonset); err != nil {
 			return false, err
 		}
-		status := daemonset.(*appsv1.DaemonSet).Status
+		status := daemonset.(*appsv1.DaemonSet).Status // nolint: errcheck
 		if status.NumberReady == status.DesiredNumberScheduled && status.NumberUnavailable == 0 {
 			done = true
 		}
diff --git a/klient/wait/wait_test.go b/klient/wait/wait_test.go
@@ -113,7 +113,7 @@ func TestResourceScaled(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	err = wait.For(conditions.New(getResourceManager()).ResourceScaled(deployment, func(object k8s.Object) int32 {
-		return object.(*appsv1.Deployment).Status.ReadyReplicas
+		return object.(*appsv1.Deployment).Status.ReadyReplicas // nolint: errcheck
 	}, 2), wait.WithContext(ctx))
 	if err != nil {
 		t.Error("failed waiting for resource to be scaled", err)
@@ -147,7 +147,7 @@ func TestResourceListMatchN(t *testing.T) {
 	createDeployment("d4", 5, t)
 	pods := &v1.PodList{}
 	err = wait.For(conditions.New(getResourceManager()).ResourceListMatchN(pods, 5, func(object k8s.Object) bool {
-		for _, c := range object.(*v1.Pod).Spec.Containers {
+		for _, c := range object.(*v1.Pod).Spec.Containers { // nolint: errcheck
 			if c.Image == "nginx" {
 				return true
 			}
@@ -175,7 +175,7 @@ func TestResourcesMatch(t *testing.T) {
 		},
 	}
 	err = wait.For(conditions.New(getResourceManager()).ResourcesMatch(pods, func(object k8s.Object) bool {
-		return object.(*v1.Pod).Status.Phase == v1.PodRunning
+		return object.(*v1.Pod).Status.Phase == v1.PodRunning // nolint: errcheck
 	}))
 	if err != nil {
 		t.Error("failed waiting for deployment pods to start running", err)
diff --git a/pkg/env/action_test.go b/pkg/env/action_test.go
@@ -76,7 +76,7 @@ func TestAction_Run(t *testing.T) {
 			setup: func(ctx context.Context, cfg *envconf.Config) (val int, err error) {
 				funcs := []types.EnvFunc{
 					func(ctx context.Context, cfg *envconf.Config) (context.Context, error) {
-						i := ctx.Value(&ctxTestKeyString{}).(int) + 2
+						i := ctx.Value(&ctxTestKeyString{}).(int) + 2 // nolint: errcheck
 						val = i
 						return ctx, nil
 					},
diff --git a/pkg/env/env_test.go b/pkg/env/env_test.go
@@ -317,7 +317,7 @@ func TestEnv_Test(t *testing.T) {
 				})
 
 				out := env.Test(t, f.Feature())
-				return out.Value(&ctxTestKeyString{}).([]string)
+				return out.Value(&ctxTestKeyString{}).([]string) // nolint: errcheck
 			},
 		},
 		{
@@ -392,7 +392,7 @@ func TestEnv_Test(t *testing.T) {
 				}).Feature()
 
 				out := env.Test(t, f1, f2)
-				return out.Value(&ctxTestKeyString{}).([]string)
+				return out.Value(&ctxTestKeyString{}).([]string) // nolint: errcheck
 			},
 		},
 		{
@@ -442,7 +442,7 @@ func TestEnv_Test(t *testing.T) {
 				}).Feature()
 
 				out := env.TestInParallel(t, f1, f2)
-				return out.Value(&ctxTestKeyString{}).([]string)
+				return out.Value(&ctxTestKeyString{}).([]string) // nolint: errcheck
 			},
 		},
 		{
@@ -928,15 +928,15 @@ func getFeaturesForTest() []features.Feature {
 		Assess("log a message", func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
 			t.Log("Running in parallel 1 1")
 			if i := ctx.Value(ctxRunsKeyString{}); i != nil {
-				return context.WithValue(ctx, ctxRunsKeyString{}, i.(int)+1)
+				return context.WithValue(ctx, ctxRunsKeyString{}, i.(int)+1) // nolint: errcheck
 			}
 			return context.WithValue(ctx, ctxRunsKeyString{}, 1)
 		}).Feature()
 	f2 := features.New("parallel one").
 		Assess("log a message", func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
 			t.Log("Running in parallel 1 2")
 			if i := ctx.Value(ctxRunsKeyString{}); i != nil {
-				return context.WithValue(ctx, ctxRunsKeyString{}, i.(int)+1)
+				return context.WithValue(ctx, ctxRunsKeyString{}, i.(int)+1) // nolint: errcheck
 			}
 			return context.WithValue(ctx, ctxRunsKeyString{}, 1)
 		}).Feature()
diff --git a/pkg/envfuncs/kind_funcs.go b/pkg/envfuncs/kind_funcs.go
@@ -27,7 +27,7 @@ import (
 func GetKindClusterFromContext(ctx context.Context, clusterName string) (*kind.Cluster, bool) {
 	provider, ok := GetClusterFromContext(ctx, clusterName)
 	if ok {
-		return provider.(*kind.Cluster), ok
+		return provider.(*kind.Cluster), ok // nolint: errcheck
 	}
 	return nil, ok
 }

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ func (c *Condition) JobConditionMatch(job k8s.Object, conditionType batchv1.JobC`
`208`	`208`	`if err := c.resources.Get(ctx, job.GetName(), job.GetNamespace(), job); err != nil {`
`209`	`209`	`return false, err`
`210`	`210`	`}`
`211`		`- status := job.(*batchv1.Job).Status`
	`211`	`+ status := job.(*batchv1.Job).Status // nolint: errcheck`
`212`	`212`	`log.V(4).InfoS("Current Status of the job resource", "status", status)`
`213`	`213`	`for _, cond := range status.Conditions {`
`214`	`214`	`if cond.Type == conditionType && cond.Status == conditionState {`
`@@ -225,7 +225,7 @@ func (c *Condition) DeploymentConditionMatch(deployment k8s.Object, conditionTyp`
`225`	`225`	`if err := c.resources.Get(ctx, deployment.GetName(), deployment.GetNamespace(), deployment); err != nil {`
`226`	`226`	`return false, err`
`227`	`227`	`}`
`228`		`- for _, cond := range deployment.(*appsv1.Deployment).Status.Conditions {`
	`228`	`+ for _, cond := range deployment.(*appsv1.Deployment).Status.Conditions { // nolint: errcheck`
`229`	`229`	`if cond.Type == conditionType && cond.Status == conditionState {`
`230`	`230`	`done = true`
`231`	`231`	`}`
`@@ -242,7 +242,7 @@ func (c *Condition) PodConditionMatch(pod k8s.Object, conditionType v1.PodCondit`
`242`	`242`	`if err := c.resources.Get(ctx, pod.GetName(), pod.GetNamespace(), pod); err != nil {`
`243`	`243`	`return false, err`
`244`	`244`	`}`
`245`		`- status := pod.(*v1.Pod).Status`
	`245`	`+ status := pod.(*v1.Pod).Status // nolint: errcheck`
`246`	`246`	`log.V(4).InfoS("Current Status of the pod resource", "status", status)`
`247`	`247`	`for _, cond := range status.Conditions {`
`248`	`248`	`if cond.Type == conditionType && cond.Status == conditionState {`
`@@ -262,8 +262,8 @@ func (c *Condition) PodPhaseMatch(pod k8s.Object, phase v1.PodPhase) apimachiner`
`262`	`262`	`if err := c.resources.Get(context.Background(), pod.GetName(), pod.GetNamespace(), pod); err != nil {`
`263`	`263`	`return false, err`
`264`	`264`	`}`
`265`		`- log.V(4).InfoS("Current phase", "phase", pod.(*v1.Pod).Status.Phase)`
`266`		`- return pod.(*v1.Pod).Status.Phase == phase, nil`
	`265`	`+ log.V(4).InfoS("Current phase", "phase", pod.(*v1.Pod).Status.Phase) // nolint: errcheck`
	`266`	`+ return pod.(*v1.Pod).Status.Phase == phase, nil // nolint: errcheck`
`267`	`267`	`}`
`268`	`268`	`}`
`269`	`269`
`@@ -310,7 +310,7 @@ func (c *Condition) DaemonSetReady(daemonset k8s.Object) apimachinerywait.Condit`
`310`	`310`	`if err := c.resources.Get(ctx, daemonset.GetName(), daemonset.GetNamespace(), daemonset); err != nil {`
`311`	`311`	`return false, err`
`312`	`312`	`}`
`313`		`- status := daemonset.(*appsv1.DaemonSet).Status`
	`313`	`+ status := daemonset.(*appsv1.DaemonSet).Status // nolint: errcheck`
`314`	`314`	`if status.NumberReady == status.DesiredNumberScheduled && status.NumberUnavailable == 0 {`
`315`	`315`	`done = true`
`316`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import (`
`27`	`27`	`func GetKindClusterFromContext(ctx context.Context, clusterName string) (*kind.Cluster, bool) {`
`28`	`28`	`provider, ok := GetClusterFromContext(ctx, clusterName)`
`29`	`29`	`if ok {`
`30`		`- return provider.(*kind.Cluster), ok`
	`30`	`+ return provider.(*kind.Cluster), ok // nolint: errcheck`
`31`	`31`	`}`
`32`	`32`	`return nil, ok`
`33`	`33`	`}`