APP-1540 - Added incremental application update support by remove-labels and add-labels flags

Author: omrilo

apptrust/commands/application/application_utils.go

@@ -49,6 +49,29 @@ func populateApplicationFromFlags(ctx *components.Context, descriptor *model.App
 		descriptor.Labels = &labelsMap
 	}
 
+	// Only set LabelUpdates if at least one of add-labels or remove-labels flags is set
+	if ctx.IsFlagSet(commands.AddLabelsFlag) || ctx.IsFlagSet(commands.RemoveLabelsFlag) {
+		labelUpdates := &model.LabelUpdates{}
+
+		if ctx.IsFlagSet(commands.AddLabelsFlag) {
+			addLabels, err := utils.ParseLabelKeyValuePairs(ctx.GetStringFlagValue(commands.AddLabelsFlag))
+			if err != nil {
+				return err
+			}
+			labelUpdates.Add = addLabels
+		}
+
+		if ctx.IsFlagSet(commands.RemoveLabelsFlag) {
+			removeLabels, err := utils.ParseLabelKeyValuePairs(ctx.GetStringFlagValue(commands.RemoveLabelsFlag))
+			if err != nil {
+				return err
+			}
+			labelUpdates.Remove = removeLabels
+		}
+
+		descriptor.LabelUpdates = labelUpdates
+	}
+
 	if ctx.IsFlagSet(commands.UserOwnersFlag) {
 		userOwners := utils.ParseSliceFlag(ctx.GetStringFlagValue(commands.UserOwnersFlag))
 		descriptor.UserOwners = &userOwners

apptrust/commands/flags.go

@@ -37,6 +37,8 @@ const (
 	BusinessCriticalityFlag           = "business-criticality"
 	MaturityLevelFlag                 = "maturity-level"
 	LabelsFlag                        = "labels"
+	AddLabelsFlag                     = "add-labels"
+	RemoveLabelsFlag                  = "remove-labels"
 	UserOwnersFlag                    = "user-owners"
 	GroupOwnersFlag                   = "group-owners"
 	SyncFlag                          = "sync"
@@ -74,6 +76,8 @@ var flagsMap = map[string]components.Flag{
 	BusinessCriticalityFlag:           components.NewStringFlag(BusinessCriticalityFlag, "The business criticality level. The following values are supported: "+coreutils.ListToText(model.BusinessCriticalityValues), func(f *components.StringFlag) { f.Mandatory = false }),
 	MaturityLevelFlag:                 components.NewStringFlag(MaturityLevelFlag, "The maturity level. The following values are supported: "+coreutils.ListToText(model.MaturityLevelValues), func(f *components.StringFlag) { f.Mandatory = false }),
 	LabelsFlag:                        components.NewStringFlag(LabelsFlag, "List of semicolon-separated (;) labels in the form of \"key1=value1;key2=value2;...\" (wrapped by quotes).", func(f *components.StringFlag) { f.Mandatory = false }),
+	AddLabelsFlag:                     components.NewStringFlag(AddLabelsFlag, "List of semicolon-separated (;) labels to add in the form of \"key1=value1;key1=value2;key2=value3;...\" (wrapped by quotes)..", func(f *components.StringFlag) { f.Mandatory = false }),
+	RemoveLabelsFlag:                  components.NewStringFlag(RemoveLabelsFlag, "List of semicolon-separated (;) labels to remove in the form of \"key1=value1;key2=value2;...\" (wrapped by quotes).", func(f *components.StringFlag) { f.Mandatory = false }),
 	UserOwnersFlag:                    components.NewStringFlag(UserOwnersFlag, "semicolon-separated (;) list of user owners in the form of \"user1;user2;...\" (wrapped by quotes).", func(f *components.StringFlag) { f.Mandatory = false }),
 	GroupOwnersFlag:                   components.NewStringFlag(GroupOwnersFlag, "semicolon-separated (;) list of group owners in the form of \"group1;group2;...\" (wrapped by quotes).", func(f *components.StringFlag) { f.Mandatory = false }),
 	SyncFlag:                          components.NewBoolFlag(SyncFlag, "Whether to synchronize the operation.", components.WithBoolDefaultValueTrue()),
@@ -204,6 +208,8 @@ var commandFlags = map[string][]string{
 		BusinessCriticalityFlag,
 		MaturityLevelFlag,
 		LabelsFlag,
+		AddLabelsFlag,
+		RemoveLabelsFlag,
 		UserOwnersFlag,
 		GroupOwnersFlag,
 	},

apptrust/commands/utils/utils.go

@@ -5,6 +5,7 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/jfrog/jfrog-cli-application/apptrust/model"
 	commonCliUtils "github.com/jfrog/jfrog-cli-core/v2/common/cliutils"
 	pluginsCommon "github.com/jfrog/jfrog-cli-core/v2/plugins/common"
 	"github.com/jfrog/jfrog-cli-core/v2/plugins/components"
@@ -166,3 +167,27 @@ func ParseListPropertiesFlag(propertiesStr string) (map[string][]string, error)
 
 	return result, nil
 }
+
+func ParseLabelKeyValuePairs(flagValue string) ([]model.LabelKeyValue, error) {
+	if flagValue == "" {
+		return []model.LabelKeyValue{}, nil
+	}
+
+	var result []model.LabelKeyValue
+	pairs := strings.Split(flagValue, ";")
+	for _, pair := range pairs {
+		trimmedPair := strings.TrimSpace(pair)
+		if trimmedPair == "" {
+			continue
+		}
+		keyValue := strings.SplitN(trimmedPair, "=", 2)
+		if len(keyValue) != 2 {
+			return nil, errorutils.CheckErrorf("invalid key-value pair: '%s' (expected format key=value)", pair)
+		}
+		result = append(result, model.LabelKeyValue{
+			Key:   strings.TrimSpace(keyValue[0]),
+			Value: strings.TrimSpace(keyValue[1]),
+		})
+	}
+	return result, nil
+}

apptrust/model/app_descriptor.go

@@ -30,6 +30,16 @@ var (
 	}
 )
 
+type LabelKeyValue struct {
+	Key   string `json:"key"`
+	Value string `json:"value"`
+}
+
+type LabelUpdates struct {
+	Remove []LabelKeyValue `json:"remove,omitempty"`
+	Add    []LabelKeyValue `json:"add,omitempty"`
+}
+
 type AppDescriptor struct {
 	ApplicationKey      string             `json:"application_key"`
 	ApplicationName     string             `json:"application_name,omitempty"`
@@ -38,6 +48,7 @@ type AppDescriptor struct {
 	MaturityLevel       *string            `json:"maturity_level,omitempty"`
 	BusinessCriticality *string            `json:"criticality,omitempty"`
 	Labels              *map[string]string `json:"labels,omitempty"`
+	LabelUpdates        *LabelUpdates      `json:"label_updates,omitempty"`
 	UserOwners          *[]string          `json:"user_owners,omitempty"`
 	GroupOwners         *[]string          `json:"group_owners,omitempty"`
 }