Merge branch 'dev' into release

Author: a0x1ab

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

@@ -36,6 +36,8 @@
     text: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --arm-auth-mode pass-through --enable-arm-private-network-access true
   - name: Create an App Configuration store with a key-value revision retention period of one day (in seconds).
     text: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --kv-revision-retention-period 86400
+  - name: Create an App Configuration store linked to an Azure Front Door profile.
+    text: az appconfig create -g MyResourceGroup -n MyAppConfiguration -l westus --sku Standard --azure-front-door-profile /subscriptions/<SUBSCRIPTION_ID>/resourceGroups/<RESOURCEGROUP>/providers/Microsoft.Cdn/profiles/<PROFILE_NAME>
 """
 
 helps['appconfig list-deleted'] = """
@@ -414,6 +416,10 @@
     text: az appconfig update -g MyResourceGroup -n MyAppConfiguration --arm-auth-mode pass-through --enable-arm-private-network-access true
   - name: Update an App Configuration store to set a key-value revision retention period of one day (in seconds).
     text: az appconfig update -g MyResourceGroup -n MyAppConfiguration --kv-revision-retention-period 86400
+  - name: Update an App Configuration store to link an Azure Front Door profile.
+    text: az appconfig update -g MyResourceGroup -n MyAppConfiguration --azure-front-door-profile /subscriptions/<SUBSCRIPTION_ID>/resourceGroups/<RESOURCEGROUP>/providers/Microsoft.Cdn/profiles/<PROFILE_NAME>
+  - name: Update an App Configuration store to unlink an Azure Front Door profile.
+    text: az appconfig update -g MyResourceGroup -n MyAppConfiguration --azure-front-door-profile ""
 """
 
 helps['appconfig feature'] = """

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

@@ -190,6 +190,7 @@ def load_arguments(self, _):
         c.argument('arm_auth_mode', arg_type=arm_auth_mode_arg_type)
         c.argument('enable_arm_private_network_access', arg_type=enable_arm_private_network_access_arg_type)
         c.argument('kv_revision_retention_period', arg_type=kv_revision_retention_period_arg_type)
+        c.argument('azure_front_door_profile', help='Resource ID of an Azure Front Door profile to link to this App Configuration store.', is_preview=True)
 
     with self.argument_context('appconfig update') as c:
         c.argument('sku', help='The sku of the App Configuration store', arg_type=get_enum_type(['Free', 'Developer', 'Premium', 'Standard']))
@@ -201,6 +202,7 @@ def load_arguments(self, _):
         c.argument('arm_auth_mode', arg_type=arm_auth_mode_arg_type)
         c.argument('enable_arm_private_network_access', arg_type=enable_arm_private_network_access_arg_type)
         c.argument('kv_revision_retention_period', arg_type=kv_revision_retention_period_arg_type)
+        c.argument('azure_front_door_profile', help='Resource ID of an Azure Front Door profile to link to this App Configuration store. Pass "" to unlink a Front Door profile.', is_preview=True)
 
     with self.argument_context('appconfig recover') as c:
         c.argument('location', arg_type=get_location_type(self.cli_ctx), help='Location of the deleted App Configuration store. Can be viewed using command `az appconfig show-deleted`.')

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

@@ -24,7 +24,8 @@
                                                 AuthenticationMode,
                                                 PublicNetworkAccess,
                                                 PrivateLinkDelegation,
-                                                DataPlaneProxyProperties)
+                                                DataPlaneProxyProperties,
+                                                AzureFrontDoorProperties)
 from knack.log import get_logger
 from ._utils import resolve_store_metadata, resolve_deleted_store_metadata
 from ._constants import ARMAuthenticationMode, ProvisioningStatus
