unify getPackages func, move table usage in cmd level

Author: ca7alindev

cmd/kndp/registry/search.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/charmbracelet/log"
 	"github.com/kndpio/kndp/internal/search"
+	"github.com/pterm/pterm"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 )
@@ -17,9 +18,14 @@ type SearchCmd struct {
 }
 
 func (c *SearchCmd) Run(ctx context.Context, client *kubernetes.Clientset, config *rest.Config, logger *log.Logger) error {
-	err := search.SearchCmd(ctx, client, config, c.Query, c.Versions, logger)
+	tableRegs, err := search.SearchPackages(ctx, client, config, c.Query, c.Versions, logger)
 	if err != nil {
 		return err
 	}
+	if len(tableRegs) <= 1 {
+		logger.Info("No packages found")
+	} else {
+		pterm.DefaultTable.WithHasHeader().WithData(tableRegs).Render()
+	}
 	return nil
 }

internal/github/github.go

@@ -12,8 +12,8 @@ import (
 	"github.com/google/go-github/v61/github"
 )
 
-// GetGithubPackages list packages and their versions from GitHub Container Registry
-func GetGithubPackages(ctx context.Context, query string, version bool, r *registry.Registry, registryUrl string, org string, logger *log.Logger) ([]*github.Package, map[string][]*github.PackageVersion, error) {
+// GetPackages list packages and their versions from Container Registry
+func GetPackages(ctx context.Context, query string, version bool, r *registry.Registry, registryUrl string, org string, logger *log.Logger) (pterm.TableData, error) {
 	auth := registry.RegistryConfig{}
 	json.Unmarshal([]byte(r.Data[".dockerconfigjson"]), &auth)
 	clientgh := github.NewClient(nil).WithAuthToken(auth.Auths[registryUrl].Password)
@@ -25,15 +25,15 @@ func GetGithubPackages(ctx context.Context, query string, version bool, r *regis
 	pkgs, _, err := clientgh.Organizations.ListPackages(ctx, org, &github.PackageListOptions{PackageType: &pkgType})
 	if err != nil {
 		logger.Errorf("Cannot get packages from %s", registryUrl)
-		return nil, nil, err
+		return nil, err
 	}
 
 	pkgVersions := make(map[string][]*github.PackageVersion)
 	for _, pkg := range pkgs {
 		versions, _, err := clientgh.Organizations.PackageGetAllVersions(ctx, org, pkgType, pkg.GetName(), nil)
 		if err != nil {
 			logger.Errorf("Cannot get package versions for %s/%s", org, *pkg.Name)
-			return nil, nil, err
+			return nil, err
 		}
 		if !version {
 			if len(versions) > 0 {
@@ -59,11 +59,6 @@ func GetGithubPackages(ctx context.Context, query string, version bool, r *regis
 			}
 		}
 	}
-	if len(tableRegs) <= 1 {
-		logger.Info("No packages found")
-	} else {
-		pterm.DefaultTable.WithHasHeader().WithData(tableRegs).Render()
-	}
 
-	return pkgs, pkgVersions, nil
+	return tableRegs, nil
 }

internal/search/search.go

@@ -6,18 +6,19 @@ import (
 	"strings"
 
 	"github.com/charmbracelet/log"
+	"github.com/pterm/pterm"
 
 	"github.com/kndpio/kndp/internal/github"
 	"github.com/kndpio/kndp/internal/registry"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 )
 
-func SearchCmd(ctx context.Context, client *kubernetes.Clientset, config *rest.Config, query string, versions bool, logger *log.Logger) error {
+func SearchPackages(ctx context.Context, client *kubernetes.Clientset, config *rest.Config, query string, versions bool, logger *log.Logger) (pterm.TableData, error) {
 	registries, err := registry.Registries(ctx, client)
 	if err != nil {
 		logger.Error("Cannot get registries")
-		return err
+		return nil, err
 	}
 
 	for _, r := range registries {
@@ -27,15 +28,15 @@ func SearchCmd(ctx context.Context, client *kubernetes.Clientset, config *rest.C
 		// Switch statement to handle different registry types
 		switch {
 		case strings.Contains(registryUrl, "ghcr.io"):
-			_, _, err := github.GetGithubPackages(ctx, query, versions, r, registryUrl, org, logger)
+			tableRegs, err := github.GetPackages(ctx, query, versions, r, registryUrl, org, logger)
 			if err != nil {
-				return err
+				return nil, err
 			}
-
+			return tableRegs, nil
 		default:
 			logger.Errorf("Registry %s is not supported", registryUrl)
 		}
 
 	}
-	return nil
+	return nil, err
 }