Containerd Logging and error handling (#7)

Co-authored-by: Saurabh <saurabh.kumar@deepfence.io>
deepfence · Dec 17, 2021 · c49ad43 · c49ad43
1 parent 120f432
commit c49ad43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/containerd/containerd.go b/containerd/containerd.go
@@ -171,6 +171,10 @@ func (c Containerd) ExtractFileSystem(imageTarPath string, outputTarPath string,
 		fmt.Println("Error while Importing image")
 		return err
 	}
+	if len(imgs) == 0 {
+		fmt.Printf("No images imported, imageTarPath: %s, outputTarPath: %s, imageName: %s \n", imageTarPath, outputTarPath, imageName)
+		return errors.New("image not imported from: " + imageTarPath)
+	}
 	image, err := client.GetImage(ctx, imgs[0].Name)
 	if err != nil {
 		fmt.Println("Error while getting image from client")

diff --git a/docker/docker.go b/docker/docker.go
@@ -74,7 +74,7 @@ func (d Docker) ExtractFileSystem(imageTarPath string, outputTarPath string, ima
 	for scanner.Scan() {
 		line := scanner.Text()
 		if strings.Contains(line, "Loaded image") {
-			splits := strings.SplitAfterN(line,":", 2)
+			splits := strings.SplitAfterN(line, ":", 2)
 			if len(splits) > 1 {
 				imageId = strings.TrimSpace(splits[1])
 				break