Merge branch 'main' into dependabot/go_modules/github.com/klauspost/compress-1.18.0

Author: obbardc

.github/workflows/ci.yml

@@ -18,7 +18,9 @@ jobs:
     - uses: actions/setup-go@v5
     - uses: actions/checkout@v4
     - name: golangci-lint
-      uses: golangci/golangci-lint-action@v6
+      uses: golangci/golangci-lint-action@v8
+      with:
+        version: v2.3.0
 
   man-page:
     name: Check if man page has been regenerated
@@ -72,9 +74,21 @@ jobs:
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        filter: tree:0
+
+    - name: Set safe directory in container
+      run: /usr/bin/git config --global --add safe.directory ${GITHUB_WORKSPACE}
+
+    - name: Define fakemachine version
+      run: echo "FAKEMACHINE_VER=$(git describe --always --tags HEAD)" >> "$GITHUB_ENV"
 
     - name: Test build
-      run: go build -o fakemachine cmd/fakemachine/main.go
+      run: go build -ldflags="-X main.Version=${FAKEMACHINE_VER}" ./cmd/fakemachine
+
+    - name: Print fakemachine version
+      run: ./fakemachine --version
 
     - name: Run unit tests (${{matrix.backend}} backend)
       run: go test -v ./... --backend=${{matrix.backend}} | tee test.out

.golangci.yml

@@ -1,14 +1,28 @@
+version: "2"
 linters:
   enable:
-    - errcheck
     - errorlint
-    - gofmt
-    - gosimple
-    - govet
-    - ineffassign
     - misspell
     - revive
     - staticcheck
-    - stylecheck
-    - unused
     - whitespace
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

cmd/fakemachine/main.go

@@ -8,9 +8,12 @@ import (
 	"github.com/go-debos/fakemachine"
 	"github.com/jessevdk/go-flags"
 	"os"
+	"runtime/debug"
 	"strings"
 )
 
+var Version string
+
 type Options struct {
 	Backend     string            `short:"b" long:"backend" description:"Virtualisation backend to use" default:"auto"`
 	Volumes     []string          `short:"v" long:"volume" description:"volume to mount"`
@@ -22,11 +25,47 @@ type Options struct {
 	ScratchSize string            `short:"s" long:"scratchsize" description:"On-disk scratch space size (with a unit suffix, e.g. 4G); if unset, memory backed scratch space is used"`
 	ShowBoot    bool              `long:"show-boot" description:"Show boot/console messages from the fakemachine"`
 	Quiet       bool              `short:"q" long:"quiet" description:"Don't show logs from fakemachine or the backend; only print the command's stdout/stderr"`
+	Version     bool              `long:"version" description:"Print fakemachine version"`
 }
 
 var options Options
 var parser = flags.NewParser(&options, flags.Default)
 
+func GetDeterminedVersion(version string) string {
+	DeterminedVersion := "unknown"
+
+	// Use the injected Version from build system if any.
+	// Otherwise try to determine the best version string from debug info.
+	if len(version) > 0 {
+		DeterminedVersion = version
+	} else {
+		info, ok := debug.ReadBuildInfo()
+		if ok {
+			// Try vcs version first as it will only be set on a local build
+			var revision *string
+			var modified *string
+			for _, s := range info.Settings {
+				if s.Key == "vcs.revision" {
+					revision = &s.Value
+				}
+				if s.Key == "vcs.modified" {
+					modified = &s.Value
+				}
+			}
+			if revision != nil {
+				DeterminedVersion = *revision
+				if modified != nil && *modified == "true" {
+					DeterminedVersion += "-dirty"
+				}
+			} else {
+				DeterminedVersion = info.Main.Version
+			}
+		}
+	}
+
+	return DeterminedVersion
+}
+
 func warnLocalhost(variable string, value string) {
 	message := `WARNING: Environment variable %[1]s contains a reference to
 		    localhost. This may not work when running from fakemachine.
@@ -151,6 +190,11 @@ func main() {
 		os.Exit(1)
 	}
 
+	if options.Version {
+		fmt.Printf("fakemachine %v\n", GetDeterminedVersion(Version))
+		return
+	}
+
 	m, err := fakemachine.NewMachineWithBackend(options.Backend)
 	if err != nil {
 		fmt.Printf("fakemachine: %v\n", err)

go.mod

@@ -3,7 +3,7 @@ module github.com/go-debos/fakemachine
 go 1.24
 
 require (
-	al.essio.dev/pkg/shellescape v1.5.1
+	al.essio.dev/pkg/shellescape v1.6.0
 	github.com/docker/go-units v0.5.0
 	github.com/jessevdk/go-flags v1.6.1
 	github.com/klauspost/compress v1.18.0

go.sum

@@ -1,5 +1,5 @@
-al.essio.dev/pkg/shellescape v1.5.1 h1:86HrALUujYS/h+GtqoB26SBEdkWfmMI6FubjXlsXyho=
-al.essio.dev/pkg/shellescape v1.5.1/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
+al.essio.dev/pkg/shellescape v1.6.0 h1:NxFcEqzFSEVCGN2yq7Huv/9hyCEGVa/TncnOOBBeXHA=
+al.essio.dev/pkg/shellescape v1.6.0/go.mod h1:6sIqp7X2P6mThCQ7twERpZTuigpr6KbZWtls1U8I890=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=

machine_test.go

@@ -89,13 +89,14 @@ func AssertSectorSize(t *testing.T, sectorsize int) {
 		m.SetSectorSize(sectorsize)
 		_, err := m.CreateImage("test-"+strconv.Itoa(sectorsize)+"-sector-size.img", 1024*1024)
 		require.Nil(t, err)
-		if sectorsize == 512 {
+		switch sectorsize {
+		case 512:
 			exitcode, _ := m.RunInMachineWithArgs([]string{"-test.run", "TestImage512SectorSize", backendName})
 			require.Equal(t, exitcode, 0)
-		} else if sectorsize == 4096 {
+		case 4096:
 			exitcode, _ := m.RunInMachineWithArgs([]string{"-test.run", "TestImage4kSectorSize", backendName})
 			require.Equal(t, exitcode, 0)
-		} else {
+		default:
 			t.Fatalf("Unhandled sector size %d", sectorsize)
 		}
 	} else {