From ef07d401789ccbb202d0b56c221e9d2f102e3455 Mon Sep 17 00:00:00 2001
From: Marc Khouzam <kmarc@vmware.com>
Date: Fri, 10 Feb 2023 08:36:32 -0500
Subject: [PATCH] Use TANZU_CLI_PRE_RELEASE_REPO_IMAGE for discovery

Signed-off-by: Marc Khouzam <kmarc@vmware.com>
---
 pkg/pluginmanager/manager.go | 37 ++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/pkg/pluginmanager/manager.go b/pkg/pluginmanager/manager.go
index e4106e52f..4b2ff034b 100644
--- a/pkg/pluginmanager/manager.go
+++ b/pkg/pluginmanager/manager.go
@@ -1131,25 +1131,34 @@ func UpgradePluginV2(pluginName, version string, target configtypes.Target) (str
 	return InstallPluginV2(pluginName, version, target)
 }
 
+// TODO(khouzam): Needed after pre-alpha
 // getPluginDiscoveries returns the plugin discoveries found in the configuration file.
-func getPluginDiscoveries() ([]configtypes.PluginDiscovery, error) {
-	cfg, err := configlib.GetClientConfig()
-	if err != nil {
-		return []configtypes.PluginDiscovery{}, errors.Wrapf(err, "unable to get client configuration")
-	}
-
-	if cfg == nil || cfg.ClientOptions == nil || cfg.ClientOptions.CLI == nil {
-		return []configtypes.PluginDiscovery{}, nil
-	}
-	return cfg.ClientOptions.CLI.DiscoverySources, nil
-}
+// func getPluginDiscoveries() ([]configtypes.PluginDiscovery, error) {
+// 	cfg, err := configlib.GetClientConfig()
+// 	if err != nil {
+// 		return []configtypes.PluginDiscovery{}, errors.Wrapf(err, "unable to get client configuration")
+// 	}
+
+// 	if cfg == nil || cfg.ClientOptions == nil || cfg.ClientOptions.CLI == nil {
+// 		return []configtypes.PluginDiscovery{}, nil
+// 	}
+// 	return cfg.ClientOptions.CLI.DiscoverySources, nil
+// }
 
 // discoverSpecificPlugins returns the available plugin matching the parameters.
 func discoverSpecificPlugins(pluginCriteria *discovery.PluginDiscoveryCriteria) ([]discovery.Discovered, error) {
-	discoveries, err := getPluginDiscoveries()
-	if err != nil || len(discoveries) == 0 {
-		return nil, err
+	var discoveries []configtypes.PluginDiscovery
+	pd, e := getPreReleasePluginDiscovery()
+	if e != nil {
+		return nil, e
 	}
+	discoveries = append(discoveries, pd)
+
+	// TODO(khouzam): After pre-alpha, use real discoveries
+	// discoveries, err := getPluginDiscoveries()
+	// if err != nil || len(discoveries) == 0 {
+	// 	return nil, err
+	// }
 
 	allPlugins := make([]discovery.Discovered, 0)
 	for _, d := range discoveries {