chore: add version override query from the API

hhfab versions --live

Signed-off-by: Pau Capdevila <[email protected]>

Author: pau-hedgehog

cmd/hhfab/main.go

@@ -624,12 +624,17 @@ func Run(ctx context.Context) error {
 				},
 			},
 			{
-				Name:   "versions",
-				Usage:  "print versions of all components",
-				Flags:  flatten(defaultFlags, hModeFlags),
+				Name:  "versions",
+				Usage: "print versions of all components",
+				Flags: flatten(defaultFlags, hModeFlags, []cli.Flag{
+					&cli.BoolFlag{
+						Name:  "live",
+						Usage: "load versions from running API instead of the config file (fab.yaml)",
+					},
+				}),
 				Before: before(false),
-				Action: func(_ *cli.Context) error {
-					if err := hhfab.Versions(ctx, workDir, cacheDir, hhfab.HydrateMode(hydrateMode)); err != nil {
+				Action: func(c *cli.Context) error {
+					if err := hhfab.Versions(ctx, workDir, cacheDir, hhfab.HydrateMode(hydrateMode), c.Bool("live")); err != nil {
 						return fmt.Errorf("printing versions: %w", err)
 					}
 

pkg/hhfab/cmdversions.go

@@ -11,20 +11,31 @@ import (
 	"os"
 	"path/filepath"
 
+	"go.githedgehog.com/fabric/pkg/util/kubeutil"
 	fabapi "go.githedgehog.com/fabricator/api/fabricator/v1beta1"
 	"go.githedgehog.com/fabricator/pkg/fab"
-	"sigs.k8s.io/yaml"
+	kclient "sigs.k8s.io/controller-runtime/pkg/client"
+	kyaml "sigs.k8s.io/yaml"
 )
 
-func Versions(ctx context.Context, workDir, cacheDir string, hMode HydrateMode) error {
+func Versions(ctx context.Context, workDir, cacheDir string, hMode HydrateMode, live bool) error {
+	if live {
+		cfg := &Config{
+			WorkDir:  workDir,
+			CacheDir: cacheDir,
+		}
+
+		return getVersionsFromCluster(ctx, cfg)
+	}
+
 	configPath := filepath.Join(workDir, FabConfigFile)
 	if _, err := os.Stat(configPath); err != nil && errors.Is(err, os.ErrNotExist) {
 		slog.Info("No configuration found", "file", FabConfigFile, "action", "Showing release versions")
 		freshFab := fabapi.Fabricator{}
 		if err := freshFab.CalculateVersions(fab.Versions); err != nil {
 			return fmt.Errorf("calculating default versions: %w", err)
 		}
-		data, err := yaml.Marshal(freshFab.Status.Versions)
+		data, err := kyaml.Marshal(freshFab.Status.Versions)
 		if err != nil {
 			return fmt.Errorf("marshalling versions: %w", err)
 		}
@@ -42,16 +53,74 @@ func Versions(ctx context.Context, workDir, cacheDir string, hMode HydrateMode)
 	if err := freshFab.CalculateVersions(fab.Versions); err != nil {
 		return fmt.Errorf("calculating default versions: %w", err)
 	}
-	releaseData, err := yaml.Marshal(freshFab.Status.Versions)
+	releaseData, err := kyaml.Marshal(freshFab.Status.Versions)
 	if err != nil {
 		return fmt.Errorf("marshalling release versions: %w", err)
 	}
 	var release map[string]interface{}
-	if err := yaml.Unmarshal(releaseData, &release); err != nil {
+	if err := kyaml.Unmarshal(releaseData, &release); err != nil {
 		return fmt.Errorf("unmarshalling release versions: %w", err)
 	}
 
-	overridesRaw, err := yaml.Marshal(cfg.Fab.Spec.Overrides.Versions)
+	overridesRaw, err := kyaml.Marshal(cfg.Fab.Spec.Overrides.Versions)
+	if err != nil {
+		slog.Warn("Failed to marshal overrides", "error", err)
+		fmt.Println(string(releaseData))
+
+		return nil
+	}
+
+	var overrides map[string]interface{}
+	if err := kyaml.Unmarshal(overridesRaw, &overrides); err != nil {
+		slog.Warn("Failed to unmarshal overrides", "error", err)
+		fmt.Println(string(releaseData))
+
+		return nil
+	}
+
+	if len(overrides) == 0 {
+		slog.Info("Printing versions of all components")
+		fmt.Println(string(releaseData))
+
+		return nil
+	}
+
+	slog.Info("Printing versions of all components (release → override)")
+	merged := make(map[string]interface{})
+
+	for category, value := range release {
+		merged[category] = processVersionCategory(category, value, overrides)
+	}
+
+	mergedData, err := kyaml.Marshal(merged)
+	if err != nil {
+		return fmt.Errorf("marshalling merged versions: %w", err)
+	}
+	fmt.Println(string(mergedData))
+
+	return nil
+}
+
+func getVersionsFromCluster(ctx context.Context, c *Config) error {
+	kubeconfig := filepath.Join(c.WorkDir, VLABDir, VLABKubeConfig)
+	kube, err := kubeutil.NewClient(ctx, kubeconfig, fabapi.SchemeBuilder)
+	if err != nil {
+		return fmt.Errorf("creating kube client: %w", err)
+	}
+
+	fab := &fabapi.Fabricator{}
+	if err := kube.Get(ctx, kclient.ObjectKey{Name: "default", Namespace: "fab"}, fab); err != nil {
+		return fmt.Errorf("getting fabricator object: %w", err)
+	}
+
+	slog.Info("Printing versions from live cluster")
+
+	releaseData, err := kyaml.Marshal(fab.Status.Versions)
+	if err != nil {
+		return fmt.Errorf("marshalling versions: %w", err)
+	}
+
+	overridesRaw, err := kyaml.Marshal(fab.Spec.Overrides.Versions)
 	if err != nil {
 		slog.Warn("Failed to marshal overrides", "error", err)
 		fmt.Println(string(releaseData))
@@ -60,7 +129,7 @@ func Versions(ctx context.Context, workDir, cacheDir string, hMode HydrateMode)
 	}
 
 	var overrides map[string]interface{}
-	if err := yaml.Unmarshal(overridesRaw, &overrides); err != nil {
+	if err := kyaml.Unmarshal(overridesRaw, &overrides); err != nil {
 		slog.Warn("Failed to unmarshal overrides", "error", err)
 		fmt.Println(string(releaseData))
 
@@ -74,14 +143,22 @@ func Versions(ctx context.Context, workDir, cacheDir string, hMode HydrateMode)
 		return nil
 	}
 
-	slog.Info("Printing versions of all components (overridden←→release)")
+	var release map[string]interface{}
+	if err := kyaml.Unmarshal(releaseData, &release); err != nil {
+		slog.Warn("Failed to unmarshal release versions", "error", err)
+		fmt.Println(string(releaseData))
+
+		return nil
+	}
+
+	slog.Info("Printing versions of all components (release → override)")
 	merged := make(map[string]interface{})
 
 	for category, value := range release {
 		merged[category] = processVersionCategory(category, value, overrides)
 	}
 
-	mergedData, err := yaml.Marshal(merged)
+	mergedData, err := kyaml.Marshal(merged)
 	if err != nil {
 		return fmt.Errorf("marshalling merged versions: %w", err)
 	}
@@ -120,7 +197,7 @@ func processVersionCategory(category string, releaseValue interface{}, overrides
 		if overrideComp, exists := overrideMap[compName]; exists {
 			overrideVerStr, isOverrideString := overrideComp.(string)
 			if isOverrideString {
-				result[compName] = fmt.Sprintf("%s←→%s", overrideVerStr, releaseVerStr)
+				result[compName] = fmt.Sprintf("%s → %s", releaseVerStr, overrideVerStr)
 			} else {
 				result[compName] = releaseVer
 			}