modify taint

cmd/sealer/cmd/alpha/umount.go

@@ -15,6 +15,7 @@
 package alpha
 
 import (
+	"fmt"
 	"io/fs"
 	"io/ioutil"
 	"os"
@@ -95,7 +96,10 @@ func NewUmountCmd() *cobra.Command {
 			}
 
 			for _, c := range containers {
-				id := getContainerID(images, args[0])
+				id, err := getContainerID(images, args[0])
+				if err != nil {
+					return err
+				}
 				if c.ImageID == id {
 					cid = c.ID
 				}
@@ -123,25 +127,22 @@ func NewUmountCmd() *cobra.Command {
 	return umountCmd
 }
 
-func getContainerID(images []storage.Image, imageName string) string {
-	var cid string
+func getContainerID(images []storage.Image, imageName string) (string, error) {
 	for _, image := range images {
 		for _, n := range image.Names {
 			if n == imageName {
-				cid = image.ID
+				return image.ID, nil
 			}
 		}
 	}
-	return cid
+	return "", fmt.Errorf("failed to get container id")
 }
 
 func removeContainerDir(image storage.Image, file fs.FileInfo, imageName string) error {
 	for _, n := range image.Names {
-		if n == imageName {
-			if file.Name() == image.ID {
-				if err := os.RemoveAll(filepath.Join(common.DefaultLayerDir, file.Name())); err != nil {
-					return err
-				}
+		if n == imageName && file.Name() == image.ID {
+			if err := os.RemoveAll(filepath.Join(common.DefaultLayerDir, file.Name())); err != nil {
+				return err
 			}
 		}
 	}