Remove workaround for HcsFormatWritableLayerVhd

TBBle · TBBle · commit 5bfad0da59da · 2022-04-27T02:34:36.000+10:00
The workaround is internalised in hcsshim past v0.9 (not yet named, I
guess v0.10?) so we don't need to do it anymore.
diff --git a/pkg/os/os_windows_test.go b/pkg/os/os_windows_test.go
@@ -18,42 +18,16 @@ package os
 
 import (
 	"context"
-	"fmt"
 	"os"
 	"path/filepath"
-	"strconv"
 	"strings"
-	"syscall"
 	"testing"
 
 	"github.com/Microsoft/go-winio/vhd"
 	"github.com/Microsoft/hcsshim/computestorage"
-	"github.com/Microsoft/hcsshim/osversion"
 	"golang.org/x/sys/windows"
-	"golang.org/x/sys/windows/registry"
 )
 
-// Getting build number via osversion.Build() requires the program to be properly manifested, which
-// requires importing `github.com/Microsoft/hcsshim/test/functional/manifest`, which is a dependency
-// we want to avoid here. Instead, since this is just test code, simply parse the build number from
-// the registry.
-func getWindowsBuildNumber() (int, error) {
-	k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
-	if err != nil {
-		return 0, fmt.Errorf("read CurrentVersion reg key: %s", err)
-	}
-	defer k.Close()
-	buildNumStr, _, err := k.GetStringValue("CurrentBuild")
-	if err != nil {
-		return 0, fmt.Errorf("read CurrentBuild reg value: %s", err)
-	}
-	buildNum, err := strconv.Atoi(buildNumStr)
-	if err != nil {
-		return 0, err
-	}
-	return buildNum, nil
-}
-
 func makeSymlink(t *testing.T, oldName string, newName string) {
 	if err := os.Symlink(oldName, newName); err != nil {
 		t.Fatalf("creating symlink: %s", err)
@@ -73,57 +47,11 @@ func getVolumeGUIDPath(t *testing.T, path string) string {
 	return final
 }
 
-func openDisk(path string) (windows.Handle, error) {
-	u16, err := windows.UTF16PtrFromString(path)
-	if err != nil {
-		return 0, err
-	}
-	h, err := windows.CreateFile(
-		u16,
-		windows.GENERIC_READ|windows.GENERIC_WRITE,
-		windows.FILE_SHARE_READ|windows.FILE_SHARE_WRITE,
-		nil,
-		windows.OPEN_EXISTING,
-		windows.FILE_ATTRIBUTE_NORMAL|windows.FILE_FLAG_NO_BUFFERING,
-		0)
-	if err != nil {
-		return 0, &os.PathError{
-			Op:   "CreateFile",
-			Path: path,
-			Err:  err,
-		}
-	}
-	return h, nil
-}
-
 func formatVHD(vhdHandle windows.Handle) error {
-	h := vhdHandle
-	// Pre-19H1 HcsFormatWritableLayerVhd expects a disk handle.
-	// On newer builds it expects a VHD handle instead.
-	// Open a handle to the VHD's disk object if needed.
-	build, err := getWindowsBuildNumber()
-	if err != nil {
-		return err
-	}
-	if build < osversion.V19H1 {
-		diskPath, err := vhd.GetVirtualDiskPhysicalPath(syscall.Handle(h))
-		if err != nil {
-			return err
-		}
-		diskHandle, err := openDisk(diskPath)
-		if err != nil {
-			return err
-		}
-		defer windows.CloseHandle(diskHandle)
-		h = diskHandle
-	}
 	// Formatting a disk directly in Windows is a pain, so we use FormatWritableLayerVhd to do it.
 	// It has a side effect of creating a sandbox directory on the formatted volume, but it's safe
 	// to just ignore that for our purposes here.
-	if err := computestorage.FormatWritableLayerVhd(context.Background(), h); err != nil {
-		return err
-	}
-	return nil
+	return computestorage.FormatWritableLayerVhd(context.Background(), vhdHandle)
 }
 
 // Creates a VHD with a NTFS volume. Returns the volume path.
