[App Service] az functionapp/logicapp create: Add new --https-only parameter

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

@@ -235,7 +235,7 @@ def default_api_version(self):
             'subscription_diagnostic_settings': '2017-05-01-preview'
         }),
         ResourceType.MGMT_MSI: '2021-09-30-preview',
-        ResourceType.MGMT_APPSERVICE: '2021-03-01',
+        ResourceType.MGMT_APPSERVICE: '2022-03-01',
         ResourceType.MGMT_IOTHUB: '2021-07-02',
         ResourceType.MGMT_IOTDPS: '2021-10-15',
         ResourceType.MGMT_IOTCENTRAL: '2021-11-01-preview',

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

@@ -153,8 +153,6 @@ def load_arguments(self, _):
                    local_context_attribute=LocalContextAttribute(name='plan_name', actions=[LocalContextAction.GET]))
         c.argument('vnet', help="Name or resource ID of the regional virtual network. If there are multiple vnets of the same name across different resource groups, use vnet resource id to specify which vnet to use. If vnet name is used, by default, the vnet in the same resource group as the webapp will be used. Must be used with --subnet argument.")
         c.argument('subnet', help="Name or resource ID of the pre-existing subnet to have the webapp join. The --vnet is argument also needed if specifying subnet by name.")
-        c.argument('https_only', help="Redirect all traffic made to an app using HTTP to HTTPS.",
-                   arg_type=get_three_state_flag(return_label=True))
         c.ignore('language')
         c.ignore('using_webapp_up')
 
@@ -234,6 +232,8 @@ def load_arguments(self, _):
             c.argument('deployment_source_branch', options_list=['--deployment-source-branch', '-b'],
                        help='the branch to deploy')
             c.argument('tags', arg_type=tags_type)
+            c.argument('https_only', help="Redirect all traffic made to an app using HTTP to HTTPS.",
+                       arg_type=get_three_state_flag())
 
     for scope in ['webapp', 'functionapp']:
         with self.argument_context(scope) as c:

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

@@ -336,7 +336,7 @@ def validate_vnet_integration(cmd, namespace):
                                                      resource_group_name=namespace.resource_group_name)
 
         sku_name = plan_info.sku.name
-        disallowed_skus = {'FREE', 'SHARED', 'BASIC', 'ElasticPremium', 'PremiumContainer', 'Isolated', 'IsolatedV2'}
+        disallowed_skus = {'FREE', 'SHARED', 'PremiumContainer', 'Isolated', 'IsolatedV2'}
         if get_sku_tier(sku_name) in disallowed_skus:
             raise ArgumentUsageError("App Service Plan has invalid sku for vnet integration: {}."
                                      "Plan sku cannot be one of: {}. "

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

@@ -3415,7 +3415,7 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
                        deployment_source_branch='master', deployment_local_git=None,
                        docker_registry_server_password=None, docker_registry_server_user=None,
                        deployment_container_image_name=None, tags=None, assign_identities=None,
-                       role='Contributor', scope=None, vnet=None, subnet=None):
+                       role='Contributor', scope=None, vnet=None, subnet=None, https_only=False):
     # pylint: disable=too-many-statements, too-many-branches
     if functions_version is None:
         logger.warning("No functions version specified so defaulting to 3. In the future, specifying a version will "
@@ -3462,7 +3462,7 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
         subnet_resource_id = None
 
     functionapp_def = Site(location=None, site_config=site_config, tags=tags,
-                           virtual_network_subnet_id=subnet_resource_id)
+                           virtual_network_subnet_id=subnet_resource_id, https_only=https_only)
 
     plan_info = None
     if runtime is not None:

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

@@ -43,7 +43,7 @@ def create_logicapp(cmd, resource_group_name, name, storage_account, plan=None,
                     app_insights=None, app_insights_key=None, disable_app_insights=None,
                     deployment_source_url=None, deployment_source_branch='master', deployment_local_git=None,
                     docker_registry_server_password=None, docker_registry_server_user=None,
-                    deployment_container_image_name=None, tags=None):
+                    deployment_container_image_name=None, tags=None, https_only=False):
     # pylint: disable=too-many-statements, too-many-branches, too-many-locals
     functions_version = DEFAULT_LOGICAPP_FUNCTION_VERSION
     runtime = None
@@ -65,7 +65,7 @@ def create_logicapp(cmd, resource_group_name, name, storage_account, plan=None,
         deployment_container_image_name)
 
     site_config = SiteConfig(app_settings=[])
-    logicapp_def = Site(location=None, site_config=site_config, tags=tags)
+    logicapp_def = Site(location=None, site_config=site_config, tags=tags, https_only=https_only)
     client = web_client_factory(cmd.cli_ctx)
     plan_info = None
     if runtime is not None: