Merge pull request #3496 from zeborg/nil-ami

Updated `clusterawsadm ami list` nil AMI output

Author: k8s-ci-robot

cmd/clusterawsadm/ami/helper.go

@@ -210,7 +210,7 @@ func getAllImages(ec2Client ec2iface.EC2API, ownerID string) (map[string][]*ec2.
 		return nil, errors.Wrap(err, "failed to fetch AMIs")
 	}
 	if len(out.Images) == 0 {
-		return nil, errors.Errorf("no AMIs in the account: %q", ownerID)
+		return nil, nil
 	}
 
 	imagesMap := make(map[string][]*ec2.Image)

cmd/clusterawsadm/cmd/ami/list/list.go

@@ -73,6 +73,10 @@ func ListAMICmd() *cobra.Command {
 			if err != nil {
 				return err
 			}
+			if len(listByVersion.Items) == 0 {
+				fmt.Println("No AMIs found")
+				return nil
+			}
 
 			if outputPrinter == string(cmdout.PrinterTypeTable) {
 				table := listByVersion.ToTable()
@@ -94,7 +98,7 @@ func ListAMICmd() *cobra.Command {
 }
 
 func addOsFlag(c *cobra.Command) {
-	c.Flags().StringVar(&opSystem, "os", "", "Operating system of the AMI to be copied")
+	c.Flags().StringVar(&opSystem, "os", "", "Operating system of the AMI to be listed")
 }
 
 func addKubernetesVersionFlag(c *cobra.Command) {