Use gofumpt

Author: dmage

.golangci.yaml

@@ -2,6 +2,7 @@ linters:
   enable:
   - errcheck
   - exhaustive
+  - gofumpt
   - gosimple
   - govet
   - ineffassign

cmd/cluster-image-registry-operator/main.go

@@ -26,9 +26,7 @@ import (
 
 const metricsPort = 60000
 
-var (
-	filesToWatch []string
-)
+var filesToWatch []string
 
 func printVersion() {
 	klog.Infof("Cluster Image Registry Operator Version: %s", version.Version)

pkg/metrics/server_test.go

@@ -197,10 +197,8 @@ func TestImagePrunerInstallStatus(t *testing.T) {
 					t.Errorf("expected metric %s to be 2, got %f", metricName, m.Gauge.GetValue())
 				}
 			}
-
 		})
 	}
-
 }
 
 func findMetricsByCounter(buf io.ReadCloser, name string) []*io_prometheus_client.Metric {

pkg/resource/deployment_test.go

@@ -61,7 +61,6 @@ func TestChecksum(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-
 			ctx, cancel := context.WithCancel(context.Background())
 			defer cancel()
 

pkg/resource/podtemplatespec_test.go

@@ -133,7 +133,8 @@ func TestMakePodTemplateSpecWithTopologySpread(t *testing.T) {
 							MatchLabels: map[string]string{"registry": "abc"},
 						},
 					},
-				}},
+				},
+			},
 			expected: []corev1.TopologySpreadConstraint{
 				{
 					MaxSkew:           2,

pkg/signals/signal.go

@@ -22,8 +22,10 @@ import (
 	"syscall"
 )
 
-var shutdownSignals = []os.Signal{os.Interrupt, syscall.SIGTERM}
-var onlyOneSignalHandler = make(chan struct{})
+var (
+	shutdownSignals      = []os.Signal{os.Interrupt, syscall.SIGTERM}
+	onlyOneSignalHandler = make(chan struct{})
+)
 
 // SetupSignalHandler registered for SIGTERM and SIGINT. A stop channel is returned
 // which is closed on one of these signals. If a second signal is caught, the program

pkg/storage/azure/azure.go

@@ -45,15 +45,13 @@ const (
 	storageExistsReasonAccountDeleted    = "AccountDeleted"
 )
 
-var (
-	// storageAccountInvalidCharRe is a regular expression for characters that
-	// cannot be used in Azure storage accounts names (i.e. that are not
-	// numbers nor lower-case letters) and that are not upper-case letters. If
-	// you use this regular expression to filter invalid characters, you also
-	// need to strings.ToLower to get a valid storage account name or an empty
-	// string.
-	storageAccountInvalidCharRe = regexp.MustCompile(`[^0-9A-Za-z]`)
-)
+// storageAccountInvalidCharRe is a regular expression for characters that
+// cannot be used in Azure storage accounts names (i.e. that are not
+// numbers nor lower-case letters) and that are not upper-case letters. If
+// you use this regular expression to filter invalid characters, you also
+// need to strings.ToLower to get a valid storage account name or an empty
+// string.
+var storageAccountInvalidCharRe = regexp.MustCompile(`[^0-9A-Za-z]`)
 
 // Azure holds configuration used to reach Azure's endpoints.
 type Azure struct {

pkg/storage/azure/azure_test.go

@@ -178,7 +178,7 @@ func TestGetConfig(t *testing.T) {
 }
 
 func TestGenerateAccountName(t *testing.T) {
-	var re = regexp.MustCompile(`^[0-9a-z]{3,24}$`)
+	re := regexp.MustCompile(`^[0-9a-z]{3,24}$`)
 	for _, infrastructureName := range []string{
 		"",
 		"foo",

pkg/storage/ibmcos/ibmcos.go

@@ -77,7 +77,6 @@ func (d *driver) CABundle() (string, bool, error) {
 // ConfigEnv configures the environment variables that will be
 // used in the image registry deployment.
 func (d *driver) ConfigEnv() (envs envvar.List, err error) {
-
 	_, err = d.UpdateEffectiveConfig()
 	if err != nil {
 		return
@@ -99,7 +98,6 @@ func (d *driver) ConfigEnv() (envs envvar.List, err error) {
 // UpdateEffectiveConfig updates the driver's local effective ImageRegistryConfig and returns the effective image
 // registry configuration based on infrastructure settings and any custom overrides.
 func (d *driver) UpdateEffectiveConfig() (*imageregistryv1.ImageRegistryConfigStorageIBMCOS, error) {
-
 	effectiveConfig := d.Config.DeepCopy()
 
 	if effectiveConfig == nil {
@@ -668,7 +666,6 @@ func (d *driver) bucketExists(bucketName string, serviceInstanceCRN string) erro
 // getIBMCOSClient returns a client that allows us to interact
 // with the IBM COS service.
 func (d *driver) getIBMCOSClient(serviceInstanceCRN string) (*s3.S3, error) {
-
 	infra, err := util.GetInfrastructure(d.Listers)
 	if err != nil {
 		return nil, err

pkg/storage/oss/oss.go

@@ -588,8 +588,10 @@ func (d *driver) RemoveStorage(cr *imageregistryv1.Config) (bool, error) {
 			return false, err
 		}
 		for _, upload := range lmur.Uploads {
-			var imur = oss.InitiateMultipartUploadResult{Bucket: bucket.BucketName,
-				Key: upload.Key, UploadID: upload.UploadID}
+			imur := oss.InitiateMultipartUploadResult{
+				Bucket: bucket.BucketName,
+				Key:    upload.Key, UploadID: upload.UploadID,
+			}
 			err = bucket.AbortMultipartUpload(imur)
 			if err != nil {
 				return false, err