added unique domain feature in functionapp create

Author: khkh-ms

src/azure-cli-core/azure/cli/core/profiles/_shared.py

@@ -254,7 +254,7 @@ def default_api_version(self):
             'subscription_diagnostic_settings': '2017-05-01-preview'
         }),
         ResourceType.MGMT_MSI: '2023-01-31',
-        ResourceType.MGMT_APPSERVICE: '2023-01-01',
+        ResourceType.MGMT_APPSERVICE: '2024-04-01',
         ResourceType.MGMT_IOTHUB: '2023-06-30-preview',
         ResourceType.MGMT_IOTDPS: '2021-10-15',
         ResourceType.MGMT_IOTCENTRAL: '2021-11-01-preview',

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

@@ -875,6 +875,7 @@ def load_arguments(self, _):
                    help='Enable zone redundancy for high availability. Applies to Flex Consumption SKU only.', is_preview=True)
         c.argument('configure_networking_later', options_list=['--configure-networking-later', '--cnl'], arg_type=get_three_state_flag(),
                    help='Use this option if you want to configure networking later for an app using network-restricted storage.')
+        c.argument('auto_generated_domain_name_label_scope', options_list=['--domain-name-scope'], help="Specify the scope of uniqueness for the default hostname during resource creation. ", choices=['TenantReuse', 'SubscriptionReuse', 'ResourceGroupReuse', 'NoReuse'])
 
     with self.argument_context('functionapp deployment config set') as c:
         c.argument('deployment_storage_name', options_list=['--deployment-storage-name', '--dsn'], help="The deployment storage account name.", is_preview=True)

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

@@ -5159,7 +5159,8 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
                        always_ready_instances=None, maximum_instance_count=None, instance_memory=None,
                        flexconsumption_location=None, deployment_storage_name=None,
                        deployment_storage_container_name=None, deployment_storage_auth_type=None,
-                       deployment_storage_auth_value=None, zone_redundant=False, configure_networking_later=None):
+                       deployment_storage_auth_value=None, zone_redundant=False, configure_networking_later=None,
+                       auto_generated_domain_name_label_scope=None):
     # pylint: disable=too-many-statements, too-many-branches
 
     if functions_version is None and flexconsumption_location is None:
@@ -5251,7 +5252,8 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
 
     disable_app_insights = disable_app_insights == "true"
 
-    site_config = SiteConfig(app_settings=[])
+    settings = []
+    site_config = SiteConfig(app_settings=settings)
     client = web_client_factory(cmd.cli_ctx)
 
     if vnet or subnet:
@@ -5290,7 +5292,8 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
 
     functionapp_def = Site(location=None, site_config=site_config, tags=tags,
                            virtual_network_subnet_id=subnet_resource_id, https_only=https_only,
-                           vnet_route_all_enabled=vnet_route_all_enabled)
+                           vnet_route_all_enabled=vnet_route_all_enabled,
+                           auto_generated_domain_name_label_scope=auto_generated_domain_name_label_scope)
 
     plan_info = None
     if runtime is not None:

src/azure-cli/azure/cli/command_modules/appservice/tests/latest/recordings/test_functionapp_unique_domain_name.yaml

@@ -6,6 +6,7 @@
 import unittest
 from unittest import mock
 import os
+import re
 import time
 import tempfile
 import requests
@@ -1498,6 +1499,24 @@ def test_functionapp_windows_runtime_version(self, resource_group, storage_accou
         self.cmd(
             'functionapp delete -g {} -n {}'.format(resource_group, functionapp_name))
 
+    @ResourceGroupPreparer(location=WINDOWS_ASP_LOCATION_FUNCTIONAPP)
+    @StorageAccountPreparer()
+    def test_functionapp_unique_domain_name(self, resource_group, storage_account):
+        functionapp_name = self.create_random_name(
+            'functionappudom', 24)
+
+        result = self.cmd('functionapp create -g {} -n {} -c {} -s {} --os-type Windows --functions-version 4 --runtime node --runtime-version 22 --domain-name-scope SubscriptionReuse'
+                 .format(resource_group, functionapp_name, WINDOWS_ASP_LOCATION_FUNCTIONAPP, storage_account)).get_output_in_json()
+        
+        default_hostname = result.get('defaultHostName')
+        pattern = r'^([a-zA-Z0-9\-]+)-([a-z0-9]{16})\.([a-z]+-\d{2})\.azurewebsites\.net$'
+        match = re.match(pattern, default_hostname)
+        self.assertIsNotNone(match, "defaultHostName '{}' does not match expected pattern".format(default_hostname))
+        app_name, hash_part, region = match.groups()
+        self.assertTrue(len(hash_part) == 16 and hash_part.islower(), "Hash is not 16 chars or not lowercase.")
+        self.assertIn('-', region, "Region part does not have '-' separator.")
+        self.assertEqual(app_name, functionapp_name, "App name and defaultHostName app name do not match.")
+
 
     @ResourceGroupPreparer(location=WINDOWS_ASP_LOCATION_FUNCTIONAPP)
     @StorageAccountPreparer()

src/azure-cli/azure/cli/command_modules/appservice/tests/latest/test_functionapp_commands.py

@@ -78,7 +78,7 @@ azure-mgmt-sqlvirtualmachine==1.0.0b5
 azure-mgmt-storage==22.1.0
 azure-mgmt-synapse==2.1.0b5
 azure-mgmt-trafficmanager==1.0.0
-azure-mgmt-web==7.3.1
+azure-mgmt-web==8.0.0
 azure-monitor-query==1.2.0
 azure-multiapi-storage==1.4.0
 azure-nspkg==3.0.2

src/azure-cli/requirements.py3.Darwin.txt

@@ -78,7 +78,7 @@ azure-mgmt-sqlvirtualmachine==1.0.0b5
 azure-mgmt-storage==22.1.0
 azure-mgmt-synapse==2.1.0b5
 azure-mgmt-trafficmanager==1.0.0
-azure-mgmt-web==7.3.1
+azure-mgmt-web==8.0.0
 azure-monitor-query==1.2.0
 azure-multiapi-storage==1.4.0
 azure-nspkg==3.0.2

src/azure-cli/requirements.py3.Linux.txt

@@ -78,7 +78,7 @@ azure-mgmt-sqlvirtualmachine==1.0.0b5
 azure-mgmt-storage==22.1.0
 azure-mgmt-synapse==2.1.0b5
 azure-mgmt-trafficmanager==1.0.0
-azure-mgmt-web==7.3.1
+azure-mgmt-web==8.0.0
 azure-monitor-query==1.2.0
 azure-multiapi-storage==1.4.0
 azure-nspkg==3.0.2

src/azure-cli/requirements.py3.windows.txt

@@ -121,7 +121,7 @@
     'azure-mgmt-storage==22.1.0',
     'azure-mgmt-synapse==2.1.0b5',
     'azure-mgmt-trafficmanager~=1.0.0',
-    'azure-mgmt-web==7.3.1',
+    'azure-mgmt-web==8.0.0',
     'azure-monitor-query==1.2.0',
     'azure-multiapi-storage==1.4.0',
     'azure-storage-common~=1.4',