go fmt with Go 1.19 to address lint errors

tjmoore4 · tjmoore4 · commit 39398efac49e · 2022-08-11T14:47:23.000-04:00
diff --git a/internal/controller/postgrescluster/instance.go b/internal/controller/postgrescluster/instance.go
@@ -870,10 +870,11 @@ func (r *Reconciler) rolloutInstances(
 // scaleDownInstances removes extra instances from a cluster until it matches
 // the spec. This function can delete the primary instance and force the
 // cluster to failover under two conditions:
-// - If the instance set that contains the primary instance is removed from
-//   the spec
-// - If the instance set that contains the primary instance is updated to
-//   have 0 replicas
+//   - If the instance set that contains the primary instance is removed from
+//     the spec
+//   - If the instance set that contains the primary instance is updated to
+//     have 0 replicas
+//
 // If either of these conditions are met then the primary instance will be
 // marked for deletion and deleted after all other instances
 func (r *Reconciler) scaleDownInstances(
diff --git a/internal/controller/postgrescluster/pki_test.go b/internal/controller/postgrescluster/pki_test.go
@@ -15,6 +15,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 */
+
 package postgrescluster
 
 import (
diff --git a/internal/controller/postgrescluster/pod_disruption_budget_test.go b/internal/controller/postgrescluster/pod_disruption_budget_test.go
@@ -15,6 +15,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 */
+
 package postgrescluster
 
 import (
diff --git a/internal/controller/postgrescluster/util.go b/internal/controller/postgrescluster/util.go
@@ -149,9 +149,9 @@ func addDevSHM(template *corev1.PodTemplateSpec) {
 // addTMPEmptyDir adds a "tmp" EmptyDir volume to the provided Pod template, while then also adding a
 // volume mount at /tmp for all containers defined within the Pod template
 // The '/tmp' directory is currently utilized for the following:
-//  * As the pgBackRest lock directory (this is the default lock location for pgBackRest)
-//  * The location where the replication client certificates can be loaded with the proper
-//    permissions set
+//   - As the pgBackRest lock directory (this is the default lock location for pgBackRest)
+//   - The location where the replication client certificates can be loaded with the proper
+//     permissions set
 func addTMPEmptyDir(template *corev1.PodTemplateSpec) {
 
 	template.Spec.Volumes = append(template.Spec.Volumes, corev1.Volume{
diff --git a/internal/kubeapi/patch.go b/internal/kubeapi/patch.go
@@ -61,7 +61,6 @@ func (*JSON6902) pointer(tokens ...string) string {
 // >
 // > o  If the target location specifies an object member that does exist,
 // >    that member's value is replaced.
-//
 func (patch *JSON6902) Add(path ...string) func(value interface{}) *JSON6902 {
 	i := len(*patch)
 	f := func(value interface{}) *JSON6902 {
@@ -83,7 +82,6 @@ func (patch *JSON6902) Add(path ...string) func(value interface{}) *JSON6902 {
 // > The "remove" operation removes the value at the target location.
 // >
 // > The target location MUST exist for the operation to be successful.
-//
 func (patch *JSON6902) Remove(path ...string) *JSON6902 {
 	*patch = append(*patch, map[string]interface{}{
 		"op":   "remove",
@@ -99,7 +97,6 @@ func (patch *JSON6902) Remove(path ...string) *JSON6902 {
 // > with a new value.
 // >
 // > The target location MUST exist for the operation to be successful.
-//
 func (patch *JSON6902) Replace(path ...string) func(value interface{}) *JSON6902 {
 	i := len(*patch)
 	f := func(value interface{}) *JSON6902 {
@@ -144,7 +141,6 @@ func NewMergePatch() *Merge7386 { return &Merge7386{} }
 // > contain the member, the value is replaced.  Null values in the merge
 // > patch are given special meaning to indicate the removal of existing
 // > values in the target.
-//
 func (patch *Merge7386) Add(path ...string) func(value interface{}) *Merge7386 {
 	position := *patch
 
diff --git a/internal/logging/logrus.go b/internal/logging/logrus.go
@@ -29,9 +29,9 @@ import (
 
 // Logrus creates a function that writes genericr.Entry to out using a logrus
 // format. The resulting logrus.Level depends on Entry.Error and Entry.Level:
-//	- Entry.Error ≠ nil   → logrus.ErrorLevel
-//	- Entry.Level < debug → logrus.InfoLevel
-//	- Entry.Level ≥ debug → logrus.DebugLevel
+//   - Entry.Error ≠ nil   → logrus.ErrorLevel
+//   - Entry.Level < debug → logrus.InfoLevel
+//   - Entry.Level ≥ debug → logrus.DebugLevel
 func Logrus(out io.Writer, version string, debug int) genericr.LogFunc {
 	root := logrus.New()
 
diff --git a/internal/pgbackrest/config.go b/internal/pgbackrest/config.go
@@ -168,14 +168,14 @@ func MakePGBackrestLogDir(template *corev1.PodTemplateSpec,
 // RestoreCommand returns the command for performing a pgBackRest restore.  In addition to calling
 // the pgBackRest restore command with any pgBackRest options provided, the script also does the
 // following:
-// - Removes the patroni.dynamic.json file if present.  This ensures the configuration from the
-//   cluster being restored from is not utilized when bootstrapping a new cluster, and the
-//   configuration for the new cluster is utilized instead.
-// - Starts the database and allows recovery to complete.  A temporary postgresql.conf file
-//   with the minimum settings needed to safely start the database is created and utilized.
-// - Renames the data directory as needed to bootstrap the cluster using the restored database.
-//   This ensures compatibility with the "existing" bootstrap method that is included in the
-//   Patroni config when bootstrapping a cluster using an existing data directory.
+//   - Removes the patroni.dynamic.json file if present.  This ensures the configuration from the
+//     cluster being restored from is not utilized when bootstrapping a new cluster, and the
+//     configuration for the new cluster is utilized instead.
+//   - Starts the database and allows recovery to complete.  A temporary postgresql.conf file
+//     with the minimum settings needed to safely start the database is created and utilized.
+//   - Renames the data directory as needed to bootstrap the cluster using the restored database.
+//     This ensures compatibility with the "existing" bootstrap method that is included in the
+//     Patroni config when bootstrapping a cluster using an existing data directory.
 func RestoreCommand(pgdata string, args ...string) []string {
 
 	// After pgBackRest restores files, PostgreSQL starts in recovery to finish
diff --git a/internal/postgis/postgis.go b/internal/postgis/postgis.go
@@ -24,10 +24,10 @@ import (
 )
 
 // EnableInPostgreSQL installs triggers for the following extensions into every database:
-//  - postgis
-//  - postgis_topology
-//  - fuzzystrmatch
-//  - postgis_tiger_geocoder
+//   - postgis
+//   - postgis_topology
+//   - fuzzystrmatch
+//   - postgis_tiger_geocoder
 func EnableInPostgreSQL(ctx context.Context, exec postgres.Executor) error {
 	log := logging.FromContext(ctx)
 
diff --git a/internal/postgres/password/scram.go b/internal/postgres/password/scram.go
@@ -162,10 +162,10 @@ func (s *SCRAMPassword) isASCII() bool {
 // using SCRAM. It differs from RFC 4013 in that it returns the original,
 // unmodified password when:
 //
-//  - the input is not valid UTF-8
-//  - the output would be empty
-//  - the output would contain prohibited characters
-//  - the output would contain ambiguous bidirectional characters
+//   - the input is not valid UTF-8
+//   - the output would be empty
+//   - the output would contain prohibited characters
+//   - the output would contain ambiguous bidirectional characters
 //
 // See:
 //
diff --git a/internal/util/features.go b/internal/util/features.go
@@ -43,7 +43,7 @@ const (
 // To add a new feature, define a key for it above and add it here.
 // An example entry is as follows:
 //
-//   FeatureName: {Default: false, PreRelease: featuregate.Alpha},
+//	FeatureName: {Default: false, PreRelease: featuregate.Alpha},
 //
 // - https://releases.k8s.io/v1.20.0/pkg/features/kube_features.go#L729-732
 var pgoFeatures = map[featuregate.Feature]featuregate.FeatureSpec{
