diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute/cli/mixin/SSCAttributeUpdateMixin.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute/cli/mixin/SSCAttributeUpdateMixin.java index f3090619d2..69113f7632 100644 --- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute/cli/mixin/SSCAttributeUpdateMixin.java +++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute/cli/mixin/SSCAttributeUpdateMixin.java @@ -18,7 +18,7 @@ import picocli.CommandLine.Option; public class SSCAttributeUpdateMixin { - private static final String PARAM_LABEL = "[CATEGORY:]ATTR=VALUE[,VALUE...]"; + private static final String PARAM_LABEL = "ATTR=VALUE"; public static abstract class AbstractSSCAppVersionAttributeUpdateMixin { public abstract Map getAttributes(); diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute/helper/SSCAttributeUpdateBuilder.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute/helper/SSCAttributeUpdateBuilder.java index 32a8759841..cdef7a3af0 100644 --- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute/helper/SSCAttributeUpdateBuilder.java +++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute/helper/SSCAttributeUpdateBuilder.java @@ -222,7 +222,7 @@ private static final ArrayNode getOptionSingleValue(SSCAttributeDefinitionHelper } private static ArrayNode getOptionValues(SSCAttributeDefinitionHelper helper, SSCAttributeDefinitionDescriptor descriptor, String value) { - return Stream.of(value.split(",")) + return Stream.of(value.split("[\\[\\];]")) .filter(StringUtils::isNotBlank) .map(v->helper.getOptionGuid(descriptor.getGuid(), v)) .map(SSCAttributeUpdateBuilder::createAttrValueNode) diff --git a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties index 6853573db6..96a933b5a8 100644 --- a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties +++ b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties @@ -324,7 +324,11 @@ fcli.ssc.artifact.upload.file = File to upload. fcli.ssc.attribute.usage.header = Manage SSC application version attributes & definitions. fcli.ssc.attribute.list.usage.header = List application version attributes. fcli.ssc.attribute.update.usage.header = Update application version attributes. -fcli.ssc.attribute.update.option = Set values for one or more attributes. This option accepts a comma-separated list of attribute value assignments. +fcli.ssc.attribute.update.option = Example: ATTR1=[VAL1;VAL2],CATEGORY:ATTR2=VAL3 \ + \nSet values for one or more attributes. This option accepts a comma-separated list of KEY=VALUE assignments. \ + \nEach KEY accepts either the Attribute's GUID or its Name with the optional Category (InfoClassification or "BUSINESS:Data Classification" or "Data Classification") \ + \nEach VALUE accepts a semicolon-separated list of Attribute's Values, encapsulated in brackets (optional for single value) \ + fcli.ssc.attribute.get-definition.usage.header = Get attribute definition details. fcli.ssc.attribute.list-definitions.usage.header = List attribute definitions. fcli.ssc.attribute-definition.resolver.nameOrId = Attribute definition name or id.