Responds to linter feedback

Author: tony-landreth

.golangci.yaml

@@ -149,3 +149,7 @@ formatters:
       - third_party$
       - builtin$
       - examples$
+issues:
+  # Disable max issues limit (default is 50)
+  max-issues-per-linter: 0
+  max-same-issues: 0

internal/bridge/client.go

@@ -280,7 +280,7 @@ func (c *Client) doWithBackoff(
 			request.Header = headers.Clone()
 
 			//nolint:bodyclose // This response is returned to the caller.
-			response, err = c.Client.Do(request)
+			response, err = c.Do(request)
 		}
 
 		// An error indicates there was no response from the server, and the

internal/bridge/client_test.go

@@ -31,8 +31,8 @@ func TestClientBackoff(t *testing.T) {
 	client := NewClient("", "")
 	var total time.Duration
 
-	for i := 1; i <= 50 && client.Backoff.Steps > 0; i++ {
-		step := client.Backoff.Step()
+	for i := 1; i <= 50 && client.Steps > 0; i++ {
+		step := client.Step()
 		total += step
 
 		t.Logf("%02d:%20v%20v", i, step, total)
@@ -68,7 +68,7 @@ func TestClientDoWithBackoff(t *testing.T) {
 
 		// Client with one attempt, i.e. no backoff.
 		client := NewClient(server.URL, "xyz")
-		client.Backoff.Steps = 1
+		client.Steps = 1
 		assert.Equal(t, client.BaseURL.String(), server.URL)
 
 		ctx := context.Background()
@@ -113,8 +113,8 @@ func TestClientDoWithBackoff(t *testing.T) {
 
 		// Client with brief backoff.
 		client := NewClient(server.URL, "")
-		client.Backoff.Duration = time.Millisecond
-		client.Backoff.Steps = 5
+		client.Duration = time.Millisecond
+		client.Steps = 5
 		assert.Equal(t, client.BaseURL.String(), server.URL)
 
 		ctx := context.Background()
@@ -170,8 +170,8 @@ func TestClientDoWithBackoff(t *testing.T) {
 
 		// Client with brief backoff.
 		client := NewClient(server.URL, "")
-		client.Backoff.Duration = time.Millisecond
-		client.Backoff.Steps = 5
+		client.Duration = time.Millisecond
+		client.Steps = 5
 		assert.Equal(t, client.BaseURL.String(), server.URL)
 
 		ctx := context.Background()
@@ -190,8 +190,8 @@ func TestClientDoWithBackoff(t *testing.T) {
 
 		// Client with lots of brief backoff.
 		client := NewClient(server.URL, "")
-		client.Backoff.Duration = time.Millisecond
-		client.Backoff.Steps = 100
+		client.Duration = time.Millisecond
+		client.Steps = 100
 		assert.Equal(t, client.BaseURL.String(), server.URL)
 
 		ctx, cancel := context.WithTimeout(context.Background(), 50*time.Millisecond)

internal/bridge/crunchybridgecluster/apply.go

@@ -22,7 +22,7 @@ func (r *CrunchyBridgeClusterReconciler) patch(
 	patch client.Patch, options ...client.PatchOption,
 ) error {
 	options = append([]client.PatchOption{r.Owner}, options...)
-	return r.Client.Patch(ctx, object, patch, options...)
+	return r.Patch(ctx, object, patch, options...)
 }
 
 // apply sends an apply patch to object's endpoint in the Kubernetes API and

internal/bridge/crunchybridgecluster/crunchybridgecluster_controller.go

@@ -91,7 +91,7 @@ func (r *CrunchyBridgeClusterReconciler) SetupWithManager(
 func (r *CrunchyBridgeClusterReconciler) setControllerReference(
 	owner *v1beta1.CrunchyBridgeCluster, controlled client.Object,
 ) error {
-	return controllerutil.SetControllerReference(owner, controlled, r.Client.Scheme())
+	return controllerutil.SetControllerReference(owner, controlled, r.Scheme())
 }
 
 //+kubebuilder:rbac:groups="postgres-operator.crunchydata.com",resources="crunchybridgeclusters",verbs={get,patch,update}
@@ -684,7 +684,7 @@ func (r *CrunchyBridgeClusterReconciler) GetSecretKeys(
 	}}
 
 	err := errors.WithStack(
-		r.Client.Get(ctx, client.ObjectKeyFromObject(existing), existing))
+		r.Get(ctx, client.ObjectKeyFromObject(existing), existing))
 
 	if err == nil {
 		if existing.Data["key"] != nil && existing.Data["team"] != nil {
@@ -707,7 +707,7 @@ func (r *CrunchyBridgeClusterReconciler) deleteControlled(
 		version := object.GetResourceVersion()
 		exactly := client.Preconditions{UID: &uid, ResourceVersion: &version}
 
-		return r.Client.Delete(ctx, object, exactly)
+		return r.Delete(ctx, object, exactly)
 	}
 
 	return nil

internal/bridge/crunchybridgecluster/delete.go

@@ -28,7 +28,7 @@ func (r *CrunchyBridgeClusterReconciler) handleDelete(
 	log := ctrl.LoggerFrom(ctx)
 
 	// If the CrunchyBridgeCluster isn't being deleted, add the finalizer
-	if crunchybridgecluster.ObjectMeta.DeletionTimestamp.IsZero() {
+	if crunchybridgecluster.DeletionTimestamp.IsZero() {
 		if !controllerutil.ContainsFinalizer(crunchybridgecluster, finalizer) {
 			controllerutil.AddFinalizer(crunchybridgecluster, finalizer)
 			if err := r.Update(ctx, crunchybridgecluster); err != nil {

internal/bridge/crunchybridgecluster/delete_test.go

@@ -65,7 +65,7 @@ func TestHandleDeleteCluster(t *testing.T) {
 
 		// Get cluster from kubernetes and assert that the deletion timestamp was added
 		assert.NilError(t, tClient.Get(ctx, client.ObjectKeyFromObject(cluster), cluster))
-		assert.Check(t, !cluster.ObjectMeta.DeletionTimestamp.IsZero())
+		assert.Check(t, !cluster.DeletionTimestamp.IsZero())
 
 		// Note: We must run handleDelete multiple times because we don't want to remove the
 		// finalizer until we're sure that the cluster has been deleted from Bridge, so we
@@ -107,7 +107,7 @@ func TestHandleDeleteCluster(t *testing.T) {
 
 		// Get cluster from kubernetes and assert that the deletion timestamp was added
 		assert.NilError(t, tClient.Get(ctx, client.ObjectKeyFromObject(cluster), cluster))
-		assert.Check(t, !cluster.ObjectMeta.DeletionTimestamp.IsZero())
+		assert.Check(t, !cluster.DeletionTimestamp.IsZero())
 
 		// Run handleDelete again to attempt to delete from Bridge, but provide bad api key
 		cluster.Status.ID = "2345"

internal/bridge/crunchybridgecluster/postgres.go

@@ -92,7 +92,7 @@ func (r *CrunchyBridgeClusterReconciler) reconcilePostgresRoleSecrets(
 	// Make sure that this cluster's role secret names are not being used by any other
 	// secrets in the namespace
 	allSecretsInNamespace := &corev1.SecretList{}
-	err := errors.WithStack(r.Client.List(ctx, allSecretsInNamespace, client.InNamespace(cluster.Namespace)))
+	err := errors.WithStack(r.List(ctx, allSecretsInNamespace, client.InNamespace(cluster.Namespace)))
 	if err != nil {
 		return nil, nil, err
 	}
@@ -115,7 +115,7 @@ func (r *CrunchyBridgeClusterReconciler) reconcilePostgresRoleSecrets(
 	selector, err := naming.AsSelector(naming.CrunchyBridgeClusterPostgresRoles(cluster.Name))
 	if err == nil {
 		err = errors.WithStack(
-			r.Client.List(ctx, secrets,
+			r.List(ctx, secrets,
 				client.InNamespace(cluster.Namespace),
 				client.MatchingLabelsSelector{Selector: selector},
 			))

internal/bridge/installation_test.go

@@ -99,7 +99,7 @@ func TestInstallationReconcile(t *testing.T) {
 
 				reconciler.NewClient = func() *Client {
 					c := NewClient(server.URL, "")
-					c.Backoff.Steps = 1
+					c.Steps = 1
 					assert.Equal(t, c.BaseURL.String(), server.URL)
 					return c
 				}
@@ -155,7 +155,7 @@ func TestInstallationReconcile(t *testing.T) {
 
 				reconciler.NewClient = func() *Client {
 					c := NewClient(server.URL, "")
-					c.Backoff.Steps = 1
+					c.Steps = 1
 					assert.Equal(t, c.BaseURL.String(), server.URL)
 					return c
 				}
@@ -289,7 +289,7 @@ func TestInstallationReconcile(t *testing.T) {
 
 				reconciler.NewClient = func() *Client {
 					c := NewClient(server.URL, "")
-					c.Backoff.Steps = 1
+					c.Steps = 1
 					assert.Equal(t, c.BaseURL.String(), server.URL)
 					return c
 				}
@@ -343,7 +343,7 @@ func TestInstallationReconcile(t *testing.T) {
 
 				reconciler.NewClient = func() *Client {
 					c := NewClient(server.URL, "")
-					c.Backoff.Steps = 1
+					c.Steps = 1
 					assert.Equal(t, c.BaseURL.String(), server.URL)
 					return c
 				}
@@ -426,7 +426,7 @@ func TestInstallationReconcile(t *testing.T) {
 
 					reconciler.NewClient = func() *Client {
 						c := NewClient(server.URL, "")
-						c.Backoff.Steps = 1
+						c.Steps = 1
 						assert.Equal(t, c.BaseURL.String(), server.URL)
 						return c
 					}

internal/config/config.go

@@ -173,7 +173,7 @@ func VerifyImageValues(cluster *v1beta1.PostgresCluster) error {
 	}
 
 	if len(images) > 0 {
-		return fmt.Errorf("Missing image(s): %s", images)
+		return fmt.Errorf("missing image(s): %s", images)
 	}
 
 	return nil