Merge remote-tracking branch 'upstream/main' into TelemetrySupport

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_azureappconfigurationprovider.py

@@ -10,6 +10,7 @@
 import datetime
 import hashlib
 import base64
+from importlib.metadata import version, PackageNotFoundError
 from threading import Lock
 import logging
 from typing import (
@@ -55,6 +56,13 @@
     ETAG_KEY,
     FEATURE_FLAG_REFERENCE_KEY,
     FEATURE_FLAG_ID_KEY,
+    PERCENTAGE_FILTER_NAMES,
+    TIME_WINDOW_FILTER_NAMES,
+    TARGETING_FILTER_NAMES,
+    CUSTOM_FILTER_KEY,
+    PERCENTAGE_FILTER_KEY,
+    TIME_WINDOW_FILTER_KEY,
+    TARGETING_FILTER_KEY,
 )
 from ._user_agent import USER_AGENT
 
@@ -106,17 +114,21 @@ def load(  # pylint: disable=docstring-keyword-should-match-keyword-only
     after a fixed interval. This should be a list of Key-Label pairs for specific settings (filters and wildcards are
     not supported).
     :keyword int refresh_interval: The minimum time in seconds between when a call to `refresh` will actually trigger a
-    service call to update the settings. Default value is 30 seconds.
-    :keyword Optional[Callable] on_refresh_success: Optional callback to be invoked when a change is found and a
-    successful refresh has happened.
-    :keyword Optional[Callable[[Exception], None]] on_refresh_error: Optional callback to be invoked when an error
-    occurs while refreshing settings. If not specified, errors will be raised.
-    :keyword bool feature_flag_enabled: Optional flag to enable or disable the loading of feature flags. Default is
-    False.
-    :keyword List[SettingSelector] feature_flag_selectors: Optional list of selectors to filter feature flags. By
-    default will load all feature flags without a label.
-    :keyword bool feature_flag_refresh_enabled: Optional flag to enable or disable the refresh of feature flags.
-    Default is False.
+     service call to update the settings. Default value is 30 seconds.
+    :keyword on_refresh_success: Optional callback to be invoked when a change is found and a successful refresh has
+    happened.
+    :paramtype on_refresh_success: Optional[Callable]
+    :keyword on_refresh_error: Optional callback to be invoked when an error occurs while refreshing settings. If not
+    specified, errors will be raised.
+    :paramtype on_refresh_error: Optional[Callable[[Exception], None]]
+    :keyword feature_flag_enabled: Optional flag to enable or disable the loading of feature flags. Default is False.
+    :paramtype feature_flag_enabled: bool
+    :keyword feature_flag_selectors: Optional list of selectors to filter feature flags. By default will load all
+     feature flags without a label.
+    :paramtype feature_flag_selectors: List[SettingSelector]
+    :keyword feature_flag_refresh_enabled: Optional flag to enable or disable the refresh of feature flags. Default is
+     False.
+    :paramtype feature_flag_refresh_enabled: bool
     """
 
 
@@ -157,16 +169,20 @@ def load(  # pylint: disable=docstring-keyword-should-match-keyword-only
     not supported).
     :keyword int refresh_interval: The minimum time in seconds between when a call to `refresh` will actually trigger a
      service call to update the settings. Default value is 30 seconds.
-    :keyword Optional[Callable] on_refresh_success: Optional callback to be invoked when a change is found and a
-    successful refresh has happened.
-    :keyword Optional[Callable[[Exception], None]] on_refresh_error: Optional callback to be invoked when an error
-    occurs while refreshing settings. If not specified, errors will be raised.
-    :keyword bool feature_flag_enabled: Optional flag to enable or disable the loading of feature flags. Default is
-    False.
-    :keyword List[SettingSelector] feature_flag_selectors: Optional list of selectors to filter feature flags. By
-    default will load all feature flags without a label.
-    :keyword bool feature_flag_refresh_enabled: Optional flag to enable or disable the refresh of feature flags.
-    Default is False.
+    :keyword on_refresh_success: Optional callback to be invoked when a change is found and a successful refresh has
+     happened.
+    :paramtype on_refresh_success: Optional[Callable]
+    :keyword on_refresh_error: Optional callback to be invoked when an error occurs while refreshing settings. If not
+    specified, errors will be raised.
+    :paramtype on_refresh_error: Optional[Callable[[Exception], None]]
+    :keyword feature_flag_enabled: Optional flag to enable or disable the loading of feature flags. Default is False.
+    :paramtype feature_flag_enabled: bool
+    :keyword feature_flag_selectors: Optional list of selectors to filter feature flags. By default will load all
+     feature flags without a label.
+    :paramtype feature_flag_selectors: List[SettingSelector]
+    :keyword feature_flag_refresh_enabled: Optional flag to enable or disable the refresh of feature flags. Default is
+     False.
+    :paramtype feature_flag_refresh_enabled: bool
     """
 
 

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/_constants.py

@@ -22,3 +22,11 @@
 ETAG_KEY = "etag"
 FEATURE_FLAG_REFERENCE_KEY = "feature_flag_reference"
 FEATURE_FLAG_ID_KEY = "feature_flag_id"
+PERCENTAGE_FILTER_NAMES = ["Percentage", "PercentageFilter", "Microsoft.Percentage", "Microsoft.PercentageFilter"]
+TIME_WINDOW_FILTER_NAMES = ["TimeWindow", "TimeWindowFilter", "Microsoft.TimeWindow", "Microsoft.TimeWindowFilter"]
+TARGETING_FILTER_NAMES = ["Targeting", "TargetingFilter", "Microsoft.Targeting", "Microsoft.TargetingFilter"]
+
+CUSTOM_FILTER_KEY = "CSTM"  # cspell:disable-line
+PERCENTAGE_FILTER_KEY = "PRCNT"  # cspell:disable-line
+TIME_WINDOW_FILTER_KEY = "TIME"
+TARGETING_FILTER_KEY = "TRGT"  # cspell:disable-line

sdk/appconfiguration/azure-appconfiguration-provider/azure/appconfiguration/provider/aio/_azureappconfigurationproviderasync.py

@@ -50,6 +50,13 @@
     ETAG_KEY,
     FEATURE_FLAG_REFERENCE_KEY,
     FEATURE_FLAG_ID_KEY,
+    PERCENTAGE_FILTER_NAMES,
+    TIME_WINDOW_FILTER_NAMES,
+    TARGETING_FILTER_NAMES,
+    CUSTOM_FILTER_KEY,
+    PERCENTAGE_FILTER_KEY,
+    TIME_WINDOW_FILTER_KEY,
+    TARGETING_FILTER_KEY,
 )
 from .._azureappconfigurationprovider import (
     _is_json_content_type,