Add fallback for windows platforms without osversion

cpuguy83 · cpuguy83 · commit 8442521645ba · 2023-02-13T23:07:06.000Z
The background for this change:

1. Windows host-process containers do not have an OS version set
2. Buildx v0.10 started pushing manifest lists by default, but it never
   has the OSVersion in the platform data (not that there is any way to
   specify what particular OS version you want). The change means that
   containerd cannot run images created with the new buildx on Windows
   because there is no matching OSVersion in the list of manifests.

Signed-off-by: Brian Goff &lt;cpuguy83@gmail.com&gt;
diff --git a/platforms/defaults_windows.go b/platforms/defaults_windows.go
@@ -50,7 +50,10 @@ func (m windowsmatcher) Match(p specs.Platform) bool {
 	match := m.defaultMatcher.Match(p)
 
 	if match && m.OS == "windows" {
-		return strings.HasPrefix(p.OSVersion, m.osVersionPrefix) && m.defaultMatcher.Match(p)
+		if strings.HasPrefix(p.OSVersion, m.osVersionPrefix) {
+			return true
+		}
+		return p.OSVersion == ""
 	}
 
 	return match
diff --git a/platforms/defaults_windows_test.go b/platforms/defaults_windows_test.go
@@ -128,7 +128,7 @@ func TestMatchComparerMatch_WCOW(t *testing.T) {
 				Architecture: "amd64",
 				OS:           "windows",
 			},
-			match: false,
+			match: true,
 		},
 		{
 			platform: imagespec.Platform{
@@ -251,11 +251,11 @@ func TestMatchComparerLess(t *testing.T) {
 		{
 			Architecture: "amd64",
 			OS:           "windows",
-			OSVersion:    "10.0.17764.1",
 		},
 		{
 			Architecture: "amd64",
 			OS:           "windows",
+			OSVersion:    "10.0.17764.1",
 		},
 		{
 			Architecture: "amd64",
diff --git a/platforms/platforms_windows_test.go b/platforms/platforms_windows_test.go
@@ -19,9 +19,23 @@ package platforms
 import (
 	"testing"
 
+	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/stretchr/testify/require"
 )
 
 func TestNormalize(t *testing.T) {
 	require.Equal(t, DefaultSpec(), Normalize(DefaultSpec()))
 }
+
+func TestFallbackOnOSVersion(t *testing.T) {
+	p := specs.Platform{
+		OS:           "windows",
+		Architecture: "amd64",
+		OSVersion:    "99.99.99.99",
+	}
+
+	other := specs.Platform{OS: p.OS, Architecture: p.Architecture}
+
+	m := NewMatcher(p)
+	require.True(t, m.Match(other))
+}

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ func TestMatchComparerMatch_WCOW(t *testing.T) {`
`128`	`128`	`Architecture: "amd64",`
`129`	`129`	`OS: "windows",`
`130`	`130`	`},`
`131`		`- match: false,`
	`131`	`+ match: true,`
`132`	`132`	`},`
`133`	`133`	`{`
`134`	`134`	`platform: imagespec.Platform{`
`@@ -251,11 +251,11 @@ func TestMatchComparerLess(t *testing.T) {`
`251`	`251`	`{`
`252`	`252`	`Architecture: "amd64",`
`253`	`253`	`OS: "windows",`
`254`		`- OSVersion: "10.0.17764.1",`
`255`	`254`	`},`
`256`	`255`	`{`
`257`	`256`	`Architecture: "amd64",`
`258`	`257`	`OS: "windows",`
	`258`	`+ OSVersion: "10.0.17764.1",`
`259`	`259`	`},`
`260`	`260`	`{`
`261`	`261`	`Architecture: "amd64",`