Create file share when creating app with network restricted storage

Azure · Jan 7, 2025 · 17efde4 · 17efde4
1 parent 1f976d5
commit 17efde4
Show file tree

Hide file tree

Showing 20 changed files with 6,254 additions and 1,312 deletions.
diff --git a/src/azure-cli/azure/cli/command_modules/appservice/custom.py b/src/azure-cli/azure/cli/command_modules/appservice/custom.py
@@ -5016,6 +5016,7 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
                                   'flag instead.'.format(storage_account))
         if vnet and configure_networking_later:
             raise ValidationError('The --vnet and --configure-networking-later flags are mutually exclusive.')
+        functionapp_def.vnet_content_share_enabled = True
 
     con_string = _validate_and_get_connection_string(cmd.cli_ctx, resource_group_name, storage_account)
 
@@ -5155,7 +5156,9 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
     if (plan_info is not None and is_plan_elastic_premium(cmd, plan_info)) or consumption_plan_location is not None:
         site_config.app_settings.append(NameValuePair(name='WEBSITE_CONTENTAZUREFILECONNECTIONSTRING',
                                                       value=con_string))
-        site_config.app_settings.append(NameValuePair(name='WEBSITE_CONTENTSHARE', value=_get_content_share_name(name)))
+        content_share_name = _get_content_share_name(name)
+        site_config.app_settings.append(NameValuePair(name='WEBSITE_CONTENTSHARE', value=content_share_name))
+        create_file_share(cmd.cli_ctx, resource_group_name, storage_account, content_share_name)
 
     create_app_insights = False
 
@@ -5384,6 +5387,16 @@ def _validate_cpu_momory_functionapp(cpu=None, memory=None):
     return
 
 
+def create_file_share(cli_ctx, resource_group_name, storage_account, share_name):
+
+    storage_client = get_mgmt_service_client(cli_ctx, StorageManagementClient)
+    from azure.mgmt.storage.models import FileShare
+
+    file_share = FileShare()
+
+    return storage_client.file_shares.create(resource_group_name, storage_account, share_name, file_share=file_share)
+
+
 def _get_extension_version_functionapp(functions_version):
     if functions_version is not None:
         return '~{}'.format(functions_version)

