match.Platforms

Signed-off-by: Avi Deitcher <avi@deitcher.net>
google · Nov 24, 2020 · e138239 · e138239
1 parent 6df0303
commit e138239
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/pkg/v1/match/match.go b/pkg/v1/match/match.go
@@ -47,11 +47,22 @@ func Annotation(key, value string) Matcher {
 // Platform returns a match.Matcher that matches on the provided platform.
 // Ignores any descriptors that do not have a platform.
 func Platform(platform v1.Platform) Matcher {
+	return Platforms([]v1.Platform{platform})
+}
+
+// Platforms returns a match.Matcher that matches on any one of the provided platforms.
+// Ignores any descriptors that do not have a platform.
+func Platforms(platforms []v1.Platform) Matcher {
 	return func(desc v1.Descriptor) bool {
 		if desc.Platform == nil {
 			return false
 		}
-		return desc.Platform.Equals(platform)
+		for _, platform := range platforms {
+			if desc.Platform.Equals(platform) {
+				return true
+			}
+		}
+		return false
 	}
 }
 

diff --git a/pkg/v1/match/match_test.go b/pkg/v1/match/match_test.go
@@ -85,6 +85,27 @@ func TestPlatform(t *testing.T) {
 	}
 }
 
+func TestPlatforms(t *testing.T) {
+	tests := []struct {
+		desc      v1.Descriptor
+		platforms []v1.Platform
+		match     bool
+	}{
+		{v1.Descriptor{Platform: &v1.Platform{Architecture: "amd64", OS: "linux"}}, []v1.Platform{{Architecture: "amd64", OS: "darwin"}, {Architecture: "amd64", OS: "linux"}}, true},
+		{v1.Descriptor{Platform: &v1.Platform{Architecture: "amd64", OS: "linux"}}, []v1.Platform{{Architecture: "arm64", OS: "linux"}, {Architecture: "s390x", OS: "linux"}}, false},
+		{v1.Descriptor{Platform: &v1.Platform{OS: "linux"}}, []v1.Platform{{Architecture: "arm64", OS: "linux"}}, false},
+		{v1.Descriptor{Platform: &v1.Platform{}}, []v1.Platform{{Architecture: "arm64", OS: "linux"}}, false},
+		{v1.Descriptor{Platform: nil}, []v1.Platform{{Architecture: "arm64", OS: "linux"}}, false},
+		{v1.Descriptor{}, []v1.Platform{{Architecture: "arm64", OS: "linux"}}, false},
+	}
+	for i, tt := range tests {
+		f := match.Platforms(tt.platforms)
+		if match := f(tt.desc); match != tt.match {
+			t.Errorf("%d: mismatched, got %v expected %v for desc %#v platform %#v", i, match, tt.match, tt.desc, tt.platforms)
+		}
+	}
+}
+
 func TestMediaTypes(t *testing.T) {
 	tests := []struct {
 		desc       v1.Descriptor