format tags

Author: Christine WANJAU

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

@@ -31,7 +31,7 @@
 
 from ._constants import (FeatureFlagConstants, KeyVaultConstants, SearchFilterOptions, KVSetConstants, ImportExportProfiles, AppServiceConstants, JsonDiff, CompareFieldsMap, StatusCodes, ImportMode)
 from ._diff_utils import get_serializer, KVComparer, print_preview, __print_diff
-from ._utils import prep_label_filter_for_url_encoding, is_json_content_type, validate_feature_flag_name, validate_feature_flag_key
+from ._utils import prep_label_filter_for_url_encoding, is_json_content_type, validate_feature_flag_name, validate_feature_flag_key, format_tags_filter
 from ._models import (KeyValue, convert_configurationsetting_to_keyvalue,
                       convert_keyvalue_to_configurationsetting, QueryFields)
 from ._featuremodels import (map_featureflag_to_keyvalue, is_feature_flag, FeatureFlagValue, FeatureManagementReservedKeywords)
@@ -280,6 +280,7 @@ def __read_kv_from_config_store(azconfig_client,
     # In list, restore & list_revision commands, we treat missing --label as all labels
 
     label = prep_label_filter_for_url_encoding(label)
+    tags = format_tags_filter(tags)
 
     query_fields = []
     if fields:
@@ -367,6 +368,7 @@ def __write_kv_and_features_to_config_store(azconfig_client,
                                             key_values,
                                             features=None,
                                             label=None,
+                                            tags=None,
                                             preserve_labels=False,
                                             content_type=None,
                                             correlation_request_id=None):
@@ -378,10 +380,13 @@ def __write_kv_and_features_to_config_store(azconfig_client,
     if features:
         key_values.extend(__convert_featureflag_list_to_keyvalue_list(features))
 
+    logger.warning(tags)
+    breakpoint()
     for kv in key_values:
         set_kv = convert_keyvalue_to_configurationsetting(kv)
         if not preserve_labels:
             set_kv.label = label
+            set_kv.tags = tags
 
         # Don't overwrite the content type of feature flags or key vault references
         if content_type and not is_feature_flag(set_kv) and not __is_key_vault_ref(set_kv):

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

@@ -230,3 +230,14 @@ def validate_feature_flag_key(key):
         raise InvalidArgumentValueError("Feature flag key must start with the reserved prefix '{0}'.".format(FeatureFlagConstants.FEATURE_FLAG_PREFIX))
     if len(input_key) == len(FeatureFlagConstants.FEATURE_FLAG_PREFIX):
         raise InvalidArgumentValueError("Feature flag key must contain more characters after the reserved prefix '{0}'.".format(FeatureFlagConstants.FEATURE_FLAG_PREFIX))
+
+
+def format_tags_filter(tags):
+    if tags is None:
+        return None
+
+    tags_list = []
+    for key, value in tags.items():
+        tags_list.append(f"{key}={value}")
+    
+    return tags_list

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

@@ -28,7 +28,7 @@
 from ._models import (KeyValue,
                       convert_configurationsetting_to_keyvalue,
                       convert_keyvalue_to_configurationsetting)
-from ._utils import (get_appconfig_data_client,
+from ._utils import (format_tags_filter, get_appconfig_data_client,
                      prep_label_filter_for_url_encoding,
                      validate_feature_flag_name)
 from ._featuremodels import (map_keyvalue_to_featureflag,
@@ -247,8 +247,7 @@ def show_feature(cmd,
                  fields=None,
                  connection_string=None,
                  auth_mode="key",
-                 endpoint=None,
-                 tags=None):
+                 endpoint=None):
     if key is None and feature is None:
         raise CLIErrors.RequiredArgumentMissingError("Please provide either `--key` or `--feature` value.")
     if key and feature:
@@ -261,7 +260,7 @@ def show_feature(cmd,
     azconfig_client = get_appconfig_data_client(cmd, name, connection_string, auth_mode, endpoint)
 
     try:
-        config_setting = azconfig_client.get_configuration_setting(key=key, label=label, tags=tags)
+        config_setting = azconfig_client.get_configuration_setting(key=key, label=label)
         if config_setting is None or config_setting.content_type != FeatureFlagConstants.FEATURE_FLAG_CONTENT_TYPE:
             raise CLIErrors.ResourceNotFoundError("The feature flag does not exist.")
 
@@ -1261,6 +1260,7 @@ def __list_all_keyvalues(azconfig_client,
         raise CLIError("Comma separated feature names are not supported. Please provide escaped string if your feature name contains comma. \nSee \"az appconfig feature list -h\" for correct usage.")
 
     label = prep_label_filter_for_url_encoding(label)
+    tags = format_tags_filter(tags)
 
     try:
         configsetting_iterable = azconfig_client.list_configuration_settings(key_filter=key_filter, label_filter=label, tags_filter=tags, headers={HttpHeaders.CORRELATION_REQUEST_ID: correlation_request_id})

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

@@ -31,7 +31,7 @@
                          JsonDiff, ImportMode)
 from ._featuremodels import map_keyvalue_to_featureflag
 from ._models import (convert_configurationsetting_to_keyvalue, convert_keyvalue_to_configurationsetting)
-from ._utils import get_appconfig_data_client, prep_label_filter_for_url_encoding, resolve_store_metadata, get_store_endpoint_from_connection_string, is_json_content_type
+from ._utils import format_tags_filter, get_appconfig_data_client, prep_label_filter_for_url_encoding, resolve_store_metadata, get_store_endpoint_from_connection_string, is_json_content_type
 
 from ._kv_helpers import (__read_kv_from_file, __read_features_from_file,
                           __write_kv_and_features_to_file, __read_kv_from_config_store,
@@ -51,6 +51,7 @@ def import_config(cmd,
                   name=None,
                   connection_string=None,
                   label=None,
+                  tags=None,  # tags to add 
                   prefix="",  # prefix to add
                   yes=False,
                   skip_features=False,
@@ -74,6 +75,7 @@ def import_config(cmd,
                   preserve_labels=False,
                   src_auth_mode="key",
                   src_endpoint=None,
+                  src_tags=None, # tags to filter
                   # from-appservice parameters
                   appservice_account=None):
 
@@ -133,6 +135,7 @@ def import_config(cmd,
                                               key=src_key,
                                               snapshot=src_snapshot,
                                               label=src_label if src_label else SearchFilterOptions.EMPTY_LABEL,
+                                              tags=src_tags,
                                               prefix_to_add=prefix,
                                               correlation_request_id=correlation_request_id)
 
@@ -144,6 +147,7 @@ def import_config(cmd,
                 all_features = __read_kv_from_config_store(src_azconfig_client,
                                                            key=FeatureFlagConstants.FEATURE_FLAG_PREFIX + '*',
                                                            label=src_label if src_label else SearchFilterOptions.EMPTY_LABEL,
+                                                           tags=src_tags,
                                                            correlation_request_id=correlation_request_id)
 
             for feature in all_features:
@@ -162,6 +166,7 @@ def import_config(cmd,
         dest_kvs = __read_kv_from_config_store(azconfig_client,
                                                key=prefix + SearchFilterOptions.ANY_KEY if prefix else SearchFilterOptions.ANY_KEY,
                                                label=label if label else SearchFilterOptions.EMPTY_LABEL,
+                                               tags=src_tags,
                                                correlation_request_id=correlation_request_id)
         __discard_features_from_retrieved_kv(dest_kvs)
 
@@ -186,6 +191,7 @@ def import_config(cmd,
         all_features = __read_kv_from_config_store(azconfig_client,
                                                    key=FeatureFlagConstants.FEATURE_FLAG_PREFIX + SearchFilterOptions.ANY_KEY,
                                                    label=label if label else SearchFilterOptions.EMPTY_LABEL,
+                                                   tags=src_tags,
                                                    correlation_request_id=correlation_request_id)
 
         # Append all features to dest_features list
@@ -235,6 +241,7 @@ def import_config(cmd,
     __write_kv_and_features_to_config_store(azconfig_client,
                                             key_values=kvs_to_write,
                                             label=label,
+                                            tags=tags,    # should we have preserve tags? like preserve-labels
                                             preserve_labels=preserve_labels,
                                             content_type=content_type,
                                             correlation_request_id=correlation_request_id)
@@ -246,6 +253,7 @@ def export_config(cmd,
                   connection_string=None,
                   label=None,
                   key=None,
+                  tags=None,  # tags to filter
                   prefix="",  # prefix to remove
                   yes=False,
                   skip_features=False,
@@ -267,6 +275,7 @@ def export_config(cmd,
                   preserve_labels=False,
                   dest_auth_mode="key",
                   dest_endpoint=None,
+                  dest_tags=None, # tags to add
                   # to-app-service parameters
                   appservice_account=None,
                   export_as_reference=False):
@@ -279,6 +288,8 @@ def export_config(cmd,
     format_ = format_.lower() if format_ else None
     naming_convention = naming_convention.lower()
 
+    logger.warning(tags)
+    logger.warning(dest_tags)
     azconfig_client = get_appconfig_data_client(cmd, name, connection_string, auth_mode, endpoint)
 
     # generate correlation_request_id for bulk operation
@@ -299,6 +310,7 @@ def export_config(cmd,
     src_kvs = __read_kv_from_config_store(azconfig_client,
                                           key=key,
                                           label=label if label else SearchFilterOptions.EMPTY_LABEL,
+                                          tags=tags,
                                           prefix_to_remove=prefix if not export_as_reference else "",
                                           snapshot=snapshot,
                                           cli_ctx=cmd.cli_ctx if resolve_keyvault else None,
@@ -323,6 +335,7 @@ def export_config(cmd,
                     cmd,
                     feature="*",
                     label=label if label else SearchFilterOptions.EMPTY_LABEL,
+                    tags=tags,
                     name=name,
                     connection_string=connection_string,
                     all_=True,
@@ -352,6 +365,7 @@ def export_config(cmd,
         dest_kvs = __read_kv_from_config_store(dest_azconfig_client,
                                                key=SearchFilterOptions.ANY_KEY,
                                                label=dest_label if dest_label else SearchFilterOptions.EMPTY_LABEL,
+                                               tags=tags,
                                                correlation_request_id=correlation_request_id)
         __discard_features_from_retrieved_kv(dest_kvs)
 
@@ -361,6 +375,7 @@ def export_config(cmd,
                 cmd,
                 feature="*",
                 label=dest_label if dest_label else SearchFilterOptions.EMPTY_LABEL,
+                tags=tags,
                 name=dest_name,
                 connection_string=dest_connection_string,
                 all_=True,
@@ -409,7 +424,7 @@ def export_config(cmd,
                                         naming_convention=naming_convention)
     elif destination == 'appconfig':
         __write_kv_and_features_to_config_store(dest_azconfig_client, key_values=src_kvs, features=src_features,
-                                                label=dest_label, preserve_labels=preserve_labels,
+                                                label=dest_label, tags=dest_tags, preserve_labels=preserve_labels,
                                                 correlation_request_id=correlation_request_id)
     elif destination == 'appservice':
         __write_kv_to_app_service(cmd, key_values=src_kvs, appservice_account=appservice_account)
@@ -895,6 +910,7 @@ def list_revision(cmd,
     key = key if key else SearchFilterOptions.ANY_KEY
     label = label if label else SearchFilterOptions.ANY_LABEL
     label = prep_label_filter_for_url_encoding(label)
+    tags = format_tags_filter(tags)
 
     try:
         query_fields = None

src/azure-cli/azure/cli/command_modules/appconfig/tests/latest/import_features_new_fm_schea.json

@@ -0,0 +1,28 @@
+{
+  "ComplexSettings:MyListOfHybridLists": [
+    [
+      "NestedArray4",
+      34
+    ],
+    [
+      "NestedArray5",
+      true,
+      null
+    ],
+    [
+      "NestedArray6",
+      {
+        "MyNullValue": null,
+        "MyObject": {
+          "Property": {
+            "Name": {
+              "Name1": "Value1",
+              "Name2": "Value2"
+            }
+          }
+        }
+      }
+    ]
+  ],
+  "ComplexSettings:MyObject:ObjectSetting:Logging:Default": "Debug"
+}