gofumpt final round

Author: CMGS

.golangci.yml

@@ -72,6 +72,8 @@ formatters:
     - gofumpt
     - goimports
   settings:
+    gofumpt:
+      extra-rules: true
     goimports:
       local-prefixes:
         - github.com/cocoonstack/cocoon

Makefile

@@ -76,11 +76,11 @@ lint: golangci-lint ## Run golangci-lint for all target platforms
 	GOOS=darwin GOARCH=amd64 $(GOLANGCILINT) run
 
 fmt: gofumpt goimports ## Format code with gofumpt and goimports
-	$(GOFMT) -l -w .
+	$(GOFMT) -extra -l -w .
 	$(GOIMPORTS) -l -w --local 'github.com/cocoonstack/cocoon' .
 
 fmt-check: gofumpt goimports ## Check formatting (fails if files need formatting)
-	@test -z "$$($(GOFMT) -l .)" || { echo "Files need formatting (gofumpt):"; $(GOFMT) -l .; exit 1; }
+	@test -z "$$($(GOFMT) -extra -l .)" || { echo "Files need formatting (gofumpt):"; $(GOFMT) -extra -l .; exit 1; }
 	@test -z "$$($(GOIMPORTS) -l .)" || { echo "Files need formatting (goimports):"; $(GOIMPORTS) -l .; exit 1; }
 
 # --- Maintenance ---

hypervisor/backend.go

@@ -417,20 +417,6 @@ func (b *Backend) GCCollect(ctx context.Context, ids []string) error {
 	return errors.Join(errs...)
 }
 
-// killOrphanProcess terminates a leftover hypervisor process if the PID
-// file exists and the process matches the expected binary name.
-func (b *Backend) killOrphanProcess(ctx context.Context, runDir string) {
-	pid, err := utils.ReadPIDFile(b.PIDFilePath(runDir))
-	if err != nil {
-		return
-	}
-	sockPath := SocketPath(runDir)
-	if !utils.VerifyProcessCmdline(pid, b.Conf.BinaryName(), sockPath) {
-		return
-	}
-	_ = utils.TerminateProcess(ctx, pid, b.Conf.BinaryName(), sockPath, b.Conf.TerminateGracePeriod())
-}
-
 func (b *Backend) PIDFilePath(runDir string) string {
 	return filepath.Join(runDir, b.Conf.PIDFileName())
 }
@@ -564,6 +550,20 @@ func (b *Backend) HandleStopResult(ctx context.Context, id, runDir string, runti
 	return nil
 }
 
+// killOrphanProcess terminates a leftover hypervisor process if the PID
+// file exists and the process matches the expected binary name.
+func (b *Backend) killOrphanProcess(ctx context.Context, runDir string) {
+	pid, err := utils.ReadPIDFile(b.PIDFilePath(runDir))
+	if err != nil {
+		return
+	}
+	sockPath := SocketPath(runDir)
+	if !utils.VerifyProcessCmdline(pid, b.Conf.BinaryName(), sockPath) {
+		return
+	}
+	_ = utils.TerminateProcess(ctx, pid, b.Conf.BinaryName(), sockPath, b.Conf.TerminateGracePeriod())
+}
+
 func SocketPath(runDir string) string { return filepath.Join(runDir, APISocketName) }
 
 func ConsoleSockPath(runDir string) string { return filepath.Join(runDir, ConsoleSockName) }

hypervisor/cloudhypervisor/cloudhypervisor.go

@@ -18,9 +18,7 @@ var (
 	_ hypervisor.Watchable  = (*CloudHypervisor)(nil)
 )
 
-const (
-	typ = "cloud-hypervisor"
-)
+const typ = "cloud-hypervisor"
 
 // CloudHypervisor implements hypervisor.Hypervisor.
 type CloudHypervisor struct {

hypervisor/cloudhypervisor/create.go

@@ -15,9 +15,7 @@ import (
 )
 
 // CowSerial is re-exported for backward compatibility with cmd/vm/debug.go.
-const (
-	CowSerial = hypervisor.CowSerial
-)
+const CowSerial = hypervisor.CowSerial
 
 // Create reserves a VM record, prepares disks, and leaves the VM in Created state.
 func (ch *CloudHypervisor) Create(ctx context.Context, id string, vmCfg *types.VMConfig, storageConfigs []*types.StorageConfig, networkConfigs []*types.NetworkConfig, bootCfg *types.BootConfig) (_ *types.VM, err error) {

hypervisor/firecracker/clone.go

@@ -15,9 +15,7 @@ import (
 	"github.com/cocoonstack/cocoon/utils"
 )
 
-const (
-	cloneBackupSuffix = ".cocoon-clone-backup"
-)
+const cloneBackupSuffix = ".cocoon-clone-backup"
 
 // driveRedirect records a temporary symlink replacing a source drive path.
 type driveRedirect struct {

hypervisor/firecracker/firecracker.go

@@ -18,9 +18,7 @@ var (
 	_ hypervisor.Direct     = (*Firecracker)(nil)
 )
 
-const (
-	typ = "firecracker"
-)
+const typ = "firecracker"
 
 // Firecracker implements hypervisor.Hypervisor using the Firecracker VMM.
 // Only OCI images (direct kernel boot) are supported — no UEFI, no cloudimg, no Windows.

images/cloudimg/cloudimg.go

@@ -17,14 +17,9 @@ import (
 	"github.com/cocoonstack/cocoon/utils"
 )
 
-// compile-time interface check.
-var (
-	_ images.Images = (*CloudImg)(nil)
-)
+var _ images.Images = (*CloudImg)(nil)
 
-const (
-	typ = "cloudimg"
-)
+const typ = "cloudimg"
 
 // CloudImg stores cloud image blobs for UEFI boot under Cloud Hypervisor.
 type CloudImg struct {

images/index.go

@@ -14,9 +14,7 @@ import (
 	"github.com/cocoonstack/cocoon/utils"
 )
 
-const (
-	minHexLen = 12
-)
+const minHexLen = 12
 
 // Entry defines the common behavior of an image index (*entry).
 // Both OCI and cloudimg imageEntry types implement this with value receivers.

images/oci/commit.go

@@ -42,10 +42,10 @@ func bootFilesPresent(results []pullLayerResult) (hasKernel, hasInitrd bool) {
 			hasInitrd = true
 		}
 		if hasKernel && hasInitrd {
-			return
+			return hasKernel, hasInitrd
 		}
 	}
-	return
+	return hasKernel, hasInitrd
 }
 
 func commitAndRecord(conf *Config, idx *imageIndex, ref string, manifestDigest images.Digest, results []pullLayerResult) error {