From c08953be9d737b4bbf7cd7fad21eff636f725a8e Mon Sep 17 00:00:00 2001
From: Somtochi Onyekwere <somtochionyekwere@gmail.com>
Date: Mon, 26 Apr 2021 13:54:22 +0100
Subject: [PATCH] Revert changes to get_image and get_sources

Signed-off-by: Somtochi Onyekwere <somtochionyekwere@gmail.com>
---
 cmd/flux/get_image_all.go  | 38 +++++++++++----------------
 cmd/flux/get_source_all.go | 53 ++++++++++++++++++++------------------
 2 files changed, 43 insertions(+), 48 deletions(-)

diff --git a/cmd/flux/get_image_all.go b/cmd/flux/get_image_all.go
index a4bda6b3..270ff231 100644
--- a/cmd/flux/get_image_all.go
+++ b/cmd/flux/get_image_all.go
@@ -17,8 +17,6 @@ limitations under the License.
 package main
 
 import (
-	"strings"
-
 	"github.com/spf13/cobra"
 
 	autov1 "github.com/fluxcd/image-automation-controller/api/v1alpha2"
@@ -35,34 +33,28 @@ var getImageAllCmd = &cobra.Command{
   # List all image objects in all namespaces
   flux get images all --all-namespaces`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		var allImageCmd = []getCommand{
-			{
-				apiType: imageRepositoryType,
-				list:    imageRepositoryListAdapter{&imagev1.ImageRepositoryList{}},
-			},
-			{
-				apiType: imagePolicyType,
-				list:    &imagePolicyListAdapter{&imagev1.ImagePolicyList{}},
-			},
-			{
-				apiType: imageUpdateAutomationType,
-				list:    &imageUpdateAutomationListAdapter{&autov1.ImageUpdateAutomationList{}},
-			},
-		}
 		c := getCommand{
 			apiType: imageRepositoryType,
 			list:    imageRepositoryListAdapter{&imagev1.ImageRepositoryList{}},
 		}
 		if err := c.run(cmd, args); err != nil {
-			logger.Failuref(err.Error())
+			logError(err)
+		}
+
+		c = getCommand{
+			apiType: imagePolicyType,
+			list:    &imagePolicyListAdapter{&imagev1.ImagePolicyList{}},
+		}
+		if err := c.run(cmd, args); err != nil {
+			logError(err)
 		}
 
-		for _, c := range allImageCmd {
-			if err := c.run(cmd, args); err != nil {
-				if !strings.Contains(err.Error(), "no matches for kind") {
-					logger.Failuref(err.Error())
-				}
-			}
+		c = getCommand{
+			apiType: imageUpdateAutomationType,
+			list:    &imageUpdateAutomationListAdapter{&autov1.ImageUpdateAutomationList{}},
+		}
+		if err := c.run(cmd, args); err != nil {
+			logError(err)
 		}
 
 		return nil
diff --git a/cmd/flux/get_source_all.go b/cmd/flux/get_source_all.go
index a36bb50c..55770de5 100644
--- a/cmd/flux/get_source_all.go
+++ b/cmd/flux/get_source_all.go
@@ -17,8 +17,6 @@ limitations under the License.
 package main
 
 import (
-	"strings"
-
 	"github.com/spf13/cobra"
 
 	sourcev1 "github.com/fluxcd/source-controller/api/v1beta1"
@@ -34,31 +32,36 @@ var getSourceAllCmd = &cobra.Command{
   # List all sources in all namespaces
   flux get sources all --all-namespaces`,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		var allSourceCmd = []getCommand{
-			{
-				apiType: bucketType,
-				list:    &bucketListAdapter{&sourcev1.BucketList{}},
-			},
-			{
-				apiType: gitRepositoryType,
-				list:    &gitRepositoryListAdapter{&sourcev1.GitRepositoryList{}},
-			},
-			{
-				apiType: helmRepositoryType,
-				list:    &helmRepositoryListAdapter{&sourcev1.HelmRepositoryList{}},
-			},
-			{
-				apiType: helmChartType,
-				list:    &helmChartListAdapter{&sourcev1.HelmChartList{}},
-			},
+		c := getCommand{
+			apiType: bucketType,
+			list:    &bucketListAdapter{&sourcev1.BucketList{}},
+		}
+		if err := c.run(cmd, args); err != nil {
+			logger.Failuref(err.Error())
+		}
+
+		c = getCommand{
+			apiType: gitRepositoryType,
+			list:    &gitRepositoryListAdapter{&sourcev1.GitRepositoryList{}},
+		}
+		if err := c.run(cmd, args); err != nil {
+			logger.Failuref(err.Error())
 		}
 
-		for _, c := range allSourceCmd {
-			if err := c.run(cmd, args); err != nil {
-				if !strings.Contains(err.Error(), "no matches for kind") {
-					logger.Failuref(err.Error())
-				}
-			}
+		c = getCommand{
+			apiType: helmRepositoryType,
+			list:    &helmRepositoryListAdapter{&sourcev1.HelmRepositoryList{}},
+		}
+		if err := c.run(cmd, args); err != nil {
+			logger.Failuref(err.Error())
+		}
+
+		c = getCommand{
+			apiType: helmChartType,
+			list:    &helmChartListAdapter{&sourcev1.HelmChartList{}},
+		}
+		if err := c.run(cmd, args); err != nil {
+			logger.Failuref(err.Error())
 		}
 
 		return nil