Merge pull request #27498 from Luap99/gofumpt

enable gofumpt formatter

Author: openshift-merge-bot[bot]

.golangci.yml

@@ -4,7 +4,7 @@ run:
 
 formatters:
   enable:
-    - gofmt
+    - gofumpt
     - goimports
   exclusions:
     generated: disable

CONTRIBUTING.md

@@ -146,7 +146,8 @@ It is not necessary to test a single change in multiple places.
 
 ### Go Format and lint
 
-All code changes must pass ``make validatepr``.
+All code changes must pass `make validatepr`.
+We are using the [`gofumpt`](https://github.com/mvdan/gofumpt) formatter for our go code, you can either use it directly or format via `golangci-lint fmt`. The `validatepr`/`validate` make targets will fail if the code is not formatted correctly.
 
 ### Integration Tests
 

cmd/podman-mac-helper/install.go

@@ -19,8 +19,8 @@ import (
 )
 
 const (
-	mode755 = 0755
-	mode644 = 0644
+	mode755 = 0o755
+	mode644 = 0o644
 )
 
 const launchConfig = `<?xml version="1.0" encoding="UTF-8"?>

cmd/podman-testing/store_unsupported.go

@@ -6,9 +6,7 @@ import (
 	"github.com/containers/podman/v6/pkg/domain/entities"
 )
 
-var (
-	engineMode = entities.TunnelMode
-)
+var engineMode = entities.TunnelMode
 
 func storeBefore() error {
 	return nil

cmd/podman-wslkerninst/main.go

@@ -43,9 +43,7 @@ func setupLogging(name string) (*eventlog.Log, error) {
 
 func installWslKernel() error {
 	logrus.Info("Installing WSL Kernel update")
-	var (
-		err error
-	)
+	var err error
 	backoff := 500 * time.Millisecond
 	for i := 1; i < 6; i++ {
 		err = wutil.SilentExec("--update")

cmd/podman/artifact/add.go

@@ -12,19 +12,17 @@ import (
 	"go.podman.io/common/pkg/completion"
 )
 
-var (
-	addCmd = &cobra.Command{
-		Use:               "add [options] ARTIFACT PATH [...PATH]",
-		Short:             "Add an OCI artifact to the local store",
-		Long:              "Add an OCI artifact to the local store from the local filesystem",
-		RunE:              add,
-		Args:              cobra.MinimumNArgs(2),
-		ValidArgsFunction: common.AutocompleteArtifactAdd,
-		Example: `podman artifact add quay.io/myimage/myartifact:latest /tmp/foobar.txt
+var addCmd = &cobra.Command{
+	Use:               "add [options] ARTIFACT PATH [...PATH]",
+	Short:             "Add an OCI artifact to the local store",
+	Long:              "Add an OCI artifact to the local store from the local filesystem",
+	RunE:              add,
+	Args:              cobra.MinimumNArgs(2),
+	ValidArgsFunction: common.AutocompleteArtifactAdd,
+	Example: `podman artifact add quay.io/myimage/myartifact:latest /tmp/foobar.txt
 podman artifact add --file-type text/yaml quay.io/myimage/myartifact:latest /tmp/foobar.yaml
 podman artifact add --append quay.io/myimage/myartifact:latest /tmp/foobar.tar.gz`,
-	}
-)
+}
 
 // AddOptionsWrapper wraps entities.ArtifactsAddOptions and prevents leaking
 // CLI-only fields into the API types.

cmd/podman/artifact/extract.go

@@ -8,22 +8,18 @@ import (
 	"go.podman.io/common/pkg/completion"
 )
 
-var (
-	extractCmd = &cobra.Command{
-		Use:               "extract [options] ARTIFACT PATH",
-		Short:             "Extract an OCI artifact to a local path",
-		Long:              "Extract the blobs of an OCI artifact to a local file or directory",
-		RunE:              extract,
-		Args:              cobra.ExactArgs(2),
-		ValidArgsFunction: common.AutocompleteArtifactAdd,
-		Example: `podman artifact Extract quay.io/myimage/myartifact:latest /tmp/foobar.txt
+var extractCmd = &cobra.Command{
+	Use:               "extract [options] ARTIFACT PATH",
+	Short:             "Extract an OCI artifact to a local path",
+	Long:              "Extract the blobs of an OCI artifact to a local file or directory",
+	RunE:              extract,
+	Args:              cobra.ExactArgs(2),
+	ValidArgsFunction: common.AutocompleteArtifactAdd,
+	Example: `podman artifact Extract quay.io/myimage/myartifact:latest /tmp/foobar.txt
 podman artifact Extract quay.io/myimage/myartifact:latest /home/paul/mydir`,
-	}
-)
+}
 
-var (
-	extractOpts entities.ArtifactExtractOptions
-)
+var extractOpts entities.ArtifactExtractOptions
 
 func init() {
 	registry.Commands = append(registry.Commands, registry.CliCommand{

cmd/podman/artifact/list.go

@@ -63,9 +63,7 @@ func (a artifactListOutput) CreatedAt() string {
 	return a.created.String()
 }
 
-var (
-	defaultArtifactListOutputFormat = "{{range .}}{{.Repository}}\t{{.Tag}}\t{{.Digest}}\t{{.Created}}\t{{.Size}}\n{{end -}}"
-)
+var defaultArtifactListOutputFormat = "{{range .}}{{.Repository}}\t{{.Tag}}\t{{.Digest}}\t{{.Created}}\t{{.Size}}\n{{end -}}"
 
 func init() {
 	registry.Commands = append(registry.Commands, registry.CliCommand{
@@ -93,9 +91,7 @@ func outputTemplate(cmd *cobra.Command, lrs []*entities.ArtifactListReport) erro
 	var err error
 	artifacts := make([]artifactListOutput, 0)
 	for _, lr := range lrs {
-		var (
-			tag string
-		)
+		var tag string
 		artifactName, err := lr.Artifact.GetName()
 		if err != nil {
 			return err

cmd/podman/artifact/rm.go

@@ -35,6 +35,7 @@ func rmFlags(cmd *cobra.Command) {
 	flags.BoolVarP(&rmOptions.All, "all", "a", false, "Remove all artifacts")
 	flags.BoolVarP(&rmOptions.Ignore, "ignore", "i", false, "Ignore error if artifact does not exist")
 }
+
 func init() {
 	registry.Commands = append(registry.Commands, registry.CliCommand{
 		Command: rmCmd,

cmd/podman/common/build.go

@@ -52,9 +52,11 @@ type BuildFlagsWrapper struct {
 
 // FarmBuildHiddenFlags are the flags hidden from the farm build command because they are either not
 // supported or don't make sense in the farm build use case
-var FarmBuildHiddenFlags = []string{"arch", "all-platforms", "compress", "cw", "disable-content-trust",
+var FarmBuildHiddenFlags = []string{
+	"arch", "all-platforms", "compress", "cw", "disable-content-trust",
 	"logsplit", "manifest", "os", "output", "platform", "sign-by", "signature-policy", "stdin",
-	"variant"}
+	"variant",
+}
 
 func DefineBuildFlags(cmd *cobra.Command, buildOpts *BuildFlagsWrapper, isFarmBuild bool) {
 	flags := cmd.Flags()