Fix version matching test and add GoVersion field

Signed-off-by: William Yao <[email protected]>

Author: willie-yao

test/linux_target_test.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"go/version"
 	"io"
 	"io/fs"
 	"os"
@@ -31,8 +32,6 @@ import (
 	"github.com/project-dalec/dalec/frontend"
 	"github.com/project-dalec/dalec/frontend/pkg/bkfs"
 	"github.com/project-dalec/dalec/targets"
-	"github.com/project-dalec/dalec/targets/linux/deb/ubuntu"
-	"github.com/project-dalec/dalec/targets/linux/rpm/azlinux"
 	"github.com/project-dalec/dalec/test/testenv"
 	"golang.org/x/exp/maps"
 	"gotest.tools/v3/assert"
@@ -98,9 +97,10 @@ type testLinuxConfig struct {
 		Units   string
 		Targets string
 	}
-	Libdir  string
-	Worker  workerConfig
-	Release OSRelease
+	Libdir    string
+	Worker    workerConfig
+	Release   OSRelease
+	GoVersion string
 
 	Platforms         []ocispecs.Platform
 	PackageOutputPath func(spec *dalec.Spec, platform ocispecs.Platform) string
@@ -2274,23 +2274,20 @@ func True(t interface{}, value bool, msgAndArgs ...interface{}) bool {
 		t.Parallel()
 		ctx := startTestSpan(baseCtx, t)
 
-		// Skip on distros with older Go versions that can't handle toolchain downloads
-		// This test uses golang.org/x/[email protected] which may require Go 1.24+
-		// focal and mariner2 have Go < 1.22 and network is disabled during builds
-		skip.If(t, testConfig.Target.Key == azlinux.Mariner2TargetKey || testConfig.Target.Key == ubuntu.FocalDefaultTargetKey,
-			"Test requires Go 1.22+ for automatic toolchain management")
+		// Skip on distros with Go versions below 1.21 that can't handle automatic toolchain management
+		skip.If(t, testConfig.GoVersion == "" || version.Compare("go"+testConfig.GoVersion, "go1.21") < 0,
+			"Test requires Go 1.21+ for automatic toolchain management")
 
 		// Start with go.mod and go.work both at go 1.18
-		// Use a replace directive that may bump go.mod version
 		// Verify that go.work stays in sync with go.mod
 		pg := dalec.ProgressGroup("Setup test context")
 		contextSt := llb.Scratch().
-			File(llb.Mkfile("/go.mod", 0644, []byte("module example.com/test\n\ngo 1.18\n\nrequire golang.org/x/crypto v0.30.0\n")), pg).
+			File(llb.Mkfile("/go.mod", 0644, []byte("module example.com/test\n\ngo 1.18\n\nrequire go.etcd.io/etcd/client/v3 v3.5.0\n")), pg).
 			File(llb.Mkfile("/go.work", 0644, []byte("go 1.18\n\nuse .\n")), pg).
 			File(llb.Mkfile("/main.go", 0644, []byte(`package main
 import (
 	"fmt"
-	_ "golang.org/x/crypto/bcrypt"
+	_ "go.etcd.io/etcd/client/v3"
 )
 func main() {
 	fmt.Println("hello")
@@ -2315,8 +2312,8 @@ func main() {
 							Gomod: &dalec.GeneratorGomod{
 								Edits: &dalec.GomodEdits{
 									Replace: []dalec.GomodReplace{
-										// This may cause go.mod version to be bumped depending on the Go toolchain
-										{Original: "golang.org/x/crypto", Update: "golang.org/x/[email protected]"},
+										// v3.5.14 requires go 1.21, which will bump go.mod from 1.18 to 1.21
+										{Original: "go.etcd.io/etcd/client/v3", Update: "go.etcd.io/etcd/client/[email protected]"},
 									},
 								},
 							},
@@ -2331,8 +2328,8 @@ func main() {
 			},
 			Build: dalec.ArtifactBuild{
 				Steps: []dalec.BuildStep{
-					{Command: "grep -F 'replace golang.org/x/crypto' ./src/go.mod"},
-					{Command: "grep -F 'golang.org/x/crypto v0.45.0' ./src/go.mod"},
+					{Command: "grep -F 'replace go.etcd.io/etcd/client/v3' ./src/go.mod"},
+					{Command: "grep -F 'go.etcd.io/etcd/client/v3 v3.5.14' ./src/go.mod"},
 					// Verify go.work exists
 					{Command: "test -f ./src/go.work"},
 					// Verify the go versions in go.mod and go.work match exactly

test/target_almalinux_test.go

@@ -45,6 +45,7 @@ func TestAlmalinux9(t *testing.T) {
 			ID:        "almalinux",
 			VersionID: "9",
 		},
+		GoVersion: "1.25",
 		Platforms: []ocispecs.Platform{
 			{OS: "linux", Architecture: "amd64"},
 			{OS: "linux", Architecture: "arm64"},
@@ -90,6 +91,7 @@ func TestAlmalinux8(t *testing.T) {
 			ID:        "almalinux",
 			VersionID: "8",
 		},
+		GoVersion: "1.25",
 		Platforms: []ocispecs.Platform{
 			{OS: "linux", Architecture: "amd64"},
 			{OS: "linux", Architecture: "arm64"},

test/target_azlinux_test.go

@@ -70,6 +70,7 @@ func TestMariner2(t *testing.T) {
 			ID:        "mariner",
 			VersionID: "2.0",
 		},
+		GoVersion: "1.22",
 		Platforms: []ocispecs.Platform{
 			{OS: "linux", Architecture: "amd64"},
 			{OS: "linux", Architecture: "arm64"},
@@ -113,6 +114,7 @@ func TestAzlinux3(t *testing.T) {
 			ID:        "azurelinux",
 			VersionID: "3.0",
 		},
+		GoVersion: "1.25",
 		Platforms: []ocispecs.Platform{
 			{OS: "linux", Architecture: "amd64"},
 			{OS: "linux", Architecture: "arm64"},

test/target_debian_test.go

@@ -16,6 +16,7 @@ func TestTrixie(t *testing.T) {
 	testConf := debLinuxTestConfigFor(
 		debian.TrixieDefaultTargetKey,
 		debian.TrixieConfig,
+		withGoVersion("1.24"),
 		withPackageOverride("rust", "rust-all"),
 		withPackageOverride("bazel", "bazel-bootstrap"),
 	)
@@ -31,6 +32,7 @@ func TestBookworm(t *testing.T) {
 	testConf := debLinuxTestConfigFor(
 		debian.BookwormDefaultTargetKey,
 		debian.BookwormConfig,
+		withGoVersion("1.19"),
 		withPackageOverride("rust", "rust-all"),
 		withPackageOverride("bazel", "bazel-bootstrap"),
 	)
@@ -46,6 +48,7 @@ func TestBullseye(t *testing.T) {
 	testConf := debLinuxTestConfigFor(
 		debian.BullseyeDefaultTargetKey,
 		debian.BullseyeConfig,
+		withGoVersion("1.19"),
 		withPackageOverride("golang", "golang-1.19"),
 		withPackageOverride("rust", "cargo-web"),
 		withPackageOverride("bazel", noPackageAvailable),

test/target_rockylinux_test.go

@@ -45,6 +45,7 @@ func TestRockylinux9(t *testing.T) {
 			ID:        "rocky",
 			VersionID: "9",
 		},
+		GoVersion: "1.25",
 		Platforms: []ocispecs.Platform{
 			{OS: "linux", Architecture: "amd64"},
 			{OS: "linux", Architecture: "arm64"},
@@ -90,6 +91,7 @@ func TestRockylinux8(t *testing.T) {
 			ID:        "rocky",
 			VersionID: "8",
 		},
+		GoVersion: "1.25",
 		Platforms: []ocispecs.Platform{
 			{OS: "linux", Architecture: "amd64"},
 			{OS: "linux", Architecture: "arm64"},

test/target_ubuntu_test.go

@@ -23,6 +23,12 @@ func withPackageOverride(oldPkg, newPkg string) func(cfg *testLinuxConfig) {
 	}
 }
 
+func withGoVersion(version string) func(cfg *testLinuxConfig) {
+	return func(cfg *testLinuxConfig) {
+		cfg.GoVersion = version
+	}
+}
+
 func debLinuxTestConfigFor(targetKey string, cfg *distro.Config, opts ...func(*testLinuxConfig)) testLinuxConfig {
 	var sysextTarget string
 	if cfg.SysextSupported {
@@ -154,6 +160,7 @@ func TestJammy(t *testing.T) {
 
 	ctx := startTestSpan(baseCtx, t)
 	testConf := debLinuxTestConfigFor(ubuntu.JammyDefaultTargetKey, ubuntu.JammyConfig,
+		withGoVersion("1.18"),
 		withPackageOverride("rust", "rust-all"),
 		withPackageOverride("bazel", noPackageAvailable),
 		withPackageOverride("python", "python3 python3-pip"),
@@ -168,6 +175,7 @@ func TestNoble(t *testing.T) {
 
 	ctx := startTestSpan(baseCtx, t)
 	testConf := debLinuxTestConfigFor(ubuntu.NobleDefaultTargetKey, ubuntu.NobleConfig,
+		withGoVersion("1.22"),
 		withPackageOverride("rust", "rust-all"),
 		withPackageOverride("bazel", "bazel-bootstrap"),
 	)
@@ -180,6 +188,7 @@ func TestFocal(t *testing.T) {
 
 	ctx := startTestSpan(baseCtx, t)
 	testConf := debLinuxTestConfigFor(ubuntu.FocalDefaultTargetKey, ubuntu.FocalConfig,
+		withGoVersion("1.22"),
 		withPackageOverride("golang", "golang-1.22"),
 		withPackageOverride("rust", "rust-all"),
 		withPackageOverride("bazel", noPackageAvailable),
@@ -194,6 +203,7 @@ func TestBionic(t *testing.T) {
 
 	ctx := startTestSpan(baseCtx, t)
 	testConf := debLinuxTestConfigFor(ubuntu.BionicDefaultTargetKey, ubuntu.BionicConfig,
+		withGoVersion("1.18"),
 		withPackageOverride("golang", "golang-1.18"),
 		withPackageOverride("rust", "rust-all"),
 		withPackageOverride("bazel", noPackageAvailable),