{AppService} az functionapp create: Updating DAPR config to match experience in Portal (#28291)

Author: kamperiadis

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

@@ -3918,12 +3918,12 @@ def update_functionapp_polling(cmd, resource_group_name, name, functionapp):
     updated_functionapp = json.dumps(
         {
             "properties": {
-                "daprConfig": {
+                "daprConfig": {"enabled": False} if functionapp.dapr_config is None else {
                     "enabled": functionapp.dapr_config.enabled,
                     "appId": functionapp.dapr_config.app_id,
                     "appPort": functionapp.dapr_config.app_port,
-                    "httpReadBufferSize": functionapp.dapr_config.http_read_buffer_size,
-                    "httpMaxRequestSize": functionapp.dapr_config.http_max_request_size,
+                    "httpReadBufferSize": functionapp.dapr_config.http_read_buffer_size or 4,
+                    "httpMaxRequestSize": functionapp.dapr_config.http_max_request_size or 4,
                     "logLevel": functionapp.dapr_config.log_level,
                     "enableApiLogging": functionapp.dapr_config.enable_api_logging
                 },
@@ -3956,19 +3956,37 @@ def update_dapr_and_workload_config(cmd, resource_group_name, name, enabled=None
                                     enable_api_logging=None, workload_profile_name=None, cpu=None, memory=None):
     site = _generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'get')
     DaprConfig = cmd.get_models('DaprConfig')
-    if site.dapr_config is None:
-        site.dapr_config = DaprConfig()
 
-    import inspect
-    frame = inspect.currentframe()
-    bool_flags = ['enabled', 'enable_api_logging']
-    int_flags = ['app_port', 'http_max_request_size', 'http_read_buffer_size']
-    args, _, _, values = inspect.getargvalues(frame)  # pylint: disable=deprecated-method
-    for arg in args[3:10]:
-        if arg in int_flags and values[arg] is not None:
-            values[arg] = validate_and_convert_to_int(arg, values[arg])
-        if values.get(arg, None):
-            setattr(site.dapr_config, arg, values[arg] if arg not in bool_flags else values[arg] == 'true')
+    if enabled is None:
+        if site.dapr_config and site.dapr_config.enabled is False:
+            site.dapr_config = None
+    elif enabled == "false":
+        site.dapr_config = None
+    elif enabled == "true":
+        if site.dapr_config is None:
+            site.dapr_config = DaprConfig()
+            site.dapr_config.enabled = True
+        elif site.dapr_config and site.dapr_config.enabled is False:
+            site.dapr_config.enabled = True
+
+    if any([app_id, app_port, http_max_request_size, http_read_buffer_size, log_level, enable_api_logging]) \
+            and site.dapr_config is None:
+        raise ArgumentUsageError("usage error: parameters --dapr-app-id, "
+                                 "--dapr-app-port, --dapr-http-max-request-size, "
+                                 "--dapr-http-read-buffer-size, --dapr-log-level and "
+                                 "--dapr-enable-api-logging must be used with parameter --enable-dapr true.")
+
+    if site.dapr_config is not None:
+        import inspect
+        frame = inspect.currentframe()
+        bool_flags = ['enabled', 'enable_api_logging']
+        int_flags = ['app_port', 'http_max_request_size', 'http_read_buffer_size']
+        args, _, _, values = inspect.getargvalues(frame)  # pylint: disable=deprecated-method
+        for arg in args[3:10]:
+            if arg in int_flags and values[arg] is not None:
+                values[arg] = validate_and_convert_to_int(arg, values[arg])
+            if values.get(arg, None):
+                setattr(site.dapr_config, arg, values[arg] if arg not in bool_flags else values[arg] == 'true')
 
     if cpu is not None and memory is not None:
         setattr(site.resource_config, 'cpu', cpu)
@@ -3996,6 +4014,7 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
     if functions_version is None:
         logger.warning("No functions version specified so defaulting to 4.")
         functions_version = '4'
+    enable_dapr = (enable_dapr == "true")
     if deployment_source_url and deployment_local_git:
         raise MutuallyExclusiveArgumentError('usage error: --deployment-source-url <url> | --deployment-local-git')
     if any([cpu, memory, workload_profile_name]) and environment is None:
@@ -4017,6 +4036,13 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
                                            "dapr-enable-api-logging must be used with parameter --environment,"
                                            "please provide the name of the container app environment using "
                                            "--environment.")
+    if any([dapr_app_id, dapr_app_port, dapr_http_max_request_size, dapr_http_read_buffer_size,
+            dapr_log_level, dapr_enable_api_logging]) and not enable_dapr:
+        raise ArgumentUsageError("usage error: parameters --dapr-app-id, "
+                                 "--dapr-app-port, --dapr-http-max-request-size, "
+                                 "--dapr-http-read-buffer-size, --dapr-log-level and "
+                                 "dapr-enable-api-logging must be used with parameter --enable-dapr true.")
+
     from azure.mgmt.web.models import Site
     SiteConfig, NameValuePair, DaprConfig, ResourceConfig = cmd.get_models('SiteConfig', 'NameValuePair',
                                                                            'DaprConfig', 'ResourceConfig')
@@ -4025,8 +4051,6 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
     site_config = SiteConfig(app_settings=[])
     client = web_client_factory(cmd.cli_ctx)
 
-    dapr_config = DaprConfig()
-
     if vnet or subnet:
         if plan:
             if is_valid_resource_id(plan):
@@ -4056,7 +4080,7 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
         subnet_resource_id = None
         vnet_route_all_enabled = None
 
-    functionapp_def = Site(location=None, site_config=site_config, dapr_config=dapr_config, tags=tags,
+    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)
 
@@ -4225,13 +4249,16 @@ def create_functionapp(cmd, resource_group_name, name, storage_account, plan=Non
         if enable_dapr:
             logger.warning("Please note while using Dapr Extension for Azure Functions, app port is "
                            "mandatory when using Dapr triggers and should be empty when using only Dapr bindings.")
+            dapr_enable_api_logging = (dapr_enable_api_logging == "true")
+            dapr_config = DaprConfig()
             dapr_config.enabled = True
             dapr_config.app_id = dapr_app_id
             dapr_config.app_port = dapr_app_port
-            dapr_config.http_max_request_size = dapr_http_max_request_size
-            dapr_config.http_read_buffer_size = dapr_http_read_buffer_size
+            dapr_config.http_max_request_size = dapr_http_max_request_size or 4
+            dapr_config.http_read_buffer_size = dapr_http_read_buffer_size or 4
             dapr_config.log_level = dapr_log_level
             dapr_config.enable_api_logging = dapr_enable_api_logging
+            functionapp_def.dapr_config = dapr_config
 
         managed_environment = get_managed_environment(cmd, resource_group_name, environment)
         location = managed_environment.location