Support set and filtering by tags for feature commands

Author: Christine WANJAU

src/azure-cli/azure/cli/command_modules/appconfig/_featuremodels.py

@@ -134,6 +134,8 @@ class FeatureFlag:
         The list of variants defined for this feature.
     :ivar dict {string, object} telemetry:
         The declaration of options used to configure telemetry for this feature.
+    :ivar dict tags:
+        Tags associated with the feature flag.
     """
 
     def __init__(
@@ -151,6 +153,7 @@ def __init__(
         allocation=None,
         variants=None,
         telemetry=None,
+        tags=None
     ):
         self.name = name
         self.key = key
@@ -165,6 +168,7 @@ def __init__(
         self.variants = variants
         self.telemetry = telemetry
         self.display_name = display_name
+        self.tags = tags
 
     def __repr__(self):
         featureflag = {
@@ -180,7 +184,8 @@ def __repr__(self):
             "Allocation": custom_serialize_allocation(self.allocation),
             "Variants": custom_serialize_variants(self.variants),
             "Telemetry": custom_serialize_telemetry(self.telemetry),
-            "Display Name": self.display_name
+            "Display Name": self.display_name,
+            "Tags": self.tags
         }
 
         return json.dumps(featureflag, indent=2, ensure_ascii=False)
@@ -803,7 +808,8 @@ def map_keyvalue_to_featureflag(keyvalue, show_all_details=True, hide_enabled=Tr
         last_modified=keyvalue.last_modified,
         allocation=feature_flag_value.allocation,
         variants=feature_flag_value.variants,
-        telemetry=feature_flag_value.telemetry
+        telemetry=feature_flag_value.telemetry,
+        tags=keyvalue.tags
     )
 
     # By Default, we will try to show conditions unless the user has

src/azure-cli/azure/cli/command_modules/appconfig/_params.py

@@ -358,18 +358,21 @@ def load_arguments(self, _):
         c.argument('key', validator=validate_feature_key, help='Key of the feature flag. Key must start with the ".appconfig.featureflag/" prefix. Key cannot contain the "%" character. Default key is the reserved prefix ".appconfig.featureflag/" + feature name.')
         c.argument('requirement_type', arg_type=get_enum_type([FeatureFlagConstants.REQUIREMENT_TYPE_ALL, FeatureFlagConstants.REQUIREMENT_TYPE_ANY]),
                    help='Requirement type determines if filters should use "Any" or "All" logic when evaluating the state of a feature.')
+        c.argument('tags', arg_type=tags_type)
 
     with self.argument_context('appconfig feature delete') as c:
         c.argument('feature', help='Name of the feature to be deleted. If the feature flag key is different from the default key, provide the `--key` argument instead. Support star sign as filters, for instance * means all features and abc* means features with abc as prefix. Comma separated features are not supported. Please provide escaped string if your feature name contains comma.')
         c.argument('label', help="If no label specified, delete the feature flag with null label by default. Support star sign as filters, for instance * means all labels and abc* means labels with abc as prefix.")
         c.argument('key', validator=validate_feature_key, help='Key of the feature flag. Key must start with the ".appconfig.featureflag/" prefix. Key cannot contain the "%" character. If both key and feature arguments are provided, only key will be used. Support star sign as filters, for instance ".appconfig.featureflag/*" means all features and ".appconfig.featureflag/abc*" means features with abc as prefix. Comma separated features are not supported. Please provide escaped string if your feature name contains comma.')
+        c.argument('tags', arg_type=tags_arg_type, help="If no tags are specified, delete all feature flags with any tags. Support space-separated tags: key[=value] [key[=value] ...].")
 
     with self.argument_context('appconfig feature list') as c:
         c.argument('feature', help='Name of the feature to be listed. If the feature flag key is different from the default key, provide the `--key` argument instead. Support star sign as filters, for instance * means all features and abc* means features with abc as prefix. Comma separated features are not supported. Please provide escaped string if your feature name contains comma.')
         c.argument('label', help="If no label specified, list all labels. Support star sign as filters, for instance * means all labels and abc* means labels with abc as prefix. Use '\\0' for null label.")
         c.argument('fields', arg_type=feature_fields_arg_type)
         c.argument('all_', help="List all feature flags.")
         c.argument('key', validator=validate_feature_key, help='Key of the feature flag. Key must start with the ".appconfig.featureflag/" prefix. Key cannot contain the "%" character. If both key and feature arguments are provided, only key will be used. Support star sign as filters, for instance ".appconfig.featureflag/*" means all features and ".appconfig.featureflag/abc*" means features with abc as prefix. Comma separated features are not supported. Please provide escaped string if your feature name contains comma.')
+        c.argument('tags', arg_type=tags_arg_type, help="If no tags are specified, delete all feature flags with any tags. Support space-separated tags: key[=value] [key[=value] ...].")
 
     with self.argument_context('appconfig feature lock') as c:
         c.argument('feature', help='Name of the feature to be locked. If the feature flag key is different from the default key, provide the `--key` argument instead.')

src/azure-cli/azure/cli/command_modules/appconfig/feature.py

@@ -51,7 +51,8 @@ def set_feature(cmd,
                 yes=False,
                 connection_string=None,
                 auth_mode="key",
-                endpoint=None):
+                endpoint=None,
+                tags=None):
     if key is None and feature is None:
         raise CLIErrors.RequiredArgumentMissingError("Please provide either `--key` or `--feature` value.")
 
@@ -67,7 +68,6 @@ def set_feature(cmd,
             raise exception
 
     # when creating a new Feature flag, these defaults will be used
-    tags = {}
     default_conditions = {FeatureFlagConstants.CLIENT_FILTERS: []}
 
     if requirement_type:
@@ -145,6 +145,7 @@ def set_feature(cmd,
 
             # Convert KeyValue object to required FeatureFlag format for
             # display
+
             feature_flag = map_keyvalue_to_featureflag(set_kv, show_all_details=True)
             entry = json.dumps(feature_flag, default=lambda o: o.__dict__, indent=2, sort_keys=True, ensure_ascii=False)
 
@@ -185,7 +186,8 @@ def delete_feature(cmd,
                    yes=False,
                    connection_string=None,
                    auth_mode="key",
-                   endpoint=None):
+                   endpoint=None,
+                   tags=None):
     if key is None and feature is None:
         raise CLIErrors.RequiredArgumentMissingError("Please provide either `--key` or `--feature` value.")
     if key and feature:
@@ -204,9 +206,10 @@ def delete_feature(cmd,
     retrieved_keyvalues = __list_all_keyvalues(azconfig_client,
                                                key_filter=key_filter,
                                                label=SearchFilterOptions.EMPTY_LABEL if label is None else label,
-                                               correlation_request_id=correlation_request_id)
+                                               correlation_request_id=correlation_request_id,
+                                               tags=tags)
 
-    confirmation_message = "Found '{}' feature flags matching the specified feature and label. Are you sure you want to delete these feature flags?".format(len(retrieved_keyvalues))
+    confirmation_message = "Found '{}' feature flags matching the specified feature, label, and tags. Are you sure you want to delete these feature flags?".format(len(retrieved_keyvalues))
     user_confirmation(confirmation_message, yes)
 
     deleted_kvs = []
@@ -304,7 +307,8 @@ def list_feature(cmd,
                  top=None,
                  all_=False,
                  auth_mode="key",
-                 endpoint=None):
+                 endpoint=None,
+                 tags=None):
     return __list_features(
         cmd=cmd,
         feature=feature,
@@ -316,7 +320,8 @@ def list_feature(cmd,
         top=top,
         all_=all_,
         auth_mode=auth_mode,
-        endpoint=endpoint
+        endpoint=endpoint,
+        tags=tags
     )