Address staticcheck warnings

pkg/controller/buildrun/buildrun_controller.go

@@ -93,11 +93,7 @@ func add(ctx context.Context, mgr manager.Manager, r reconcile.Reconciler) error
 
 			// The CreateFunc is also called when the controller is started and iterates over all objects. For those BuildRuns that have a TaskRun referenced already,
 			// we do not need to do a further reconciliation. BuildRun updates then only happen from the TaskRun.
-			if o.Status.LatestTaskRunRef != nil {
-				return false
-			}
-
-			return true
+			return o.Status.LatestTaskRunRef == nil
 		},
 		UpdateFunc: func(e event.UpdateEvent) bool {
 			// Ignore updates to CR status in which case metadata.Generation does not change
@@ -187,11 +183,11 @@ func handleError(message string, listOfErrors ...error) error {
 // ValidateBuildRegistration verifies that a referenced Build is properly registered
 func (r *ReconcileBuildRun) ValidateBuildRegistration(ctx context.Context, build *buildv1alpha1.Build, buildRun *buildv1alpha1.BuildRun) error {
 	if build.Status.Registered == "" {
-		err := fmt.Errorf("The Build is not yet validated, build: %s", build.Name)
+		err := fmt.Errorf("the Build is not yet validated, build: %s", build.Name)
 		return err
 	}
 	if build.Status.Registered != corev1.ConditionTrue {
-		err := fmt.Errorf("The Build is not registered correctly, build: %s, registered status: %s, reason: %s", build.Name, build.Status.Registered, build.Status.Reason)
+		err := fmt.Errorf("the Build is not registered correctly, build: %s, registered status: %s, reason: %s", build.Name, build.Status.Registered, build.Status.Reason)
 		updateErr := r.updateBuildRunErrorStatus(ctx, buildRun, err.Error())
 		return handleError("Build is not ready", err, updateErr)
 	}

pkg/controller/buildrun/buildrun_controller_test.go

@@ -438,7 +438,7 @@ var _ = Describe("Reconcile BuildRun", func() {
 
 				_, err := reconciler.Reconcile(buildRunRequest)
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring(fmt.Sprintf("\"default\" not found, msg: Failed to choose a service account to use")))
+				Expect(err.Error()).To(ContainSubstring("\"default\" not found, msg: Failed to choose a service account to use"))
 			})
 
 			It("fails on a TaskRun creation due to missing namespaced buildstrategy", func() {
@@ -489,7 +489,7 @@ var _ = Describe("Reconcile BuildRun", func() {
 
 				_, err := reconciler.Reconcile(buildRunRequest)
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring(fmt.Sprintf(" Unsupported BuildStrategy Kind")))
+				Expect(err.Error()).To(ContainSubstring(" Unsupported BuildStrategy Kind"))
 			})
 
 			It("only generates the service account once if the taskRun cannot be created", func() {

test/catalog.go

@@ -11,7 +11,6 @@ import (
 
 	. "github.com/onsi/gomega"
 	build "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
-	buildv1alpha1 "github.com/shipwright-io/build/pkg/apis/build/v1alpha1"
 	"github.com/tektoncd/pipeline/pkg/apis/pipeline/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -284,7 +283,7 @@ func (c *Catalog) StubBuildStatusReason(reason string) func(context context.Cont
 		switch object := object.(type) {
 		case *build.Build:
 			if object.Status.Reason != "" {
-				Expect(*&object.Status.Reason).To(Equal(reason))
+				Expect(object.Status.Reason).To(Equal(reason))
 			}
 		}
 		return nil
@@ -565,7 +564,7 @@ func (c *Catalog) BuildWithBuildRunDeletions(buildName string, strategyName stri
 	return &build.Build{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        buildName,
-			Annotations: map[string]string{buildv1alpha1.AnnotationBuildRunDeletion: "true"},
+			Annotations: map[string]string{build.AnnotationBuildRunDeletion: "true"},
 		},
 		Spec: build.BuildSpec{
 			StrategyRef: &build.StrategyRef{
@@ -586,7 +585,7 @@ func (c *Catalog) BuildWithBuildRunDeletionsAndFakeNS(buildName string, strategy
 		ObjectMeta: metav1.ObjectMeta{
 			Name:        buildName,
 			Namespace:   "fakens",
-			Annotations: map[string]string{buildv1alpha1.AnnotationBuildRunDeletion: "true"},
+			Annotations: map[string]string{build.AnnotationBuildRunDeletion: "true"},
 		},
 		Spec: build.BuildSpec{
 			StrategyRef: &build.StrategyRef{