Sync Single Target Plugins Only

This pull request updates existing functionality as follows:

1. For 'tanzu plugin sync', a new optional '--target' parameter has been added. If a user provides a value for '--target', the sync operation is performed only for the specified target, not for all active contexts.

2. 'tanzu context create' now performs 'plugin sync' only for the newly created context, not for all active contexts.

3. 'tanzu context use' now triggers 'plugin sync' only for the context being set as active, not for all currently active contexts.

pkg/command/context.go

@@ -200,13 +200,13 @@ func createCtx(_ *cobra.Command, args []string) (err error) {
 	}
 
 	// Sync all required plugins
-	_ = syncContextPlugins()
+	_ = syncContextPlugins(ctx.Target)
 
 	return nil
 }
 
-func syncContextPlugins() error {
-	err := pluginmanager.SyncPlugins()
+func syncContextPlugins(target configtypes.Target) error {
+	err := pluginmanager.SyncPluginsForGivenTarget(target)
 	if err != nil {
 		log.Warningf("unable to automatically sync the plugins from target context. Please run 'tanzu plugin sync' command to sync plugins manually, error: '%v'", err.Error())
 	}
@@ -898,7 +898,7 @@ func useCtx(_ *cobra.Command, args []string) error {
 	}
 
 	// Sync all required plugins
-	_ = syncContextPlugins()
+	_ = syncContextPlugins(ctx.Target)
 
 	return nil
 }

pkg/command/plugin.go

@@ -94,6 +94,8 @@ func newPluginCmd() *cobra.Command {
 	upgradePluginCmd.Flags().StringVarP(&targetStr, "target", "t", "", targetFlagDesc)
 	deletePluginCmd.Flags().StringVarP(&targetStr, "target", "t", "", targetFlagDesc)
 	describePluginCmd.Flags().StringVarP(&targetStr, "target", "t", "", targetFlagDesc)
+	targetFlagDescForSync := fmt.Sprintf("sync plugins only for specific target (%s)", common.TargetList)
+	syncPluginCmd.Flags().StringVarP(&targetStr, "target", "t", "", targetFlagDescForSync)
 
 	installPluginCmd.MarkFlagsMutuallyExclusive("group", "local")
 	installPluginCmd.MarkFlagsMutuallyExclusive("group", "local-source")
@@ -382,7 +384,15 @@ func newSyncPluginCmd() *cobra.Command {
 		Long: `Installs all plugins recommended by the active contexts.
 Plugins installed with this command will only be available while the context remains active.`,
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
-			err = pluginmanager.SyncPlugins()
+			if targetStr != "" {
+				if !configtypes.IsValidTarget(targetStr, false, true) {
+					return errors.New(invalidTargetMsg)
+				}
+				err = pluginmanager.SyncPluginsForGivenTarget(getTarget()) // getTarget()
+			} else {
+				err = pluginmanager.SyncPlugins()
+			}
+
 			if err != nil {
 				return err
 			}

pkg/pluginmanager/manager.go

@@ -160,20 +160,27 @@ func GetAdditionalTestPluginDiscoveries() []configtypes.PluginDiscovery {
 	return testDiscoveries
 }
 
-// DiscoverServerPlugins returns the available plugins associated all the active contexts
+// DiscoverServerPlugins returns the available discovered plugins associated with all active contexts
 func DiscoverServerPlugins() ([]discovery.Discovered, error) {
-	var plugins []discovery.Discovered
-	var errList []error
-
 	currentContextMap, err := configlib.GetAllCurrentContextsMap()
 	if err != nil {
 		return nil, err
 	}
-	if len(currentContextMap) == 0 {
-		return plugins, nil
+	contexts := make([]*configtypes.Context, 0)
+	for _, context := range currentContextMap {
+		contexts = append(contexts, context)
 	}
+	return DiscoverServerPluginsForGivenContexts(contexts)
+}
 
-	for _, context := range currentContextMap {
+// DiscoverServerPluginsForGivenContexts returns the available discovered plugins associated with specific contexts
+func DiscoverServerPluginsForGivenContexts(contexts []*configtypes.Context) ([]discovery.Discovered, error) {
+	var plugins []discovery.Discovered
+	var errList []error
+	if len(contexts) == 0 {
+		return plugins, nil
+	}
+	for _, context := range contexts {
 		var discoverySources []configtypes.PluginDiscovery
 		discoverySources = append(discoverySources, context.DiscoverySources...)
 		discoverySources = append(discoverySources, defaultDiscoverySourceBasedOnContext(context)...)
@@ -989,7 +996,50 @@ func SyncPlugins() error {
 	if err != nil {
 		errList = append(errList, err)
 	}
-	if installedPlugins, err := pluginsupplier.GetInstalledServerPlugins(); err == nil {
+	err = installDiscoveredContextPlugins(plugins)
+	if err != nil {
+		errList = append(errList, err)
+	}
+	err = kerrors.NewAggregate(errList)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// SyncPluginsForGivenTarget installs the plugins for given target
+func SyncPluginsForGivenTarget(target configtypes.Target) error {
+	currentContextMap, err := configlib.GetAllCurrentContextsMap()
+	if err != nil {
+		return err
+	}
+	ctx, ok := currentContextMap[target]
+	if !ok {
+		return fmt.Errorf("there is no active context for the target %v ", target)
+	}
+	log.Infof("Checking for required plugins for context %s...", ctx.Name)
+	errList := make([]error, 0)
+	plugins, err := DiscoverServerPluginsForGivenContexts([]*configtypes.Context{ctx})
+	if err != nil {
+		errList = append(errList, err)
+	}
+	err = installDiscoveredContextPlugins(plugins)
+	if err != nil {
+		errList = append(errList, err)
+	}
+	err = kerrors.NewAggregate(errList)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// installDiscoveredContextPlugins installs the given context scope plugins
+func installDiscoveredContextPlugins(plugins []discovery.Discovered) error {
+	var errList []error
+	var err error
+	var installedPlugins []cli.PluginInfo
+	if installedPlugins, err = pluginsupplier.GetInstalledServerPlugins(); err == nil {
 		setAvailablePluginsStatus(plugins, installedPlugins)
 	}
 

pkg/pluginmanager/manager_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 
+	configlib "github.com/vmware-tanzu/tanzu-plugin-runtime/config"
 	configtypes "github.com/vmware-tanzu/tanzu-plugin-runtime/config/types"
 
 	"github.com/vmware-tanzu/tanzu-cli/pkg/cli"
@@ -642,6 +643,10 @@ func Test_SyncPlugins(t *testing.T) {
 	execCommand = fakeInfoExecCommand
 	defer func() { execCommand = exec.Command }()
 
+	currentContextMap, err := configlib.GetAllCurrentContextsMap()
+
+	fmt.Println("currentContextMap: ", currentContextMap, "err: ", err)
+
 	// Get the server plugins (they are not installed yet)
 	serverPlugins, err := DiscoverServerPlugins()
 	assertions.NotNil(err)
@@ -673,6 +678,87 @@ func Test_SyncPlugins(t *testing.T) {
 	}
 }
 
+// Test_SyncPlugins_ForK8SSpecificTarget tests to sync plugins for given specific target only
+func Test_SyncPlugins_ForK8SSpecificTarget(t *testing.T) {
+	assertions := assert.New(t)
+
+	defer setupPluginSourceForTesting()()
+	execCommand = fakeInfoExecCommand
+	defer func() { execCommand = exec.Command }()
+
+	// Get the server plugins (they are not installed yet)
+	serverPlugins, err := DiscoverServerPlugins()
+	assertions.NotNil(err)
+	// There is an error for the kubernetes discovery since we don't have a cluster
+	// but other server plugins will be found, so we use those
+	assertions.Contains(err.Error(), `Failed to load Kubeconfig file from "config"`)
+	assertions.Equal(len(expectedDiscoveredContextPlugins), len(serverPlugins))
+	var k8sTargetPlugins []*discovery.Discovered
+	for _, edp := range expectedDiscoveredContextPlugins {
+		p := findDiscoveredPlugin(serverPlugins, edp.Name, edp.Target)
+		assertions.NotNil(p)
+		assertions.Equal(common.PluginStatusNotInstalled, p.Status)
+		if p.Target == configtypes.TargetK8s {
+			k8sTargetPlugins = append(k8sTargetPlugins, p)
+		}
+	}
+
+	// Sync all available plugins
+	err = SyncPluginsForGivenTarget(configtypes.TargetK8s)
+	assertions.NotNil(err)
+	// There is an error for the kubernetes discovery since we don't have a cluster
+	// but other server plugins will be found, so we use those
+	assertions.Contains(err.Error(), `Failed to load Kubeconfig file from "config"`)
+
+	installedServerPlugins, err := pluginsupplier.GetInstalledServerPlugins()
+	assertions.Nil(err)
+	assertions.Equal(len(installedServerPlugins), len(k8sTargetPlugins))
+
+	for _, isp := range installedServerPlugins {
+		p := findDiscoveredPlugin(serverPlugins, isp.Name, isp.Target)
+		assertions.NotNil(p)
+	}
+}
+
+// Test_SyncPlugins_ForK8SSpecificTarget tests to sync plugins for given specific target only
+func Test_SyncPlugins_ForTMCSpecificTarget(t *testing.T) {
+	assertions := assert.New(t)
+
+	defer setupPluginSourceForTesting()()
+	execCommand = fakeInfoExecCommand
+	defer func() { execCommand = exec.Command }()
+
+	// Get the server plugins (they are not installed yet)
+	serverPlugins, err := DiscoverServerPlugins()
+	assertions.NotNil(err)
+	// There is an error for the kubernetes discovery since we don't have a cluster
+	// but other server plugins will be found, so we use those
+	assertions.Contains(err.Error(), `Failed to load Kubeconfig file from "config"`)
+	assertions.Equal(len(expectedDiscoveredContextPlugins), len(serverPlugins))
+	var tmcTargetPlugins []*discovery.Discovered
+	for _, edp := range expectedDiscoveredContextPlugins {
+		p := findDiscoveredPlugin(serverPlugins, edp.Name, edp.Target)
+		assertions.NotNil(p)
+		assertions.Equal(common.PluginStatusNotInstalled, p.Status)
+		if p.Target == configtypes.TargetTMC {
+			tmcTargetPlugins = append(tmcTargetPlugins, p)
+		}
+	}
+
+	// Sync all available plugins
+	err = SyncPluginsForGivenTarget(configtypes.TargetTMC)
+	assertions.Nil(err)
+
+	installedServerPlugins, err := pluginsupplier.GetInstalledServerPlugins()
+	assertions.Nil(err)
+	assertions.Equal(len(installedServerPlugins), len(tmcTargetPlugins))
+
+	for _, isp := range installedServerPlugins {
+		p := findDiscoveredPlugin(serverPlugins, isp.Name, isp.Target)
+		assertions.NotNil(p)
+	}
+}
+
 func Test_setAvailablePluginsStatus(t *testing.T) {
 	assertions := assert.New(t)
 

test/e2e/Makefile

@@ -57,7 +57,6 @@ TANZU_CLI_E2E_AIRGAPPED_REPO_WITH_AUTH_PASSWORD = testpassword
 endif
 
 
-
 # Set the plugin group name for the plugins used to execute E2E test cases.
 E2E_TEST_USE_PLGINS_FROM_PLUGIN_GROUP_FOR_TMC ?= vmware-tmc/tmc-user:v9.9.9
 E2E_TEST_USE_PLGINS_FROM_PLUGIN_GROUP_FOR_K8S ?= vmware-tkg/default:v9.9.9