merge #770 into opencontainers/runtime-tools

Sebastiaan van Stijn (1):
  gof(ump)t code

LGTMs: guiseppe cyphar

Author: cyphar

cgroups/cgroups.go

@@ -61,7 +61,7 @@ func FindCgroup() (Cgroup, error) {
 		} else if postSeparatorFields[0] == "cgroup2" {
 			cgroupv2 = true
 			continue
-			//TODO cgroupv2 unimplemented
+			// TODO cgroupv2 unimplemented
 		}
 	}
 

cmd/oci-runtime-tool/generate.go

@@ -1223,10 +1223,11 @@ var cgroupDeviceType = map[string]bool{
 	"b": true, // block device
 	"c": true, // character device
 }
+
 var cgroupDeviceAccess = map[string]bool{
-	"r": true, //read
-	"w": true, //write
-	"m": true, //mknod
+	"r": true, // read
+	"w": true, // write
+	"m": true, // mknod
 }
 
 // parseLinuxResourcesDeviceAccess parses the raw string passed with the --device-access-add flag
@@ -1448,12 +1449,12 @@ func parseEnv(env string) (string, string, error) {
 
 // parseEnvFile reads a file with environment variables enumerated by lines
 //
-// ``Environment variable names used by the utilities in the Shell and
+// “Environment variable names used by the utilities in the Shell and
 // Utilities volume of IEEE Std 1003.1-2001 consist solely of uppercase
 // letters, digits, and the '_' (underscore) from the characters defined in
 // Portable Character Set and do not begin with a digit. *But*, other
 // characters may be permitted by an implementation; applications shall
-// tolerate the presence of such names.''
+// tolerate the presence of such names.”
 // -- http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
 //
 // As of #16585, it's up to application inside docker to validate or not
@@ -1495,7 +1496,6 @@ func parseEnvFile(filename string) ([]string, error) {
 			}
 
 			if len(data) > 1 {
-
 				// pass the value through, no trimming
 				lines = append(lines, fmt.Sprintf("%s=%s", variable, data[1]))
 			} else {

cmd/runtimetest/main.go

@@ -501,7 +501,7 @@ func testDirectoryWriteAccess(path string) (writable bool, err error) {
 }
 
 func testFileWriteAccess(path string) (readable bool, err error) {
-	err = os.WriteFile(path, []byte("a"), 0644)
+	err = os.WriteFile(path, []byte("a"), 0o644)
 	if err == nil {
 		return true, nil
 	}
@@ -1143,10 +1143,10 @@ func (c *complianceTester) validatePosixMounts(spec *rspec.Spec) error {
 	}
 
 	var mountErrs error
-	var configSys = make(map[int]int)
-	var consumedSys = make(map[int]bool)
+	configSys := make(map[int]int)
+	consumedSys := make(map[int]bool)
 	highestMatchedConfig := -1
-	var j = 0
+	j := 0
 	for i, configMount := range spec.Mounts {
 		if configMount.Type == "bind" || configMount.Type == "rbind" {
 			c.harness.Todo().Fail("we need an (r)bind spec to test against")

generate/generate.go

@@ -323,7 +323,7 @@ func createEnvCacheMap(env []string) map[string]int {
 //
 // Deprecated: Replace with:
 //
-//   Use generator.Config = config
+//	Use generator.Config = config
 func (g *Generator) SetSpec(config *rspec.Spec) {
 	g.Config = config
 }

generate/generate_test.go

@@ -38,7 +38,7 @@ func TestGenerateValid(t *testing.T) {
 
 		// Create our toy bundle.
 		rootfsPath := filepath.Join(bundle, "rootfs")
-		if err := os.Mkdir(rootfsPath, 0755); err != nil {
+		if err := os.Mkdir(rootfsPath, 0o755); err != nil {
 			t.Fatal(err)
 		}
 		configPath := filepath.Join(bundle, "config.json")

generate/seccomp/parse_action.go

@@ -23,8 +23,10 @@ type SyscallOpts struct {
 func ParseSyscallFlag(args SyscallOpts, config *rspec.LinuxSeccomp) error {
 	var arguments []string
 	if args.Index != "" && args.Value != "" && args.ValueTwo != "" && args.Operator != "" {
-		arguments = []string{args.Action, args.Syscall, args.Index, args.Value,
-			args.ValueTwo, args.Operator}
+		arguments = []string{
+			args.Action, args.Syscall, args.Index, args.Value,
+			args.ValueTwo, args.Operator,
+		}
 	} else {
 		arguments = []string{args.Action, args.Syscall}
 	}

generate/seccomp/seccomp_default.go

@@ -32,7 +32,6 @@ func arches() []rspec.Arch {
 
 // DefaultProfile defines the whitelist for the default seccomp profile.
 func DefaultProfile(rs *specs.Spec) *rspec.LinuxSeccomp {
-
 	syscalls := []rspec.LinuxSyscall{
 		{
 			Names: []string{
@@ -535,7 +534,6 @@ func DefaultProfile(rs *specs.Spec) *rspec.LinuxSeccomp {
 				},
 			},
 		}...)
-
 	}
 
 	arch := runtime.GOARCH

specerror/bundle.go

@@ -16,11 +16,9 @@ const (
 	ArtifactsInSingleDir
 )
 
-var (
-	containerFormatRef = func(version string) (reference string, err error) {
-		return fmt.Sprintf(referenceTemplate, version, "bundle.md#container-format"), nil
-	}
-)
+var containerFormatRef = func(version string) (reference string, err error) {
+	return fmt.Sprintf(referenceTemplate, version, "bundle.md#container-format"), nil
+}
 
 func init() {
 	register(ConfigInRootBundleDir, rfc2119.Must, containerFormatRef)

specerror/runtime-linux.go

@@ -12,11 +12,9 @@ const (
 	DefaultRuntimeLinuxSymlinks Code = 0xf001 + iota
 )
 
-var (
-	devSymbolicLinksRef = func(version string) (reference string, err error) {
-		return fmt.Sprintf(referenceTemplate, version, "runtime-linux.md#dev-symbolic-links"), nil
-	}
-)
+var devSymbolicLinksRef = func(version string) (reference string, err error) {
+	return fmt.Sprintf(referenceTemplate, version, "runtime-linux.md#dev-symbolic-links"), nil
+}
 
 func init() {
 	register(DefaultRuntimeLinuxSymlinks, rfc2119.Must, devSymbolicLinksRef)

validate/validate.go

@@ -298,7 +298,7 @@ func (v *Validator) checkEventHooks(hookType string, hooks []rspec.Hook, hostSpe
 			if err != nil {
 				errs = multierror.Append(errs, fmt.Errorf("cannot find %s hook: %v", hookType, hook.Path))
 			}
-			if fi.Mode()&0111 == 0 {
+			if fi.Mode()&0o111 == 0 {
 				errs = multierror.Append(errs, fmt.Errorf("the %s hook %v: is not executable", hookType, hook.Path))
 			}
 		}
@@ -358,7 +358,7 @@ func (v *Validator) CheckProcess() (errs error) {
 				errs = multierror.Append(errs, err)
 			} else {
 				m := fileinfo.Mode()
-				if m.IsDir() || m&0111 == 0 {
+				if m.IsDir() || m&0o111 == 0 {
 					errs = multierror.Append(errs, fmt.Errorf("arg %q is not executable", process.Args[0]))
 				}
 			}