Include extension for shim binary format on Windows

jterry75 · jterry75 · commit 764afa0d180f · 2019-01-28T12:42:08.000-08:00
Use full name including extension for shim binary format on Windows in order to
match any stat path faster without a fallback.

Signed-off-by: Justin Terry (VM) &lt;juterry@microsoft.com&gt;
diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go
@@ -31,8 +31,6 @@ import (
 	"github.com/pkg/errors"
 )
 
-const shimBinaryFormat = "containerd-shim-%s-%s"
-
 var runtimePaths sync.Map
 
 // Command returns the shim command with the provided args and configuration
diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go
@@ -31,6 +31,8 @@ import (
 	"github.com/pkg/errors"
 )
 
+const shimBinaryFormat = "containerd-shim-%s-%s"
+
 func getSysProcAttr() *syscall.SysProcAttr {
 	return &syscall.SysProcAttr{
 		Setpgid: true,
diff --git a/runtime/v2/shim/util_windows.go b/runtime/v2/shim/util_windows.go
@@ -29,6 +29,8 @@ import (
 	"github.com/pkg/errors"
 )
 
+const shimBinaryFormat = "containerd-shim-%s-%s.exe"
+
 func getSysProcAttr() *syscall.SysProcAttr {
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ import (`
`31`	`31`	`"github.com/pkg/errors"`
`32`	`32`	`)`
`33`	`33`
`34`		`-const shimBinaryFormat = "containerd-shim-%s-%s"`
`35`		`-`
`36`	`34`	`var runtimePaths sync.Map`
`37`	`35`
`38`	`36`	`// Command returns the shim command with the provided args and configuration`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ import (`
`31`	`31`	`"github.com/pkg/errors"`
`32`	`32`	`)`
`33`	`33`
	`34`	`+const shimBinaryFormat = "containerd-shim-%s-%s"`
	`35`	`+`
`34`	`36`	`func getSysProcAttr() *syscall.SysProcAttr {`
`35`	`37`	`return &syscall.SysProcAttr{`
`36`	`38`	`Setpgid: true,`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@ import (`
`29`	`29`	`"github.com/pkg/errors"`
`30`	`30`	`)`
`31`	`31`
	`32`	`+const shimBinaryFormat = "containerd-shim-%s-%s.exe"`
	`33`	`+`
`32`	`34`	`func getSysProcAttr() *syscall.SysProcAttr {`
`33`	`35`	`return nil`
`34`	`36`	`}`