fixes for golangci-lint/gosec

pkg/shp/cmd/build/run_test.go

@@ -144,7 +144,7 @@ func TestStartBuildRunFollowLog(t *testing.T) {
 		cmd.Cmd().ExecuteC()
 		pm := genericclioptions.NewConfigFlags(true)
 		if len(test.to) > 0 {
-			pm.Timeout = &test.to
+			*pm.Timeout = test.to
 		}
 		failureDuration := 1 * time.Millisecond
 		param := params.NewParamsForTest(kclientset, shpclientset, pm, metav1.NamespaceDefault, &failureDuration, &failureDuration)

pkg/shp/cmd/buildrun/logs.go

@@ -1,6 +1,7 @@
 package buildrun
 
 import (
+	"context"
 	"fmt"
 	"strings"
 	"time"
@@ -85,7 +86,8 @@ func (c *LogsCommand) Run(params *params.Params, ioStreams *genericclioptions.IO
 	// is invoked.
 	justGetLogs := false
 	var pods *corev1.PodList
-	err = wait.PollImmediate(1*time.Second, 10*time.Second, func() (done bool, err error) {
+	var ctx context.Context
+	err = wait.PollUntilContextTimeout(ctx, 1*time.Second, 10*time.Second, true, func(context.Context) (done bool, err error) {
 		if pods, err = clientset.CoreV1().Pods(params.Namespace()).List(c.cmd.Context(), lo); err != nil {
 			fmt.Fprintf(ioStreams.ErrOut, "error listing Pods for BuildRun %q: %s\n", c.name, err.Error())
 			return false, nil

pkg/shp/cmd/buildrun/logs_test.go

@@ -178,7 +178,7 @@ func TestStreamBuildRunFollowLogs(t *testing.T) {
 		cmd.Cmd().ExecuteC()
 		pm := genericclioptions.NewConfigFlags(true)
 		if len(test.to) > 0 {
-			pm.Timeout = &test.to
+			*pm.Timeout = test.to
 		}
 		param := params.NewParamsForTest(kclientset, shpclientset, pm, metav1.NamespaceDefault, nil, nil)
 

pkg/shp/cmd/follower/follow.go

@@ -141,7 +141,8 @@ func (f *Follower) OnEvent(pod *corev1.Pod) error {
 	case corev1.PodFailed:
 		msg := ""
 		var br *buildv1alpha1.BuildRun
-		err := wait.PollImmediate(f.failPollInterval, f.failPollTimeout, func() (done bool, err error) {
+		var ctx context.Context
+		err := wait.PollUntilContextTimeout(ctx, f.failPollInterval, f.failPollTimeout, true, func(context.Context) (done bool, err error) {
 			brClient := f.buildClientset.ShipwrightV1alpha1().BuildRuns(pod.Namespace)
 			br, err = brClient.Get(f.ctx, f.buildRun.Name, metav1.GetOptions{})
 			if err != nil {

pkg/shp/flags/build.go

@@ -6,7 +6,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func pointerUInt(value uint) *uint {
@@ -20,22 +20,22 @@ func BuildSpecFromFlags(flags *pflag.FlagSet) *buildv1alpha1.BuildSpec {
 	spec := &buildv1alpha1.BuildSpec{
 		Source: buildv1alpha1.Source{
 			Credentials:     &corev1.LocalObjectReference{},
-			Revision:        pointer.String(""),
-			ContextDir:      pointer.String(""),
-			URL:             pointer.String(""),
+			Revision:        ptr.To[string](""),
+			ContextDir:      ptr.To[string](""),
+			URL:             ptr.To[string](""),
 			BundleContainer: &buildv1alpha1.BundleContainer{Prune: &bundlePruneOption},
 		},
 		Strategy: buildv1alpha1.Strategy{
 			Kind:       &clusterBuildStrategyKind,
 			APIVersion: &buildv1alpha1.SchemeGroupVersion.Version,
 		},
-		Dockerfile: pointer.String(""),
+		Dockerfile: ptr.To[string](""),
 		Builder: &buildv1alpha1.Image{
 			Credentials: &corev1.LocalObjectReference{},
 		},
 		Output: buildv1alpha1.Image{
 			Credentials: &corev1.LocalObjectReference{},
-			Insecure:    pointer.Bool(false),
+			Insecure:    ptr.To[bool](false),
 			Labels:      map[string]string{},
 			Annotations: map[string]string{},
 		},

pkg/shp/flags/build_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func TestBuildSpecFromFlags(t *testing.T) {
@@ -22,25 +22,25 @@ func TestBuildSpecFromFlags(t *testing.T) {
 	expected := &buildv1alpha1.BuildSpec{
 		Source: buildv1alpha1.Source{
 			Credentials:     &credentials,
-			URL:             pointer.String("https://some.url"),
-			Revision:        pointer.String("some-rev"),
-			ContextDir:      pointer.String("some-contextdir"),
+			URL:             ptr.To[string]("https://some.url"),
+			Revision:        ptr.To[string]("some-rev"),
+			ContextDir:      ptr.To[string]("some-contextdir"),
 			BundleContainer: &buildv1alpha1.BundleContainer{Prune: &bundlePruneOption},
 		},
 		Strategy: buildv1alpha1.Strategy{
 			Name:       "strategy-name",
 			Kind:       &buildStrategyKind,
 			APIVersion: &buildv1alpha1.SchemeGroupVersion.Version,
 		},
-		Dockerfile: pointer.String("some-dockerfile"),
+		Dockerfile: ptr.To[string]("some-dockerfile"),
 		Builder: &buildv1alpha1.Image{
 			Credentials: &credentials,
 			Image:       "builder-image",
 		},
 		Output: buildv1alpha1.Image{
 			Credentials: &credentials,
 			Image:       "output-image",
-			Insecure:    pointer.Bool(false),
+			Insecure:    ptr.To[bool](false),
 			Labels:      map[string]string{},
 			Annotations: map[string]string{},
 		},
@@ -230,7 +230,7 @@ func TestSanitizeBuildSpec(t *testing.T) {
 		name: "should clean-up an empty source contextDir",
 		in: buildv1alpha1.BuildSpec{
 			Source: buildv1alpha1.Source{
-				ContextDir: pointer.String(""),
+				ContextDir: ptr.To[string](""),
 			},
 		},
 		out: buildv1alpha1.BuildSpec{
@@ -240,7 +240,7 @@ func TestSanitizeBuildSpec(t *testing.T) {
 		name: "should clean-up an empty source URL",
 		in: buildv1alpha1.BuildSpec{
 			Source: buildv1alpha1.Source{
-				URL: pointer.String(""),
+				URL: ptr.To[string](""),
 			},
 		},
 		out: buildv1alpha1.BuildSpec{
@@ -251,7 +251,7 @@ func TestSanitizeBuildSpec(t *testing.T) {
 		in: buildv1alpha1.BuildSpec{
 			Output: buildv1alpha1.Image{
 				Image:    "some",
-				Insecure: pointer.Bool(false),
+				Insecure: ptr.To[bool](false),
 			},
 		},
 		out: buildv1alpha1.BuildSpec{
@@ -264,13 +264,13 @@ func TestSanitizeBuildSpec(t *testing.T) {
 		in: buildv1alpha1.BuildSpec{
 			Output: buildv1alpha1.Image{
 				Image:    "some",
-				Insecure: pointer.Bool(true),
+				Insecure: ptr.To[bool](true),
 			},
 		},
 		out: buildv1alpha1.BuildSpec{
 			Output: buildv1alpha1.Image{
 				Image:    "some",
-				Insecure: pointer.Bool(true),
+				Insecure: ptr.To[bool](true),
 			},
 		},
 	}}

pkg/shp/flags/buildrun.go

@@ -6,23 +6,23 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 // BuildRunSpecFromFlags creates a BuildRun spec from command-line flags.
 func BuildRunSpecFromFlags(flags *pflag.FlagSet) *buildv1alpha1.BuildRunSpec {
 	spec := &buildv1alpha1.BuildRunSpec{
 		BuildRef: &buildv1alpha1.BuildRef{
-			APIVersion: pointer.String(""),
+			APIVersion: ptr.To[string](""),
 		},
 		ServiceAccount: &buildv1alpha1.ServiceAccount{
-			Name:     pointer.String(""),
-			Generate: pointer.Bool(false),
+			Name:     ptr.To[string](""),
+			Generate: ptr.To[bool](false),
 		},
 		Timeout: &metav1.Duration{},
 		Output: &buildv1alpha1.Image{
 			Credentials: &corev1.LocalObjectReference{},
-			Insecure:    pointer.Bool(false),
+			Insecure:    ptr.To[bool](false),
 			Labels:      map[string]string{},
 			Annotations: map[string]string{},
 		},

pkg/shp/flags/buildrun_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/utils/pointer"
+	"k8s.io/utils/ptr"
 )
 
 func TestBuildRunSpecFromFlags(t *testing.T) {
@@ -20,19 +20,19 @@ func TestBuildRunSpecFromFlags(t *testing.T) {
 	expected := &buildv1alpha1.BuildRunSpec{
 		BuildRef: &buildv1alpha1.BuildRef{
 			Name:       str,
-			APIVersion: pointer.String(""),
+			APIVersion: ptr.To[string](""),
 		},
 		ServiceAccount: &buildv1alpha1.ServiceAccount{
 			Name:     &str,
-			Generate: pointer.Bool(false),
+			Generate: ptr.To[bool](false),
 		},
 		Timeout: &metav1.Duration{
 			Duration: 1 * time.Second,
 		},
 		Output: &buildv1alpha1.Image{
 			Credentials: &corev1.LocalObjectReference{Name: "name"},
 			Image:       str,
-			Insecure:    pointer.Bool(false),
+			Insecure:    ptr.To[bool](false),
 			Labels:      map[string]string{},
 			Annotations: map[string]string{},
 		},