support once for maxAllowedVersion

Author: Code-Hex

network_test.go

@@ -8,7 +8,7 @@ import (
 )
 
 func TestFileHandleNetworkDeviceAttachmentMTU(t *testing.T) {
-	if vz.MacosMajorVersionLessThan(13) {
+	if vz.Available(13) {
 		t.Skip("FileHandleNetworkDeviceAttachment.SetMaximumTransmissionUnit is supported from macOS 13")
 	}
 

osversion.go

@@ -34,13 +34,9 @@ func macOSAvailable(version float64) error {
 	return macOSBuildTargetAvailable(version)
 }
 
-func macosMajorVersionLessThan(major float64) bool {
-	return macOSMajorMinorVersion() < major
-}
-
 var (
-	majorVersion     float64
-	majorVersionOnce interface{ Do(func()) } = &sync.Once{}
+	majorMinorVersion     float64
+	majorMinorVersionOnce interface{ Do(func()) } = &sync.Once{}
 
 	// This can be replaced in the test code to enable mock.
 	// It will not be changed in production.
@@ -62,23 +58,35 @@ func fetchMajorMinorVersion() (float64, error) {
 }
 
 func macOSMajorMinorVersion() float64 {
-	majorVersionOnce.Do(func() {
+	majorMinorVersionOnce.Do(func() {
 		version, err := fetchMajorMinorVersion()
 		if err != nil {
 			panic(err)
 		}
-		majorVersion = version
+		majorMinorVersion = version
 	})
-	return majorVersion
+	return majorMinorVersion
 }
 
-var maxAllowedVersion = func() int {
-	return int(C.mac_os_x_version_max_allowed())
+var (
+	maxAllowedVersion     int
+	maxAllowedVersionOnce interface{ Do(func()) } = &sync.Once{}
+
+	getMaxAllowedVersion = func() int {
+		return int(C.mac_os_x_version_max_allowed())
+	}
+)
+
+func fetchMaxAllowedVersion() int {
+	maxAllowedVersionOnce.Do(func() {
+		maxAllowedVersion = getMaxAllowedVersion()
+	})
+	return maxAllowedVersion
 }
 
 // macOSBuildTargetAvailable checks whether the API available in a given version has been compiled.
 func macOSBuildTargetAvailable(version float64) error {
-	allowedVersion := maxAllowedVersion()
+	allowedVersion := fetchMaxAllowedVersion()
 	if allowedVersion == 0 {
 		return fmt.Errorf("undefined __MAC_OS_X_VERSION_MAX_ALLOWED: %w", ErrBuildTargetOSVersion)
 	}

osversion_arm64_test.go

@@ -11,13 +11,13 @@ import (
 )
 
 func TestAvailableVersionArm64(t *testing.T) {
-	majorVersionOnce = &nopDoer{}
+	majorMinorVersionOnce = &nopDoer{}
 	defer func() {
-		majorVersion = 0
-		majorVersionOnce = &sync.Once{}
+		majorMinorVersion = 0
+		majorMinorVersionOnce = &sync.Once{}
 	}()
 	t.Run("macOS 12", func(t *testing.T) {
-		majorVersion = 11
+		majorMinorVersion = 11
 		cases := map[string]func() error{
 			"NewMacOSBootLoader": func() error {
 				_, err := NewMacOSBootLoader()

osversion_test.go

@@ -14,14 +14,14 @@ type nopDoer struct{}
 func (*nopDoer) Do(func()) {}
 
 func TestAvailableVersion(t *testing.T) {
-	majorVersionOnce = &nopDoer{}
+	majorMinorVersionOnce = &nopDoer{}
 	defer func() {
-		majorVersion = 0
-		majorVersionOnce = &sync.Once{}
+		majorMinorVersion = 0
+		majorMinorVersionOnce = &sync.Once{}
 	}()
 
 	t.Run("macOS 11", func(t *testing.T) {
-		majorVersion = 10
+		majorMinorVersion = 10
 		cases := map[string]func() error{
 			"NewLinuxBootLoader": func() error {
 				_, err := NewLinuxBootLoader("")
@@ -105,7 +105,7 @@ func TestAvailableVersion(t *testing.T) {
 	})
 
 	t.Run("macOS 12", func(t *testing.T) {
-		majorVersion = 11
+		majorMinorVersion = 11
 		cases := map[string]func() error{
 			"NewVirtioSoundDeviceConfiguration": func() error {
 				_, err := NewVirtioSoundDeviceConfiguration()
@@ -222,6 +222,11 @@ func Test_fetchMajorMinorVersion(t *testing.T) {
 }
 
 func Test_macOSBuildTargetAvailable(t *testing.T) {
+	maxAllowedVersionOnce = &nopDoer{}
+	defer func() {
+		maxAllowedVersionOnce = &sync.Once{}
+	}()
+
 	cases := []struct {
 		// version is specified only 11, 12, 12.3, 13
 		version           float64
@@ -308,11 +313,9 @@ func Test_macOSBuildTargetAvailable(t *testing.T) {
 			tc.version,
 		)
 		t.Run(name, func(t *testing.T) {
-			_maxAllowedVersion := maxAllowedVersion
-			defer func() { maxAllowedVersion = _maxAllowedVersion }()
-			maxAllowedVersion = func() int {
-				return tc.maxAllowedVersion
-			}
+			tmp := maxAllowedVersion
+			defer func() { maxAllowedVersion = tmp }()
+			maxAllowedVersion = tc.maxAllowedVersion
 
 			err := macOSBuildTargetAvailable(tc.version)
 			if (err != nil) != tc.wantErr {

shared_directory_test.go

@@ -13,7 +13,7 @@ import (
 )
 
 func TestVirtioFileSystemDeviceConfigurationTag(t *testing.T) {
-	if vz.MacosMajorVersionLessThan(12) {
+	if vz.Available(12) {
 		t.Skip("VirtioFileSystemDeviceConfiguration is supported from macOS 12")
 	}
 
@@ -32,7 +32,7 @@ func TestVirtioFileSystemDeviceConfigurationTag(t *testing.T) {
 }
 
 func TestSingleDirectoryShare(t *testing.T) {
-	if vz.MacosMajorVersionLessThan(12) {
+	if vz.Available(12) {
 		t.Skip("SingleDirectoryShare is supported from macOS 12")
 	}
 
@@ -146,7 +146,7 @@ func TestSingleDirectoryShare(t *testing.T) {
 }
 
 func TestMultipleDirectoryShare(t *testing.T) {
-	if vz.MacosMajorVersionLessThan(12) {
+	if vz.Available(12) {
 		t.Skip("MultipleDirectoryShare is supported from macOS 12")
 	}
 

virtualization_export_test.go

@@ -1,5 +1,5 @@
 package vz
 
-func MacosMajorVersionLessThan(version float64) bool {
-	return macosMajorVersionLessThan(version)
+func Available(version float64) bool {
+	return macOSAvailable(version) != nil
 }

virtualization_test.go

@@ -172,7 +172,7 @@ func newVirtualizationMachine(
 	//
 	// This is a workaround. This version of the API does not immediately return an error and
 	// does not seem to have a connection timeout set.
-	if vz.MacosMajorVersionLessThan(12) {
+	if vz.Available(12) {
 		time.Sleep(5 * time.Second)
 	}
 
@@ -301,7 +301,7 @@ func TestRun(t *testing.T) {
 }
 
 func TestStop(t *testing.T) {
-	if vz.MacosMajorVersionLessThan(12) {
+	if vz.Available(12) {
 		t.Skip("Stop is supported from macOS 12")
 	}