Fix transfer service dependencies:

kiashok · kiashok · commit c7a35ccdcc67 · 2023-09-08T10:26:37.000-07:00
- Fill OSVersion field of ocispec.Platform for windows OS in transfer service plugin init() - Do not return error from transfer service ReceiveStream if stream.Recv() returned context.Canceled error Signed-off-by: Kirtana Ashok <kiashok@microsoft.com> (cherry picked from commit 823e042) Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
diff --git a/pkg/transfer/streaming/stream.go b/pkg/transfer/streaming/stream.go
@@ -164,7 +164,7 @@ func ReceiveStream(ctx context.Context, stream streaming.Stream) io.Reader {
 			}
 			any, err := stream.Recv()
 			if err != nil {
-				if errors.Is(err, io.EOF) {
+				if errors.Is(err, io.EOF) || errors.Is(err, context.Canceled) {
 					err = nil
 				} else {
 					err = fmt.Errorf("received failed: %w", err)
diff --git a/platforms/platforms.go b/platforms/platforms.go
@@ -196,6 +196,10 @@ func Parse(specifier string) (specs.Platform, error) {
 				p.Variant = cpuVariant()
 			}
 
+			if p.OS == "windows" {
+				p.OSVersion = GetWindowsOsVersion()
+			}
+
 			return p, nil
 		}
 
@@ -218,6 +222,10 @@ func Parse(specifier string) (specs.Platform, error) {
 			p.Variant = ""
 		}
 
+		if p.OS == "windows" {
+			p.OSVersion = GetWindowsOsVersion()
+		}
+
 		return p, nil
 	case 3:
 		// we have a fully specified variant, this is rare
@@ -227,6 +235,10 @@ func Parse(specifier string) (specs.Platform, error) {
 			p.Variant = "v8"
 		}
 
+		if p.OS == "windows" {
+			p.OSVersion = GetWindowsOsVersion()
+		}
+
 		return p, nil
 	}
 
diff --git a/platforms/platforms_other.go b/platforms/platforms_other.go
@@ -28,3 +28,7 @@ func newDefaultMatcher(platform specs.Platform) Matcher {
 		Platform: Normalize(platform),
 	}
 }
+
+func GetWindowsOsVersion() string {
+	return ""
+}
diff --git a/platforms/platforms_windows.go b/platforms/platforms_windows.go
@@ -17,7 +17,10 @@
 package platforms
 
 import (
+	"fmt"
+
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
+	"golang.org/x/sys/windows"
 )
 
 // NewMatcher returns a Windows matcher that will match on osVersionPrefix if
@@ -32,3 +35,8 @@ func newDefaultMatcher(platform specs.Platform) Matcher {
 		},
 	}
 }
+
+func GetWindowsOsVersion() string {
+	major, minor, build := windows.RtlGetNtVersionNumbers()
+	return fmt.Sprintf("%d.%d.%d", major, minor, build)
+}

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ func ReceiveStream(ctx context.Context, stream streaming.Stream) io.Reader {`
`164`	`164`	`}`
`165`	`165`	`any, err := stream.Recv()`
`166`	`166`	`if err != nil {`
`167`		`- if errors.Is(err, io.EOF) {`
	`167`	`+ if errors.Is(err, io.EOF) \|\| errors.Is(err, context.Canceled) {`
`168`	`168`	`err = nil`
`169`	`169`	`} else {`
`170`	`170`	`err = fmt.Errorf("received failed: %w", err)`
Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,10 @@ func Parse(specifier string) (specs.Platform, error) {`
`196`	`196`	`p.Variant = cpuVariant()`
`197`	`197`	`}`
`198`	`198`
	`199`	`+ if p.OS == "windows" {`
	`200`	`+ p.OSVersion = GetWindowsOsVersion()`
	`201`	`+ }`
	`202`	`+`
`199`	`203`	`return p, nil`
`200`	`204`	`}`
`201`	`205`
`@@ -218,6 +222,10 @@ func Parse(specifier string) (specs.Platform, error) {`
`218`	`222`	`p.Variant = ""`
`219`	`223`	`}`
`220`	`224`
	`225`	`+ if p.OS == "windows" {`
	`226`	`+ p.OSVersion = GetWindowsOsVersion()`
	`227`	`+ }`
	`228`	`+`
`221`	`229`	`return p, nil`
`222`	`230`	`case 3:`
`223`	`231`	`// we have a fully specified variant, this is rare`
`@@ -227,6 +235,10 @@ func Parse(specifier string) (specs.Platform, error) {`
`227`	`235`	`p.Variant = "v8"`
`228`	`236`	`}`
`229`	`237`
	`238`	`+ if p.OS == "windows" {`
	`239`	`+ p.OSVersion = GetWindowsOsVersion()`
	`240`	`+ }`
	`241`	`+`
`230`	`242`	`return p, nil`
`231`	`243`	`}`
`232`	`244`
Original file line number	Diff line number	Diff line change
`@@ -28,3 +28,7 @@ func newDefaultMatcher(platform specs.Platform) Matcher {`
`28`	`28`	`Platform: Normalize(platform),`
`29`	`29`	`}`
`30`	`30`	`}`
	`31`	`+`
	`32`	`+func GetWindowsOsVersion() string {`
	`33`	`+ return ""`
	`34`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,10 @@`
`17`	`17`	`package platforms`
`18`	`18`
`19`	`19`	`import (`
	`20`	`+ "fmt"`
	`21`	`+`
`20`	`22`	`specs "github.com/opencontainers/image-spec/specs-go/v1"`
	`23`	`+ "golang.org/x/sys/windows"`
`21`	`24`	`)`
`22`	`25`
`23`	`26`	`// NewMatcher returns a Windows matcher that will match on osVersionPrefix if`
`@@ -32,3 +35,8 @@ func newDefaultMatcher(platform specs.Platform) Matcher {`
`32`	`35`	`},`
`33`	`36`	`}`
`34`	`37`	`}`
	`38`	`+`
	`39`	`+func GetWindowsOsVersion() string {`
	`40`	`+ major, minor, build := windows.RtlGetNtVersionNumbers()`
	`41`	`+ return fmt.Sprintf("%d.%d.%d", major, minor, build)`
	`42`	`+}`