Use --all and --slug for skill update

Author: udaykb2

agent/plugins/commands/update/update.go

@@ -24,7 +24,6 @@ var askYesNo = coreutils.AskYesNo
 var isNonInteractive = agentcommon.IsNonInteractive
 
 const updateAllConfirmPrompt = "Update all discovered plugins under the given harness(es) to their latest version in the repository? " +
-	"Each install folder name is used as the repository slug (same as update --slug). " +
 	"Matching packages will be updated, including installs that were not made with JFrog CLI."
 
 // pluginBackupDirName is the directory under the plugins parent where update backups are stored.
@@ -50,45 +49,66 @@ type preUpdate struct {
 func RunUpdate(c *components.Context) error {
 	all := c.GetBoolFlagValue("all")
 	slugFlag := strings.TrimSpace(c.GetStringFlagValue("slug"))
+	if err := validateUpdateArgs(c, all, slugFlag); err != nil {
+		return err
+	}
+
+	opts, err := newUpdate(c)
+	if err != nil {
+		return err
+	}
+	if all {
+		return runUpdateAllMode(opts)
+	}
+	return runSingleSlugUpdate(c, opts, slugFlag)
+}
+
+func validateUpdateArgs(c *components.Context, all bool, slugFlag string) error {
 	if !all && slugFlag == "" {
 		if c.GetNumberOfArgs() > 0 {
 			return fmt.Errorf("unexpected positional argument(s); use --slug to specify the plugin")
 		}
 		return fmt.Errorf("usage: jf agent plugins update --slug <slug> (--harness <name[,name...]> [--global] [--project-dir <dir>] | --path <dir>) [--repo <repo>] [--version <ver>] [--dry-run] [--force] [--format <table|json>]\n       jf agent plugins update --all --harness <name[,name...]> [--global] [--project-dir <dir>] [--repo <repo>] [--dry-run] [--force] [--format <table|json>]")
 	}
-	if all {
-		if slugFlag != "" {
-			return fmt.Errorf("--all cannot be combined with --slug; it updates every installed plugin for the given --harness list")
-		}
-		if c.GetNumberOfArgs() > 0 {
-			return fmt.Errorf("unexpected positional argument(s); use --slug or --all")
-		}
-		if strings.TrimSpace(c.GetStringFlagValue("version")) != "" {
-			return fmt.Errorf("--all cannot be combined with --version; it always updates to the latest version")
-		}
-		if strings.TrimSpace(c.GetStringFlagValue("path")) != "" {
-			return fmt.Errorf("--all cannot be combined with --path; --path targets a single install directory")
-		}
+	if !all {
+		return nil
 	}
-
-	opts, err := newUpdate(c)
-	if err != nil {
-		return err
+	if slugFlag != "" {
+		return fmt.Errorf("--all cannot be combined with --slug; it updates every installed plugin for the given --harness list")
+	}
+	if c.GetNumberOfArgs() > 0 {
+		return fmt.Errorf("unexpected positional argument(s); use --slug or --all")
+	}
+	if strings.TrimSpace(c.GetStringFlagValue("version")) != "" {
+		return fmt.Errorf("--all cannot be combined with --version; it always updates to the latest version")
 	}
-	if all && opts.flags.AbsoluteInstallBaseDir != "" {
+	if strings.TrimSpace(c.GetStringFlagValue("path")) != "" {
+		return fmt.Errorf("--all cannot be combined with --path; --path targets a single install directory")
+	}
+	return nil
+}
+
+func validateUpdateAllTargets(flags agentcommon.InstallFlagsResult) error {
+	if flags.AbsoluteInstallBaseDir != "" {
 		return fmt.Errorf("--all requires --harness; --path is not supported")
 	}
-	if all && len(opts.flags.Specs) == 0 {
+	if len(flags.Specs) == 0 {
 		return fmt.Errorf("--all requires --harness <name[,name...]>")
 	}
+	return nil
+}
 
-	if all {
-		if err := confirmUpdateAll(opts); err != nil {
-			return err
-		}
-		return runUpdateAll(opts)
+func runUpdateAllMode(opts update) error {
+	if err := validateUpdateAllTargets(opts.flags); err != nil {
+		return err
 	}
+	if err := confirmUpdateAll(opts); err != nil {
+		return err
+	}
+	return runUpdateAll(opts)
+}
 
+func runSingleSlugUpdate(c *components.Context, opts update, slugFlag string) error {
 	if c.GetNumberOfArgs() > 0 {
 		return fmt.Errorf("unexpected positional argument(s); use --slug to specify the plugin")
 	}
@@ -145,7 +165,7 @@ func runUpdateOnSlug(opts update, slug, requestedVersion string) error {
 		return err
 	}
 
-	targetVersion, err := resolveTargetVersion(opts.serverDetails, opts.repoKey, slug, requestedVersion, opts.quiet)
+	targetVersion, err := resolvePluginVersion(opts.serverDetails, opts.repoKey, slug, requestedVersion, opts.quiet)
 	if err != nil {
 		return err
 	}
@@ -294,10 +314,6 @@ func finalizeUpdateAll(combined []agentcommon.UpdateAllSummaryRow, outcome updat
 	return nil
 }
 
-func resolveTargetVersion(serverDetails *config.ServerDetails, repoKey, slug, requested string, quiet bool) (string, error) {
-	return resolvePluginVersion(serverDetails, repoKey, slug, requested, quiet)
-}
-
 // updateSlugAcrossTargets fetches the slug once and runs the backup+copy loop per target.
 // Returns the per-target summary rows. Targets that are not installed or already at the
 // target version are reported without performing a download.

agent/plugins/commands/update/update_test.go

@@ -159,7 +159,7 @@ func TestUpdateOnePlugin_SuccessRemovesBackup(t *testing.T) {
 	assert.Contains(t, string(data), "2.0.0")
 }
 
-func TestResolveTargetVersion_ExplicitUsedDirectly(t *testing.T) {
+func TestResolvePluginVersion_ExplicitUsedDirectly(t *testing.T) {
 	restore := resolvePluginVersion
 	resolvePluginVersion = func(_ *config.ServerDetails, repoKey, slug, requested string, quiet bool) (string, error) {
 		assert.Equal(t, "repo", repoKey)
@@ -170,13 +170,13 @@ func TestResolveTargetVersion_ExplicitUsedDirectly(t *testing.T) {
 	}
 	t.Cleanup(func() { resolvePluginVersion = restore })
 
-	got, err := resolveTargetVersion(nil, "repo", "slug", "1.2.3", true)
+	got, err := resolvePluginVersion(nil, "repo", "slug", "1.2.3", true)
 	require.NoError(t, err)
 	assert.Equal(t, "1.2.3", got)
 }
 
-func TestResolveTargetVersion_RejectsInvalid(t *testing.T) {
-	_, err := resolveTargetVersion(nil, "repo", "slug", "not-a-version", true)
+func TestResolvePluginVersion_RejectsInvalid(t *testing.T) {
+	_, err := resolvePluginVersion(nil, "repo", "slug", "not-a-version", true)
 	require.Error(t, err)
 }
 

agent/skills/cli/cli.go

@@ -35,11 +35,15 @@ func GetSubCommands() []components.Command {
 			Action:      install.RunInstall,
 		},
 		{
-			Name:        "update",
-			Flags:       flagkit.GetCommandFlags(flagkit.SkillsUpdate),
-			Description: "Update an installed skill to the latest (or a specific) version. Same targeting flags as install: use --harness (comma-separated) with --project-dir (default: current directory) or --global, or --path <dir> for a direct update at <dir>/<slug>. Pre-update checks skip targets that are not installed or already at the target version (use --force to re-download). Logs skip and failure reasons when not quiet. Downloads once for all targets. Use --dry-run to preview, --format json for machine-readable summaries.",
-			Arguments:   getUpdateArguments(),
-			Action:      update.RunUpdate,
+			Name:  "update",
+			Flags: flagkit.GetCommandFlags(flagkit.SkillsUpdate),
+			Description: "Update an installed skill to the latest (or a specific) version. " +
+				"Use --slug with --harness (comma-separated) and --project-dir or --global; or --slug with --path <dir>. " +
+				"With --all (requires --harness), updates every discovered skill under those harnesses to latest in one summary table " +
+				"(interactive confirmation before proceeding; folder name is the slug, same as --slug). " +
+				"Skips targets not installed or already at the target version (use --force to re-download). " +
+				"Use --dry-run to preview, --format json for machine-readable summaries.",
+			Action: update.RunUpdate,
 		},
 		{
 			Name:        "search",
@@ -85,15 +89,6 @@ func getInstallArguments() []components.Argument {
 	}
 }
 
-func getUpdateArguments() []components.Argument {
-	return []components.Argument{
-		{
-			Name:        "slug",
-			Description: "Skill name/slug to update.",
-		},
-	}
-}
-
 func getDeleteArguments() []components.Argument {
 	return []components.Argument{
 		{

agent/skills/cli/cli_test.go

@@ -0,0 +1,23 @@
+package cli
+
+import (
+	"testing"
+
+	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGetSubCommands_UpdateSupportsAll(t *testing.T) {
+	commands := GetSubCommands()
+	byName := make(map[string]components.Command, len(commands))
+	for _, cmd := range commands {
+		byName[cmd.Name] = cmd
+	}
+
+	updateCmd := byName["update"]
+	assert.NotNil(t, updateCmd.Action)
+	assert.Empty(t, updateCmd.Arguments)
+	assert.Contains(t, updateCmd.Description, "Update an installed skill")
+	assert.Contains(t, updateCmd.Description, "--slug")
+	assert.Contains(t, updateCmd.Description, "--all")
+}