cmd/completion, cmd/list, cmd/rmi: Remove getImages()

#1772

Author: debarshiray

src/cmd/completion.go

@@ -129,8 +129,13 @@ func completionImageNames(cmd *cobra.Command, _ []string, _ string) ([]string, c
 		return nil, cobra.ShellCompDirectiveNoFileComp
 	}
 
+	logrus.Debug("Getting all images")
+
 	var imageNames []string
-	if images, err := getImages(true); err == nil {
+
+	if images, err := podman.GetImages(true); err != nil {
+		logrus.Debugf("Getting all images failed: %s", err)
+	} else {
 		for _, image := range images {
 			if len(image.Names) != 1 {
 				panic("cannot complete unflattened Image")
@@ -144,8 +149,13 @@ func completionImageNames(cmd *cobra.Command, _ []string, _ string) ([]string, c
 }
 
 func completionImageNamesFiltered(_ *cobra.Command, args []string, _ string) ([]string, cobra.ShellCompDirective) {
+	logrus.Debug("Getting all images")
+
 	var imageNames []string
-	if images, err := getImages(true); err == nil {
+
+	if images, err := podman.GetImages(true); err != nil {
+		logrus.Debugf("Getting all images failed: %s", err)
+	} else {
 		for _, image := range images {
 			skip := false
 

src/cmd/list.go

@@ -86,9 +86,12 @@ func list(cmd *cobra.Command, args []string) error {
 	var err error
 
 	if lsImages {
-		images, err = getImages(false)
+		logrus.Debug("Getting all images")
+
+		images, err = podman.GetImages(false)
 		if err != nil {
-			return err
+			logrus.Debugf("Getting all images failed: %s", err)
+			return errors.New("failed to get images")
 		}
 	}
 
@@ -144,18 +147,6 @@ func listHelp(cmd *cobra.Command, args []string) {
 	}
 }
 
-func getImages(fillNameWithID bool) ([]podman.Image, error) {
-	logrus.Debug("Fetching all images")
-
-	images, err := podman.GetImages(fillNameWithID)
-	if err != nil {
-		logrus.Debugf("Fetching all images failed: %s", err)
-		return nil, errors.New("failed to get images")
-	}
-
-	return images, nil
-}
-
 func listOutput(images []podman.Image, containers []podman.Container) {
 	if len(images) != 0 {
 		writer := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)

src/cmd/rmi.go

@@ -67,9 +67,12 @@ func rmi(cmd *cobra.Command, args []string) error {
 	}
 
 	if rmiFlags.deleteAll {
-		toolboxImages, err := getImages(false)
+		logrus.Debug("Getting all images")
+
+		toolboxImages, err := podman.GetImages(false)
 		if err != nil {
-			return err
+			logrus.Debugf("Getting all images failed: %s", err)
+			return errors.New("failed to get images")
 		}
 
 		for _, image := range toolboxImages {