Commands for binding and unbinding packages to applications

Author: asafgabai

apptrust/commands/package/bind_package_cmd.go

@@ -73,8 +73,8 @@ func GetBindPackageCommand(appContext app.Context) components.Command {
 				Description: "Package name.",
 			},
 			{
-				Name:        "package-version",
-				Description: "Package version.",
+				Name:        "package-versions",
+				Description: "Comma-separated versions of the package to bind (e.g., '1.0.0,1.1.0,1.2.0').",
 			},
 		},
 		Flags:  commands.GetCommandFlags(commands.PackageBind),

apptrust/commands/package/unbind_package_cmd.go

@@ -36,7 +36,7 @@ func (up *unbindPackageCommand) CommandName() string {
 }
 
 func (up *unbindPackageCommand) prepareAndRunCommand(ctx *components.Context) error {
-	if len(ctx.Arguments) != 4 {
+	if len(ctx.Arguments) < 3 || len(ctx.Arguments) > 4 {
 		return pluginsCommon.WrongNumberOfArgumentsHandler(ctx)
 	}
 
@@ -73,8 +73,8 @@ func GetUnbindPackageCommand(appContext app.Context) components.Command {
 				Description: "Package name.",
 			},
 			{
-				Name:        "package-version",
-				Description: "Package version.",
+				Name:        "package-versions",
+				Description: "Comma-separated versions of the package to unbind (e.g., '1.0.0,1.1.0,1.2.0'). If omitted, all versions will be unbound.",
 			},
 		},
 		Flags:  commands.GetCommandFlags(commands.PackageUnbind),

apptrust/commands/package/utils.go

@@ -1,23 +1,44 @@
 package packagecmds
 
 import (
+	"strings"
+
 	"github.com/jfrog/jfrog-cli-application/apptrust/model"
 	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
 )
 
 // BuildPackageRequestPayload creates a BindPackageRequest from command arguments.
 // This function is shared between bind and unbind package commands.
-// It expects the following arguments in order: <application_key> <package_type> <package_name> <package_version>.
+// It expects the following arguments in order: <application_key> <package_type> <package_name> [<package_versions>].
 func BuildPackageRequestPayload(ctx *components.Context) (*model.BindPackageRequest, error) {
 	applicationKey := ctx.Arguments[0]
 	packageType := ctx.Arguments[1]
 	packageName := ctx.Arguments[2]
-	packageVersion := ctx.Arguments[3]
+
+	var versions []string
+	if len(ctx.Arguments) > 3 {
+		// Parse comma-separated versions
+		versions = parseVersions(ctx.Arguments[3])
+	}
 
 	return &model.BindPackageRequest{
 		ApplicationKey: applicationKey,
 		Type:           packageType,
 		Name:           packageName,
-		Versions:       []string{packageVersion},
+		Versions:       versions,
 	}, nil
 }
+
+// parseVersions parses a comma-separated string of versions into a slice.
+// It trims whitespaces from each version and filters out empty strings.
+func parseVersions(versionsString string) []string {
+	parts := strings.Split(versionsString, ",")
+	var versions []string
+	for _, part := range parts {
+		trimmed := strings.TrimSpace(part)
+		if trimmed != "" {
+			versions = append(versions, trimmed)
+		}
+	}
+	return versions
+}

apptrust/commands/package/utils_test.go

@@ -0,0 +1,61 @@
+package packagecmds
+
+import (
+	"testing"
+
+	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestBuildPackageRequestPayload(t *testing.T) {
+	tests := []struct {
+		name             string
+		arguments        []string
+		expectedKey      string
+		expectedType     string
+		expectedName     string
+		expectedVersions []string
+	}{
+		{
+			name:             "Valid package request with single version",
+			arguments:        []string{"my-app", "npm", "my-package", "1.0.0"},
+			expectedKey:      "my-app",
+			expectedType:     "npm",
+			expectedName:     "my-package",
+			expectedVersions: []string{"1.0.0"},
+		},
+		{
+			name:             "Valid package request with multiple versions",
+			arguments:        []string{"my-app", "npm", "my-package", "1.0.0,1.1.0 , 1.2.0"},
+			expectedKey:      "my-app",
+			expectedType:     "npm",
+			expectedName:     "my-package",
+			expectedVersions: []string{"1.0.0", "1.1.0", "1.2.0"},
+		},
+		{
+			name:             "Package request without versions",
+			arguments:        []string{"my-app", "npm", "my-package"},
+			expectedKey:      "my-app",
+			expectedType:     "npm",
+			expectedName:     "my-package",
+			expectedVersions: nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			ctx := &components.Context{
+				Arguments: tt.arguments,
+			}
+
+			result, err := BuildPackageRequestPayload(ctx)
+
+			assert.NoError(t, err)
+			assert.NotNil(t, result)
+			assert.Equal(t, tt.expectedKey, result.ApplicationKey)
+			assert.Equal(t, tt.expectedType, result.Type)
+			assert.Equal(t, tt.expectedName, result.Name)
+			assert.Equal(t, tt.expectedVersions, result.Versions)
+		})
+	}
+}

apptrust/model/bind_package_request.go

@@ -4,5 +4,5 @@ type BindPackageRequest struct {
 	ApplicationKey string   `json:"application_key"`
 	Type           string   `json:"type"`
 	Name           string   `json:"name"`
-	Versions       []string `json:"versions"`
+	Versions       []string `json:"versions,omitempty"`
 }