Create file share only when storage acct network restricted, and run …

…tests in live mode
Azure · Jan 22, 2025 · 9156908 · 9156908
1 parent f3384cf
commit 9156908
Show file tree

Hide file tree

Showing 19 changed files with 2,885 additions and 7,050 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
@@ -5158,7 +5158,8 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
                                                       value=con_string))
         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)
+        if is_storage_account_network_restricted(cmd.cli_ctx, resource_group_name, storage_account):
+            create_file_share(cmd.cli_ctx, resource_group_name, storage_account, content_share_name)
 
     create_app_insights = False
 

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/.../appservice/tests/latest/recordings/test_functionapp_create_default_rg_and_workspace.yaml b/.../appservice/tests/latest/recordings/test_functionapp_create_default_rg_and_workspace.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/...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/...mand_modules/appservice/tests/latest/recordings/test_functionapp_existing_default_rg.yaml b/...mand_modules/appservice/tests/latest/recordings/test_functionapp_existing_default_rg.yaml
diff --git a/...mmand_modules/appservice/tests/latest/recordings/test_functionapp_existing_workspace.yaml b/...mmand_modules/appservice/tests/latest/recordings/test_functionapp_existing_workspace.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
@@ -2822,6 +2822,7 @@ def test_functionapp_elastic_premium_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))
 
+    @live_only()
     @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)
@@ -2843,6 +2844,7 @@ def test_functionapp_elastic_premium_restricted_public_network_access_storage_vn
             JMESPathCheck('virtualNetworkSubnetId', subnet_id)
         ])
 
+    @live_only()
     @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)