Skip to content

Commit

Permalink
Use TANZU_CLI_PRE_RELEASE_REPO_IMAGE for discovery
Browse files Browse the repository at this point in the history
Signed-off-by: Marc Khouzam <kmarc@vmware.com>
  • Loading branch information
marckhouzam committed Feb 10, 2023
1 parent b986255 commit ef07d40
Showing 1 changed file with 23 additions and 14 deletions.
37 changes: 23 additions & 14 deletions pkg/pluginmanager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit ef07d40

Please sign in to comment.