Align CLI commands with updated spec and API

Author: asafgabai

apptrust/commands/utils/utils_test.go

@@ -115,40 +115,6 @@ func TestValidateEnumFlag(t *testing.T) {
 	}
 }
 
-func TestParsePackagesFlag(t *testing.T) {
-	tests := []struct {
-		name      string
-		input     string
-		expected  []map[string]string
-		expectErr bool
-	}{
-		{"empty string", "", nil, false},
-		{"single package", "foo:1.0.0", []map[string]string{{"name": "foo", "version": "1.0.0"}}, false},
-		{"multiple packages", "foo:1.0.0,bar:2.0.0", []map[string]string{{"name": "foo", "version": "1.0.0"}, {"name": "bar", "version": "2.0.0"}}, false},
-		{"spaces", " foo:1.0.0 , bar:2.0.0 ", []map[string]string{{"name": "foo", "version": "1.0.0"}, {"name": "bar", "version": "2.0.0"}}, false},
-		{"invalid format", "foo", nil, true},
-		{"missing version", "foo:", []map[string]string{{"name": "foo", "version": ""}}, false},
-		{"missing name", ":1.0.0", []map[string]string{{"name": "", "version": "1.0.0"}}, false},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			result, err := ParsePackagesFlag(tt.input)
-			if tt.expectErr {
-				if err == nil {
-					t.Errorf("expected error for input %q, got nil", tt.input)
-				}
-				return
-			}
-			if err != nil {
-				t.Errorf("unexpected error for input %q: %v", tt.input, err)
-			}
-			if !reflect.DeepEqual(result, tt.expected) {
-				t.Errorf("ParsePackagesFlag(%q) = %v, want %v", tt.input, result, tt.expected)
-			}
-		})
-	}
-}
-
 func TestParseDelimitedSlice(t *testing.T) {
 	tests := []struct {
 		name     string

apptrust/commands/version/create_app_version_cmd.go

@@ -3,6 +3,7 @@ package version
 import (
 	"encoding/json"
 	"strconv"
+	"strings"
 
 	"github.com/jfrog/jfrog-cli-application/apptrust/service/versions"
 
@@ -164,6 +165,10 @@ func (cv *createAppVersionCommand) parseBuilds(buildsStr string) ([]model.Create
 		if err != nil {
 			return nil, errorutils.CheckErrorf("invalid build format: %v", err)
 		}
+		err = validateRequiredFieldsInMap(buildEntryMap, nameField, idField)
+		if err != nil {
+			return nil, errorutils.CheckErrorf("invalid build format: %v", err)
+		}
 		build := model.CreateVersionBuild{
 			Name:   buildEntryMap[nameField],
 			Number: buildEntryMap[idField],
@@ -193,6 +198,10 @@ func (cv *createAppVersionCommand) parseReleaseBundles(rbStr string) ([]model.Cr
 		if err != nil {
 			return nil, errorutils.CheckErrorf("invalid release bundle format: %v", err)
 		}
+		err = validateRequiredFieldsInMap(releaseBundleEntryMap, nameField, versionField)
+		if err != nil {
+			return nil, errorutils.CheckErrorf("invalid release bundle format: %v", err)
+		}
 		bundles = append(bundles, model.CreateVersionReleaseBundle{
 			Name:    releaseBundleEntryMap[nameField],
 			Version: releaseBundleEntryMap[versionField],
@@ -214,6 +223,10 @@ func (cv *createAppVersionCommand) parseSourceVersions(applicationVersionsStr st
 		if err != nil {
 			return nil, errorutils.CheckErrorf("invalid application version format: %v", err)
 		}
+		err = validateRequiredFieldsInMap(applicationVersionEntryMap, applicationKeyField, versionField)
+		if err != nil {
+			return nil, errorutils.CheckErrorf("invalid application version format: %v", err)
+		}
 		refs = append(refs, model.CreateVersionReference{
 			ApplicationKey: applicationVersionEntryMap[applicationKeyField],
 			Version:        applicationVersionEntryMap[versionField],
@@ -284,3 +297,15 @@ func validateNoSpecAndFlagsTogether(ctx *components.Context) error {
 	}
 	return nil
 }
+
+func validateRequiredFieldsInMap(m map[string]string, requiredFields ...string) error {
+	if m == nil {
+		return errorutils.CheckErrorf("missing required fields: %v", strings.Join(requiredFields, ", "))
+	}
+	for _, field := range requiredFields {
+		if _, exists := m[field]; !exists {
+			return errorutils.CheckErrorf("missing required field: %s", field)
+		}
+	}
+	return nil
+}