Remove unnecessary type conversions

Author: cbandy

.golangci.next.yaml

@@ -23,7 +23,6 @@ linters:
     - tenv
     - thelper
     - tparallel
-    - unconvert
     - wastedassign
 
 issues:

.golangci.yaml

@@ -12,6 +12,7 @@ linters:
     - gosimple
     - importas
     - misspell
+    - unconvert
   presets:
     - bugs
     - format

internal/controller/postgrescluster/patroni.go

@@ -554,14 +554,14 @@ func (r *Reconciler) reconcilePatroniSwitchover(ctx context.Context,
 	// In the default case we will be using SwitchoverAndWait. This API call uses
 	// a Patronictl switchover to move to the target instance.
 	action := func(ctx context.Context, exec patroni.Executor, next string) (bool, error) {
-		success, err := patroni.Executor(exec).SwitchoverAndWait(ctx, next)
+		success, err := exec.SwitchoverAndWait(ctx, next)
 		return success, errors.WithStack(err)
 	}
 
 	if spec.Type == v1beta1.PatroniSwitchoverTypeFailover {
 		// When a failover has been requested we use FailoverAndWait to change the primary.
 		action = func(ctx context.Context, exec patroni.Executor, next string) (bool, error) {
-			success, err := patroni.Executor(exec).FailoverAndWait(ctx, next)
+			success, err := exec.FailoverAndWait(ctx, next)
 			return success, errors.WithStack(err)
 		}
 	}

internal/controller/postgrescluster/pgbackrest_test.go

@@ -426,7 +426,7 @@ topologySpreadConstraints:
 				"involvedObject.kind":      "PostgresCluster",
 				"involvedObject.name":      clusterName,
 				"involvedObject.namespace": ns.Name,
-				"involvedObject.uid":       string(clusterUID),
+				"involvedObject.uid":       clusterUID,
 				"reason":                   "RepoHostCreated",
 			}); err != nil {
 				return false, err
@@ -739,7 +739,7 @@ func TestReconcileStanzaCreate(t *testing.T) {
 			"involvedObject.kind":      "PostgresCluster",
 			"involvedObject.name":      clusterName,
 			"involvedObject.namespace": ns.Name,
-			"involvedObject.uid":       string(clusterUID),
+			"involvedObject.uid":       clusterUID,
 			"reason":                   "StanzasCreated",
 		}); err != nil {
 			return false, err
@@ -783,7 +783,7 @@ func TestReconcileStanzaCreate(t *testing.T) {
 			"involvedObject.kind":      "PostgresCluster",
 			"involvedObject.name":      clusterName,
 			"involvedObject.namespace": ns.Name,
-			"involvedObject.uid":       string(clusterUID),
+			"involvedObject.uid":       clusterUID,
 			"reason":                   "UnableToCreateStanzas",
 		}); err != nil {
 			return false, err

internal/pgbackrest/pgbackrest.go

@@ -89,7 +89,7 @@ fi
 		// if the err returned from pgbackrest command is about a version mismatch
 		// then we should run upgrade rather than create
 		if strings.Contains(errReturn, errMsgBackupDbMismatch) {
-			return Executor(exec).StanzaCreateOrUpgrade(ctx, configHash, true)
+			return exec.StanzaCreateOrUpgrade(ctx, configHash, true)
 		}
 
 		// if none of the above errors, return the err