use os/exec package

Signed-off-by: Maksim An <maksiman@microsoft.com>
microsoft · Apr 22, 2022 · 9f020aa · 9f020aa
1 parent 9622f14
commit 9f020aa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 109 deletions.
diff --git a/internal/security/grantvmgroupaccess.go b/internal/security/grantvmgroupaccess.go
@@ -81,13 +81,13 @@ const (
 // include Grant ACE entries for the VM Group SID. This is a golang re-
 // implementation of the same function in vmcompute, just not exported in
 // RS5. Which kind of sucks. Sucks a lot :/
-func GrantVmGroupAccess(name string) error {  //nolint:stylecheck // ST1003
+func GrantVmGroupAccess(name string) error { //nolint:stylecheck // ST1003
 	return GrantVmGroupAccessWithMask(name, accessMaskDesiredPermission)
 }
 
 // GrantVmGroupAccessWithMask sets the desired DACL for a specified file or
 // directory.
-func GrantVmGroupAccessWithMask(name string, access accessMask) error {  //nolint:stylecheck // ST1003
+func GrantVmGroupAccessWithMask(name string, access accessMask) error { //nolint:stylecheck // ST1003
 	if access == 0 || access<<4 != 0 {
 		return fmt.Errorf("invalid access mask: 0x%08x", access)
 	}

diff --git a/internal/security/grantvmgroupaccess_test.go b/internal/security/grantvmgroupaccess_test.go
@@ -6,11 +6,10 @@ package security
 import (
 	"fmt"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"regexp"
 	"testing"
-
-	exec "golang.org/x/sys/execabs"
 )
 
 const (

diff --git a/test/vendor/github.com/Microsoft/hcsshim/internal/security/grantvmgroupaccess.go b/test/vendor/github.com/Microsoft/hcsshim/internal/security/grantvmgroupaccess.go
diff --git a/vendor/golang.org/x/sys/execabs/execabs.go b/vendor/golang.org/x/sys/execabs/execabs.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -207,7 +207,6 @@ golang.org/x/net/trace
 golang.org/x/sync/errgroup
 # golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e
 ## explicit; go 1.17
-golang.org/x/sys/execabs
 golang.org/x/sys/internal/unsafeheader
 golang.org/x/sys/unix
 golang.org/x/sys/windows