diff --git a/...sabled_public_network_access_storage.yaml → ...sabled_public_network_access_storage.yaml b/...sabled_public_network_access_storage.yaml → ...sabled_public_network_access_storage.yaml
diff --git a/...ommand_modules/appservice/tests/latest/recordings/test_functionapp_consumption_linux.yaml b/...ommand_modules/appservice/tests/latest/recordings/test_functionapp_consumption_linux.yaml
diff --git a/...ppservice/tests/latest/recordings/test_functionapp_consumption_linux_dotnet_isolated.yaml b/...ppservice/tests/latest/recordings/test_functionapp_consumption_linux_dotnet_isolated.yaml
diff --git a/...d_modules/appservice/tests/latest/recordings/test_functionapp_consumption_linux_java.yaml b/...d_modules/appservice/tests/latest/recordings/test_functionapp_consumption_linux_java.yaml
diff --git a/...ricted_public_network_access_storage.yaml → ...ricted_public_network_access_storage.yaml b/...ricted_public_network_access_storage.yaml → ...ricted_public_network_access_storage.yaml
diff --git a/...ionapp_elastic_premium_restricted_public_network_access_storage_configure_vnet_later.yaml b/...ionapp_elastic_premium_restricted_public_network_access_storage_configure_vnet_later.yaml
diff --git a/...ess_storage_mutually_exclusive_flags.yaml → ...ess_storage_mutually_exclusive_flags.yaml b/...ess_storage_mutually_exclusive_flags.yaml → ...ess_storage_mutually_exclusive_flags.yaml
diff --git a/...ublic_network_access_storage_no_vnet.yaml → ...ublic_network_access_storage_no_vnet.yaml b/...ublic_network_access_storage_no_vnet.yaml → ...ublic_network_access_storage_no_vnet.yaml
diff --git a/...dings/test_functionapp_elastic_premium_restricted_public_network_access_storage_vnet.yaml b/...dings/test_functionapp_elastic_premium_restricted_public_network_access_storage_vnet.yaml
diff --git a/...s/appservice/tests/latest/recordings/test_functionapp_on_linux_consumption_python_39.yaml b/...s/appservice/tests/latest/recordings/test_functionapp_on_linux_consumption_python_39.yaml
diff --git a/...vice/tests/latest/recordings/test_functionapp_on_linux_functions_version_consumption.yaml b/...vice/tests/latest/recordings/test_functionapp_on_linux_functions_version_consumption.yaml
diff --git a/...les/appservice/tests/latest/recordings/test_functionapp_on_linux_version_consumption.yaml b/...les/appservice/tests/latest/recordings/test_functionapp_on_linux_version_consumption.yaml
diff --git a/.../command_modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime.yaml b/.../command_modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime.yaml
diff --git a/...s/appservice/tests/latest/recordings/test_functionapp_windows_runtime_custom_handler.yaml b/...s/appservice/tests/latest/recordings/test_functionapp_windows_runtime_custom_handler.yaml
diff --git a/...ppservice/tests/latest/recordings/test_functionapp_windows_runtime_functions_version.yaml b/...ppservice/tests/latest/recordings/test_functionapp_windows_runtime_functions_version.yaml
diff --git a/...and_modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime_java.yaml b/...and_modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime_java.yaml
diff --git a/..._modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime_version.yaml b/..._modules/appservice/tests/latest/recordings/test_functionapp_windows_runtime_version.yaml
diff --git a/...service/tests/latest/recordings/test_functionapp_without_default_distributed_tracing.yaml b/...service/tests/latest/recordings/test_functionapp_without_default_distributed_tracing.yaml
diff --git a/src/azure-cli/azure/cli/command_modules/appservice/tests/latest/test_functionapp_commands.py b/src/azure-cli/azure/cli/command_modules/appservice/tests/latest/test_functionapp_commands.py
@@ -2769,7 +2769,7 @@ def test_functionapp_vnet_integration_consumption_plan(self, resource_group, sto
         ])
 
     @ResourceGroupPreparer(location=WINDOWS_ASP_LOCATION_FUNCTIONAPP)
-    def test_consumption_functionapp_disabled_public_network_access_storage(self, resource_group):
+    def test_functionapp_consumption_disabled_public_network_access_storage(self, resource_group):
         functionapp_name = self.create_random_name('functionapp', 24)
         storage_account = self.create_random_name('funcstorage1', 24)
 
