Add Kiro IDE Support to jf ide setup (jfrog#305)

Author: agrasth

ide/cli/cli.go

@@ -2,28 +2,15 @@ package cli
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/jfrog/jfrog-cli-artifactory/ide/commands/aieditorextensions"
 	"github.com/jfrog/jfrog-cli-artifactory/ide/commands/jetbrains"
 	"github.com/jfrog/jfrog-cli-artifactory/ide/docs"
+	"github.com/jfrog/jfrog-cli-artifactory/ide/ideconsts"
 	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
 	"github.com/jfrog/jfrog-client-go/utils/log"
 )
 
-const (
-	IDENameVSCode    = "vscode"
-	IDENameCode      = "code"
-	IDENameCursor    = "cursor"
-	IDENameWindsurf  = "windsurf"
-	IDENameJetBrains = "jetbrains"
-	IDENameJB        = "jb"
-)
-
-func getSupportedIDEs() string {
-	return fmt.Sprintf("%s, %s, %s, %s", IDENameVSCode, IDENameCursor, IDENameWindsurf, IDENameJetBrains)
-}
-
 func GetCommands() []components.Command {
 	return []components.Command{
 		{
@@ -49,31 +36,33 @@ func getSetupFlags() []components.Flag {
 		components.NewStringFlag("url-suffix", "Suffix for the URL. Optional.", components.SetMandatoryFalse()),
 
 		// VSCode-specific flags
-		components.NewStringFlag("product-json-path", "Path to VSCode/Cursor/Windsurf product.json file. If not provided, auto-detects installation.", components.SetMandatoryFalse()),
-		components.NewStringFlag("update-mode", "VSCode update mode: 'default' (auto-update), 'manual' (prompt for updates), or 'none' (disable updates). Only for VSCode-based IDEs.", components.SetMandatoryFalse()),
+		components.NewStringFlag("product-json-path", fmt.Sprintf("Path to %s product.json file. If not provided, auto-detects installation.", ideconsts.GetVSCodeBasedIDEsString()), components.SetMandatoryFalse()),
+		components.NewStringFlag("update-mode", "Update mode: 'default' (auto-update), 'manual' (prompt for updates), or 'none' (disable updates). Only for VSCode-based IDEs.", components.SetMandatoryFalse()),
 	}
 
 	return append(flags, ideSpecificFlags...)
 }
 
 func setupCmd(ctx *components.Context) error {
 	if ctx.GetNumberOfArgs() == 0 {
-		return fmt.Errorf("IDE_NAME is required. Usage: jf ide setup <IDE_NAME>\nSupported IDEs: %s", getSupportedIDEs())
+		return fmt.Errorf("IDE_NAME is required. Usage: jf ide setup <IDE_NAME>\nSupported IDEs: %s", ideconsts.GetSupportedIDEsString())
 	}
 
-	ideName := strings.ToLower(ctx.GetArgumentAt(0))
+	ideName := ctx.GetArgumentAt(0)
 	log.Debug(fmt.Sprintf("Setting up IDE: %s", ideName))
 
 	switch ideName {
-	case IDENameVSCode, IDENameCode:
+	case ideconsts.IDENameVSCode, ideconsts.IDENameCode:
 		return aieditorextensions.SetupVSCode(ctx)
-	case IDENameCursor:
+	case ideconsts.IDENameCursor:
 		return aieditorextensions.SetupCursor(ctx)
-	case IDENameWindsurf:
+	case ideconsts.IDENameWindsurf:
 		return aieditorextensions.SetupWindsurf(ctx)
-	case IDENameJetBrains, IDENameJB:
+	case ideconsts.IDENameKiro:
+		return aieditorextensions.SetupKiro(ctx)
+	case ideconsts.IDENameJetBrains, ideconsts.IDENameJB:
 		return jetbrains.SetupJetBrains(ctx)
 	default:
-		return fmt.Errorf("unsupported IDE: %s. Supported IDEs: %s", ideName, getSupportedIDEs())
+		return fmt.Errorf("unsupported IDE: %s. Supported IDEs: %s", ideName, ideconsts.GetSupportedIDEsString())
 	}
 }

ide/commands/aieditorextensions/vscode_fork_registry.go

@@ -84,6 +84,26 @@ var VSCodeForks = map[string]*VSCodeForkConfig{
 		ProductJson: "product.json",
 		SettingsDir: "Windsurf",
 	},
+	"kiro": {
+		Name:        "kiro",
+		DisplayName: "Kiro",
+		InstallPaths: map[string][]string{
+			"darwin": {
+				"/Applications/Kiro.app/Contents/Resources/app",
+				"~/Applications/Kiro.app/Contents/Resources/app",
+			},
+			"windows": {
+				`%LOCALAPPDATA%\Programs\Kiro\resources\app`,
+				`C:\Program Files\Kiro\resources\app`,
+			},
+			"linux": {
+				"/usr/share/kiro/resources/app",
+				"~/.local/share/kiro/resources/app",
+			},
+		},
+		ProductJson: "product.json",
+		SettingsDir: "Kiro",
+	},
 }
 
 func GetVSCodeFork(name string) (*VSCodeForkConfig, bool) {

ide/commands/aieditorextensions/vscode_fork_test.go

@@ -31,6 +31,12 @@ func TestGetVSCodeFork(t *testing.T) {
 	assert.Equal(t, "windsurf", windsurfConfig.Name)
 	assert.Equal(t, "Windsurf", windsurfConfig.DisplayName)
 
+	// Test getting Kiro config
+	kiroConfig, exists := GetVSCodeFork("kiro")
+	assert.True(t, exists)
+	assert.Equal(t, "kiro", kiroConfig.Name)
+	assert.Equal(t, "Kiro", kiroConfig.DisplayName)
+
 	// Test non-existent fork
 	_, exists = GetVSCodeFork("nonexistent")
 	assert.False(t, exists)
@@ -77,6 +83,11 @@ func TestVSCodeForkCommand_CommandName(t *testing.T) {
 	windsurfConfig, _ := GetVSCodeFork("windsurf")
 	cmd = NewVSCodeForkCommand(windsurfConfig, "", "", "")
 	assert.Equal(t, "setup-windsurf", cmd.CommandName())
+
+	// Test Kiro command name
+	kiroConfig, _ := GetVSCodeFork("kiro")
+	cmd = NewVSCodeForkCommand(kiroConfig, "", "", "")
+	assert.Equal(t, "setup-kiro", cmd.CommandName())
 }
 
 func TestVSCodeForkCommand_SetServerDetails(t *testing.T) {
@@ -271,7 +282,8 @@ func TestVSCodeForkCommand_HandlePermissionError_macOS(t *testing.T) {
 func TestSetupVSCodeFork_AllForks(t *testing.T) {
 	// Test that all registered forks can be retrieved
 	forks := GetSupportedForks()
-	assert.GreaterOrEqual(t, len(forks), 3, "Should have at least 3 forks (vscode, cursor, windsurf)")
+	// Expected number of VSCode-based IDE forks
+	assert.GreaterOrEqual(t, len(forks), 4, "Should have at least 4 VSCode-based IDE forks")
 
 	// Test that each fork has valid configuration
 	for _, forkName := range forks {

ide/commands/aieditorextensions/vscode_setup.go

@@ -21,6 +21,11 @@ func SetupWindsurf(c *components.Context) error {
 	return setupVSCodeFork(c, "windsurf")
 }
 
+// SetupKiro configures Kiro to use JFrog Artifactory
+func SetupKiro(c *components.Context) error {
+	return setupVSCodeFork(c, "kiro")
+}
+
 // setupVSCodeFork is a generic setup function for any VSCode-based IDE
 func setupVSCodeFork(c *components.Context, forkName string) error {
 	// Get fork configuration

ide/docs/setup.go

@@ -1,6 +1,11 @@
 package docs
 
-import "github.com/jfrog/jfrog-cli-core/v2/plugins/components"
+import (
+	"fmt"
+
+	"github.com/jfrog/jfrog-cli-artifactory/ide/ideconsts"
+	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
+)
 
 func GetDescription() string {
 	return "Setup IDE integration with JFrog Artifactory."
@@ -10,7 +15,7 @@ func GetArguments() []components.Argument {
 	return []components.Argument{
 		{
 			Name:        "ide-name",
-			Description: "IDE to setup. Supported: vscode, cursor, windsurf, jetbrains",
+			Description: fmt.Sprintf("IDE to setup. Supported: %s", ideconsts.GetSupportedIDEsString()),
 		},
 		{
 			Name:        "url",

ide/docs/setup/help.go

@@ -1,6 +1,10 @@
 package setup
 
 import (
+	"fmt"
+	"strings"
+
+	"github.com/jfrog/jfrog-cli-artifactory/ide/ideconsts"
 	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
 )
 
@@ -19,6 +23,7 @@ Supported IDEs:
   vscode     Visual Studio Code
   cursor     Cursor IDE
   windsurf   Windsurf IDE
+  kiro       Kiro IDE
   jetbrains  JetBrains IDEs (IntelliJ IDEA, PyCharm, WebStorm, etc.)
 
 Examples:
@@ -31,15 +36,25 @@ Examples:
   # Setup Windsurf
   jf ide setup windsurf --repo-key=windsurf-remote
 
+  # Setup Kiro
+  jf ide setup kiro --repo-key=kiro-remote
+
   # Setup JetBrains   
   jf ide setup jetbrains --repo-key=jetbrains-remote`
 }
 
 func GetArguments() []components.Argument {
+	// Create a quoted list of IDE names for better readability
+	ideNames := make([]string, len(ideconsts.SupportedIDEsList))
+	for i, name := range ideconsts.SupportedIDEsList {
+		ideNames[i] = fmt.Sprintf("'%s'", name)
+	}
+	supportedIDEsDesc := strings.Join(ideNames, ", ")
+
 	return []components.Argument{
 		{
 			Name:        "IDE_NAME",
-			Description: "The name of the IDE to setup. Supported IDEs are 'vscode', 'cursor', 'windsurf', and 'jetbrains'.",
+			Description: fmt.Sprintf("The name of the IDE to setup. Supported IDEs are %s.", supportedIDEsDesc),
 		},
 		{
 			Name:        "SERVICE_URL",

ide/ideconsts/ideconsts.go

@@ -0,0 +1,42 @@
+package ideconsts
+
+import "strings"
+
+// IDE name constants
+const (
+	IDENameVSCode    = "vscode"
+	IDENameCode      = "code"
+	IDENameCursor    = "cursor"
+	IDENameWindsurf  = "windsurf"
+	IDENameKiro      = "kiro"
+	IDENameJetBrains = "jetbrains"
+	IDENameJB        = "jb"
+)
+
+// SupportedIDEsList contains the list of primary IDE names (used for display purposes)
+var SupportedIDEsList = []string{
+	IDENameVSCode,
+	IDENameCursor,
+	IDENameWindsurf,
+	IDENameKiro,
+	IDENameJetBrains,
+}
+
+// VSCodeBasedIDEs contains the list of VSCode-based IDEs (for flags and documentation)
+var VSCodeBasedIDEs = []string{
+	IDENameVSCode,
+	IDENameCursor,
+	IDENameWindsurf,
+	IDENameKiro,
+}
+
+// GetSupportedIDEsString returns a comma-separated string of supported IDE names
+func GetSupportedIDEsString() string {
+	return strings.Join(SupportedIDEsList, ", ")
+}
+
+// GetVSCodeBasedIDEsString returns a slash-separated string of VSCode-based IDE names
+func GetVSCodeBasedIDEsString() string {
+	return strings.Join(VSCodeBasedIDEs, "/")
+}
+