Proper code formatting

.github/workflows/unit-tests.yml

@@ -25,6 +25,15 @@ jobs:
           go-version-file: go.mod
           cache: true
 
+      - name: Check gofmt
+        run: |
+          files="$(gofmt -l .)"
+          if [ -n "$files" ]; then
+            echo "Go files need formatting:"
+            echo "$files"
+            exit 1
+          fi
+
       - name: Install system dependencies
         run: |
           sudo apt-get update

cmd/bink/main.go

@@ -72,7 +72,7 @@ Common workflows:
 		}
 
 		logrus.SetFormatter(&logrus.TextFormatter{
-			FullTimestamp: false,
+			FullTimestamp:    false,
 			DisableTimestamp: true,
 		})
 	},

internal/cli/completion.go

@@ -69,5 +69,3 @@ func CompleteNodeNames(cmd *cobra.Command, args []string, toComplete string) ([]
 	}
 	return names, cobra.ShellCompDirectiveNoFileComp
 }
-
-

internal/cli/node/remove.go

@@ -23,9 +23,9 @@ func newRemoveCmd() *cobra.Command {
 	var force bool
 
 	cmd := &cobra.Command{
-		Use:   "remove <node-name>",
-		Short: "Remove a node from the cluster",
-		Long:  "Drain and remove a node from the Kubernetes cluster, then stop and remove its container",
+		Use:               "remove <node-name>",
+		Short:             "Remove a node from the cluster",
+		Long:              "Drain and remove a node from the Kubernetes cluster, then stop and remove its container",
 		Args:              cobra.ExactArgs(1),
 		ValidArgsFunction: cli.CompleteNodeNames,
 		RunE: func(cmd *cobra.Command, args []string) error {

internal/cli/registry/info.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 
 	registrypkg "github.com/bootc-dev/bink/internal/registry"
-	"go.podman.io/podman/v6/libpod/define"
 	"github.com/spf13/cobra"
+	"go.podman.io/podman/v6/libpod/define"
 )
 
 func newInfoCmd() *cobra.Command {

internal/cluster/images.go

@@ -12,9 +12,9 @@ import (
 
 	"github.com/bootc-dev/bink/internal/config"
 	"github.com/bootc-dev/bink/internal/podman"
-	"go.podman.io/podman/v6/pkg/specgen"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"
+	"go.podman.io/podman/v6/pkg/specgen"
 )
 
 var (
@@ -190,7 +190,7 @@ func (c *Cluster) populateImagesVolume(ctx context.Context, volumeName, nodeImag
 			Source:      nodeImage,
 			Destination: "/images",
 		}},
-		Volumes: []*specgen.NamedVolume{{Name: volumeName, Dest: "/var/lib/containers/storage"}},
+		Volumes:     []*specgen.NamedVolume{{Name: volumeName, Dest: "/var/lib/containers/storage"}},
 		CapAdd:      []string{"SYS_ADMIN"},
 		Devices:     []specs.LinuxDevice{{Path: "/dev/fuse"}},
 		SelinuxOpts: []string{"disable"},

internal/cluster/images_test.go

@@ -41,15 +41,15 @@ func TestExtractVersionFromTag(t *testing.T) {
 }
 
 type mockPodmanClient struct {
-	imageLabels      map[string]string
-	imageInspectErr  error
-	volumeExistsVal  bool
-	volumeExistsErr  error
-	volumeCreateErr  error
-	containerCreated bool
-	containerCreateErr error
-	containerExecOut string
-	containerExecErr error
+	imageLabels           map[string]string
+	imageInspectErr       error
+	volumeExistsVal       bool
+	volumeExistsErr       error
+	volumeCreateErr       error
+	containerCreated      bool
+	containerCreateErr    error
+	containerExecOut      string
+	containerExecErr      error
 	containerExecQuietErr error
 	containerRunQuietErr  error
 	containerExistsVal    bool
@@ -203,7 +203,7 @@ func TestEnsureImagesVolume(t *testing.T) {
 
 	t.Run("volume exists and completed", func(t *testing.T) {
 		mock := &mockPodmanClient{
-			imageLabels:    map[string]string{"bink.kubeadm-version": "1.35"},
+			imageLabels:     map[string]string{"bink.kubeadm-version": "1.35"},
 			volumeExistsVal: true,
 		}
 		c := New(Config{Name: "test", PodmanClient: mock})

internal/haproxy/haproxy.go

@@ -14,9 +14,9 @@ import (
 
 	"github.com/bootc-dev/bink/internal/config"
 	"github.com/bootc-dev/bink/internal/podman"
-	"go.podman.io/podman/v6/libpod/define"
 	"github.com/sirupsen/logrus"
 	nettypes "go.podman.io/common/libnetwork/types"
+	"go.podman.io/podman/v6/libpod/define"
 )
 
 var configTemplate = template.Must(template.New("haproxy.cfg").Parse(`global

internal/node/create.go

@@ -11,10 +11,10 @@ import (
 	"github.com/bootc-dev/bink/internal/config"
 	"github.com/bootc-dev/bink/internal/podman"
 	"github.com/bootc-dev/bink/internal/virsh"
-	"go.podman.io/podman/v6/pkg/specgen"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"
 	nettypes "go.podman.io/common/libnetwork/types"
+	"go.podman.io/podman/v6/pkg/specgen"
 )
 
 func (n *Node) createContainer(ctx context.Context) error {
@@ -222,7 +222,7 @@ func (n *Node) createVM(ctx context.Context) error {
 		Memory:    n.Memory,
 		MaxMemory: maxMemory,
 		VCPUs:     n.VCPUs,
-		Disks:  []string{overlayDisk, isoPath},
+		Disks:     []string{overlayDisk, isoPath},
 		Networks: []virsh.NetworkConfig{
 			{
 				Type:        "passt",

internal/node/ip_test.go

@@ -37,7 +37,6 @@ func TestCalculateClusterIP(t *testing.T) {
 	}
 }
 
-
 func TestCalculateClusterIP_Deterministic(t *testing.T) {
 	for i := 0; i < 10; i++ {
 		ip1 := CalculateClusterIP("podman", "node1")

internal/podman/client.go

@@ -14,6 +14,8 @@ import (
 	"strings"
 
 	"github.com/bootc-dev/bink/internal/config"
+	"github.com/sirupsen/logrus"
+	nettypes "go.podman.io/common/libnetwork/types"
 	"go.podman.io/podman/v6/pkg/api/handlers"
 	"go.podman.io/podman/v6/pkg/bindings"
 	"go.podman.io/podman/v6/pkg/bindings/containers"
@@ -22,8 +24,6 @@ import (
 	"go.podman.io/podman/v6/pkg/bindings/volumes"
 	"go.podman.io/podman/v6/pkg/domain/entities"
 	"go.podman.io/podman/v6/pkg/specgen"
-	"github.com/sirupsen/logrus"
-	nettypes "go.podman.io/common/libnetwork/types"
 )
 
 type Client struct {

internal/podman/types.go

@@ -4,9 +4,9 @@
 package podman
 
 import (
-	"go.podman.io/podman/v6/pkg/specgen"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	nettypes "go.podman.io/common/libnetwork/types"
+	"go.podman.io/podman/v6/pkg/specgen"
 )
 
 type ContainerCreateOptions struct {

internal/registry/registry.go

@@ -11,10 +11,10 @@ import (
 
 	"github.com/bootc-dev/bink/internal/config"
 	"github.com/bootc-dev/bink/internal/podman"
-	"go.podman.io/podman/v6/libpod/define"
-	"go.podman.io/podman/v6/pkg/specgen"
 	"github.com/sirupsen/logrus"
 	nettypes "go.podman.io/common/libnetwork/types"
+	"go.podman.io/podman/v6/libpod/define"
+	"go.podman.io/podman/v6/pkg/specgen"
 )
 
 type Manager struct {
@@ -141,11 +141,11 @@ func (m *Manager) StopRegistry(ctx context.Context) error {
 }
 
 type RegistryStatus struct {
-	Running   bool
-	IP        string
-	HostPort  int
-	PushURL   string
-	PullURL   string
+	Running  bool
+	IP       string
+	HostPort int
+	PushURL  string
+	PullURL  string
 }
 
 func (m *Manager) RegistryInfo(ctx context.Context) (*RegistryStatus, error) {

internal/ssh/ssh.go

@@ -27,11 +27,11 @@ type Client struct {
 
 // Config holds SSH client configuration
 type Config struct {
-	ContainerName string         // Podman container name
-	Host          string         // SSH host (usually "localhost" for port-forwarded VMs)
-	Port          string         // SSH port (usually "2222" for port-forwarded VMs)
-	KeyPath       string         // Path to SSH private key
-	User          string         // SSH user (usually "core")
+	ContainerName string // Podman container name
+	Host          string // SSH host (usually "localhost" for port-forwarded VMs)
+	Port          string // SSH port (usually "2222" for port-forwarded VMs)
+	KeyPath       string // Path to SSH private key
+	User          string // SSH user (usually "core")
 	Logger        *logrus.Logger
 	PodmanClient  *podman.Client // Podman client for container operations
 }

internal/virsh/client.go

@@ -132,4 +132,3 @@ func (c *Client) Genisoimage(ctx context.Context, outputPath, volumeID string, f
 
 	return c.podmanClient.ContainerExecQuiet(ctx, c.containerName, args)
 }
-

test/integration/images_test.go

@@ -10,9 +10,9 @@ import (
 	"strings"
 	"time"
 
-	"go.podman.io/podman/v6/pkg/specgen"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"go.podman.io/podman/v6/pkg/specgen"
 
 	"github.com/bootc-dev/bink/internal/cluster"
 	"github.com/bootc-dev/bink/internal/config"