@@ -2780,7 +2780,7 @@ def test_consumption_functionapp_disabled_public_network_access_storage(self, re
 
 
     @ResourceGroupPreparer(location=WINDOWS_ASP_LOCATION_FUNCTIONAPP)
-    def test_consumption_functionapp_restricted_public_network_access_storage(self, resource_group):
+    def test_functionapp_consumption_restricted_public_network_access_storage(self, resource_group):
         functionapp_name = self.create_random_name('functionapp', 24)
         storage_account = self.create_random_name('funcstorage', 24)
 
@@ -2791,7 +2791,7 @@ def test_consumption_functionapp_restricted_public_network_access_storage(self,
 
 
     @ResourceGroupPreparer(location=WINDOWS_ASP_LOCATION_FUNCTIONAPP)
-    def test_elastic_premium_functionapp_restricted_public_network_access_storage_no_vnet(self, resource_group):
+    def test_functionapp_elastic_premium_restricted_public_network_access_storage_no_vnet(self, resource_group):
         functionapp_name = self.create_random_name('functionapp', 24)
         storage_account = self.create_random_name('funcstorage', 24)
         ep_plan_name = self.create_random_name('epplan', 24)
@@ -2805,7 +2805,7 @@ def test_elastic_premium_functionapp_restricted_public_network_access_storage_no
 
 
     @ResourceGroupPreparer(location=WINDOWS_ASP_LOCATION_FUNCTIONAPP)
-    def test_elastic_premium_functionapp_restricted_public_network_access_storage_mutually_exclusive_flags(self, resource_group):
+    def test_functionapp_elastic_premium_restricted_public_network_access_storage_mutually_exclusive_flags(self, resource_group):
         functionapp_name = self.create_random_name('functionapp', 24)
         storage_account = self.create_random_name('funcstorage', 24)
         ep_plan_name = self.create_random_name('epplan', 24)
@@ -2822,6 +2822,41 @@ def test_elastic_premium_functionapp_restricted_public_network_access_storage_mu
         with self.assertRaises(ValidationError):
             self.cmd('functionapp create -g {} -n {} -s {} -p {} --functions-version 4 --vnet {} --subnet {} --configure-networking-later'.format(resource_group, functionapp_name, storage_account, ep_plan_name, vnet_name, subnet_name))
 
+    @ResourceGroupPreparer(location=WINDOWS_ASP_LOCATION_FUNCTIONAPP)
+    def test_functionapp_elastic_premium_restricted_public_network_access_storage_vnet(self, resource_group):
+        functionapp_name = self.create_random_name('functionapp', 24)
+        storage_account = self.create_random_name('funcstorage', 24)
+        ep_plan_name = self.create_random_name('epplan', 24)
+        subnet_name = self.create_random_name('swiftsubnet', 24)
+        vnet_name = self.create_random_name('swiftname', 24)
+
+        self.cmd('functionapp plan create -g {} -n {} --sku EP1'.format(resource_group, ep_plan_name))
+
+        self.cmd('storage account create --name {} -g {} -l {} --sku Standard_LRS --default-action Deny --public-network-access Enabled'.format(storage_account, resource_group, WINDOWS_ASP_LOCATION_FUNCTIONAPP))
+
+        subnet_id = self.cmd('network vnet create -g {} -n {} --address-prefix 10.0.0.0/16 --subnet-name {} --subnet-prefix 10.0.0.0/24'.format(
+            resource_group, vnet_name, subnet_name)).get_output_in_json()['newVNet']['subnets'][0]['id']
+
+        self.cmd('functionapp create -g {} -n {} -s {} -p {} --functions-version 4 --vnet {} --subnet {}'.format(resource_group, functionapp_name, storage_account, ep_plan_name, vnet_name, subnet_name)).assert_with_checks([
+            JMESPathCheck('vnetContentShareEnabled', True),
+            JMESPathCheck('vnetRouteAllEnabled', True),
+            JMESPathCheck('virtualNetworkSubnetId', subnet_id)
+        ])
+
+    @ResourceGroupPreparer(location=WINDOWS_ASP_LOCATION_FUNCTIONAPP)
+    def test_functionapp_elastic_premium_restricted_public_network_access_storage_configure_vnet_later(self, resource_group):
+        functionapp_name = self.create_random_name('functionapp', 24)
+        storage_account = self.create_random_name('funcstorage', 24)
+        ep_plan_name = self.create_random_name('epplan', 24)
+
+        self.cmd('functionapp plan create -g {} -n {} --sku EP1'.format(resource_group, ep_plan_name))
+
+        self.cmd('storage account create --name {} -g {} -l {} --sku Standard_LRS --default-action Deny --public-network-access Enabled'.format(storage_account, resource_group, WINDOWS_ASP_LOCATION_FUNCTIONAPP))
+
+        self.cmd('functionapp create -g {} -n {} -s {} -p {} --functions-version 4 --cnl'.format(resource_group, functionapp_name, storage_account, ep_plan_name)).assert_with_checks([
+            JMESPathCheck('vnetContentShareEnabled', True),
+        ])
+
 
     @ResourceGroupPreparer(location=WINDOWS_ASP_LOCATION_FUNCTIONAPP)
     @StorageAccountPreparer()