@@ -54,7 +55,8 @@ def create_configstore(cmd,  # pylint: disable=too-many-locals
                        no_replica=None,  # pylint: disable=unused-argument
                        arm_auth_mode=None,
                        enable_arm_private_network_access=None,
-                       kv_revision_retention_period=None):
+                       kv_revision_retention_period=None,
+                       azure_front_door_profile=None):
     if assign_identity is not None and not assign_identity:
         assign_identity = [SYSTEM_ASSIGNED_IDENTITY]
 
@@ -70,6 +72,10 @@ def create_configstore(cmd,  # pylint: disable=too-many-locals
     if arm_auth_mode is not None:
         arm_authentication_mode = AuthenticationMode.LOCAL if arm_auth_mode == ARMAuthenticationMode.LOCAL else AuthenticationMode.PASS_THROUGH
 
+    azure_front_door = None
+    if azure_front_door_profile is not None:
+        azure_front_door = AzureFrontDoorProperties(resource_id=azure_front_door_profile if azure_front_door_profile else None)
+
     configstore_params = ConfigurationStore(location=location.lower(),
                                             identity=__get_resource_identity(assign_identity) if assign_identity else None,
                                             sku=Sku(name=sku),
@@ -82,7 +88,8 @@ def create_configstore(cmd,  # pylint: disable=too-many-locals
                                             default_key_value_revision_retention_period_in_seconds=kv_revision_retention_period,
                                             data_plane_proxy=DataPlaneProxyProperties(
                                                 authentication_mode=arm_authentication_mode,
-                                                private_link_delegation=arm_private_link_delegation))
+                                                private_link_delegation=arm_private_link_delegation),
+                                            azure_front_door=azure_front_door)
 
     progress = IndeterminateStandardOut()
 
@@ -183,7 +190,8 @@ def update_configstore(cmd,  # pylint: disable=too-many-locals
                        enable_purge_protection=None,
                        arm_auth_mode=None,
                        enable_arm_private_network_access=None,
-                       kv_revision_retention_period=None):
+                       kv_revision_retention_period=None,
+                       azure_front_door_profile=None):
     __validate_cmk(encryption_key_name, encryption_key_vault, encryption_key_version, identity_client_id)
     if resource_group_name is None:
         resource_group_name, _ = resolve_store_metadata(cmd, name)
@@ -200,6 +208,10 @@ def update_configstore(cmd,  # pylint: disable=too-many-locals
     if arm_auth_mode is not None:
         arm_authentication_mode = AuthenticationMode.LOCAL if arm_auth_mode == ARMAuthenticationMode.LOCAL else AuthenticationMode.PASS_THROUGH
 
+    azure_front_door = None
+    if azure_front_door_profile is not None:
+        azure_front_door = AzureFrontDoorProperties(resource_id=azure_front_door_profile if azure_front_door_profile else None)
+
     update_params = ConfigurationStoreUpdateParameters(tags=tags,
                                                        sku=Sku(name=sku) if sku else None,
                                                        public_network_access=public_network_access,
@@ -208,7 +220,8 @@ def update_configstore(cmd,  # pylint: disable=too-many-locals
                                                        default_key_value_revision_retention_period_in_seconds=kv_revision_retention_period,
                                                        data_plane_proxy=DataPlaneProxyProperties(
                                                            authentication_mode=arm_authentication_mode,
-                                                           private_link_delegation=arm_private_link_delegation))
+                                                           private_link_delegation=arm_private_link_delegation),
+                                                       azure_front_door=azure_front_door)
 
     if encryption_key_name is not None:
         key_vault_properties = KeyVaultProperties()

src/azure-cli/azure/cli/command_modules/appconfig/linter_exclusions.yml

@@ -6,8 +6,14 @@ appconfig create:
     kv_revision_retention_period:
       rule_exclusions:
         - option_length_too_long
+    azure_front_door_profile:
+      rule_exclusions:
+        - option_length_too_long
 appconfig update:
   parameters:
     kv_revision_retention_period:
+      rule_exclusions:
+        - option_length_too_long
+    azure_front_door_profile:
       rule_exclusions:
         - option_length_too_long