fix error

Fix the problem with the code after go1.10.

Signed-off-by: Zhou Hao <[email protected]>

Author: Zhou Hao

cmd/oci-image-tool/validate.go

@@ -92,10 +92,7 @@ func validateAction(context *cli.Context) error {
 }
 
 func validatePath(name string) error {
-	var (
-		err error
-		typ = v.typ
-	)
+	var typ = v.typ
 
 	if v.stdout == nil {
 		v.stdout = log.New(os.Stdout, "oci-image-tool: ", 0)
@@ -120,7 +117,7 @@ func validatePath(name string) error {
 	if len(v.refs) != 0 {
 		fmt.Println("WARNING: refs are only appropriate if type is image")
 	}
-	f, err := os.Open(name)
+	f, err := os.Open(name) // nolint: errcheck, gosec
 	if err != nil {
 		return errors.Wrap(err, "unable to open file")
 	}

image/autodetect.go

@@ -45,7 +45,7 @@ func Autodetect(path string) (string, error) {
 		return TypeImageLayout, nil
 	}
 
-	f, err := os.Open(path)
+	f, err := os.Open(path) // nolint: errcheck, gosec
 	if err != nil {
 		return "", errors.Wrap(err, "unable to open file") // os.Open includes the filename
 	}

image/image.go

@@ -41,7 +41,7 @@ func ValidateZip(src string, refs []string, out *log.Logger) error {
 
 // ValidateFile opens the tar file given by the filename, then calls ValidateReader
 func ValidateFile(tarFile string, refs []string, out *log.Logger) error {
-	f, err := os.Open(tarFile)
+	f, err := os.Open(tarFile) // nolint: errcheck, gosec
 	if err != nil {
 		return errors.Wrap(err, "unable to open file")
 	}
@@ -160,7 +160,7 @@ func UnpackZip(src, dest, platform string, refs []string) error {
 
 // UnpackFile opens the file pointed by tarFileName and calls Unpack on it.
 func UnpackFile(tarFileName, dest, platform string, refs []string) error {
-	f, err := os.Open(tarFileName)
+	f, err := os.Open(tarFileName) // nolint: errcheck, gosec
 	if err != nil {
 		return errors.Wrap(err, "unable to open file")
 	}
@@ -245,7 +245,7 @@ func CreateRuntimeBundleZip(src, dest, root, platform string, refs []string) err
 // CreateRuntimeBundleFile opens the file pointed by tarFile and calls
 // CreateRuntimeBundle.
 func CreateRuntimeBundleFile(tarFile, dest, root, platform string, refs []string) error {
-	f, err := os.Open(tarFile)
+	f, err := os.Open(tarFile) // nolint: errcheck, gosec
 	if err != nil {
 		return errors.Wrap(err, "unable to open file")
 	}
@@ -320,7 +320,7 @@ func createBundle(w walker, m *v1.Manifest, dest, rootfs string) (retErr error)
 
 	if _, err = os.Stat(dest); err != nil {
 		if os.IsNotExist(err) {
-			if err2 := os.MkdirAll(dest, 0755); err2 != nil {
+			if err2 := os.MkdirAll(dest, 0750); err2 != nil {
 				return err2
 			}
 			defer func() {
@@ -382,7 +382,7 @@ func filterManifest(w walker, Manifests []v1.Descriptor, platform string) ([]*v1
 	}
 
 	if len(manifests) == 0 {
-		return manifests, fmt.Errorf("There is no matching manifest")
+		return manifests, fmt.Errorf("there is no matching manifest")
 	}
 
 	return manifests, nil

image/image_test.go

@@ -430,7 +430,7 @@ func createHashedBlob(name string) (v1.Descriptor, error) {
 		return v1.Descriptor{}, err
 	}
 
-	if err := desc.Digest.Validate(); err != nil {
+	if err = desc.Digest.Validate(); err != nil {
 		return v1.Descriptor{}, err
 	}
 

image/manifest.go

@@ -237,7 +237,7 @@ func unpackLayerEntry(dest string, header *tar.Header, reader io.Reader, entries
 		parent := filepath.Dir(header.Name)
 		parentPath := filepath.Join(dest, parent)
 		if _, err2 := os.Lstat(parentPath); err2 != nil && os.IsNotExist(err2) {
-			if err3 := os.MkdirAll(parentPath, 0755); err3 != nil {
+			if err3 := os.MkdirAll(parentPath, 0750); err3 != nil {
 				return false, err3
 			}
 		}
@@ -297,10 +297,10 @@ func unpackLayerEntry(dest string, header *tar.Header, reader io.Reader, entries
 		}
 
 		if _, err := io.Copy(f, reader); err != nil {
-			f.Close()
+			defer f.Close()
 			return false, errors.Wrap(err, "unable to copy")
 		}
-		f.Close()
+		defer f.Close()
 
 	case tar.TypeLink:
 		target := filepath.Join(dest, header.Linkname)

image/walker.go

@@ -186,7 +186,7 @@ func (w *pathWalker) walk(f walkFunc) error {
 			return f(rel, info, eofReader{})
 		}
 
-		file, err := os.Open(path)
+		file, err := os.Open(path) // nolint: errcheck, gosec
 		if err != nil {
 			return errors.Wrap(err, "unable to open file") // os.Open includes the path
 		}
@@ -208,7 +208,7 @@ func (w *pathWalker) get(desc v1.Descriptor, dst io.Writer) (int64, error) {
 		return 0, fmt.Errorf("object is dir")
 	}
 
-	fp, err := os.Open(name)
+	fp, err := os.Open(name) // nolint: errcheck, gosec
 	if err != nil {
 		return 0, errors.Wrapf(err, "get failed")
 	}
@@ -233,7 +233,7 @@ func (w *pathWalker) find(path string, ff findFunc) error {
 		return fmt.Errorf("object is dir")
 	}
 
-	file, err := os.Open(name)
+	file, err := os.Open(name) // nolint: errcheck, gosec
 	if err != nil {
 		return errors.Wrap(err, "unable to open file") // os.Open includes the path
 	}