PR fixes

Author: harimehta000

src/azure-cli/HISTORY.rst

@@ -38,7 +38,7 @@ Release History
 * Fix #33180: `az functionapp plan create`: Simplify reserved parameter assignment in AppServicePlan (#33202)
 * `az webapp sitecontainers convert`: Add support for converting Docker Compose multi-container apps to Sitecontainers mode (#33131)
 * `az webapp up/deploy`: Add `--enriched-errors` parameter to see detailed deployment failure log (#32940)
-* `az webapp status`: Add new command to show per-instance Site Runtime Status (#160)
+* `az webapp status`: Add new command to show per-instance Site Runtime Status (#33632)
 * `az webapp create`: Add error message that clearly lists all valid options and specifies how to discover available runtimes (#33252)
 * `az appservice plan create`: Make `P0V3` as default SKU when `--sku` is omitted for linux webapp (#33237)
 * `az appservice plan create`: Add `PREMIUM0V3` tier for elastic scale (#33237)

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

@@ -387,7 +387,7 @@ def create_webapp(cmd, resource_group_name, name, plan, runtime=None, startup_fi
                     multicontainer_config_type, sitecontainers_app,
                     deployment_source_url, deployment_local_git]):
             logger.warning("Webapp '%s' created. Deploy your code with: az webapp deploy", name)
-        _log_webapp_status_tip(name, resource_group_name)
+        _log_webapp_status_tip(name, resource_group_name, is_linux)
     return webapp
 
 
@@ -2429,7 +2429,11 @@ def show_app(cmd, resource_group_name, name, slot=None):
     return app
 
 
-def _log_webapp_status_tip(name, resource_group_name):
+def _log_webapp_status_tip(name, resource_group_name, is_linux):
+    # Per-instance runtime status (siteStatus) is a Linux App Service feature,
+    # so only surface the tip for Linux webapps.
+    if not is_linux:
+        return
     logger.warning("Tip: run 'az webapp status --name %s --resource-group %s' "
                    "to see per-instance runtime status.",
                    name, resource_group_name)
@@ -3623,15 +3627,11 @@ def stop_webapp(cmd, resource_group_name, name, slot=None):
 
 
 def start_webapp(cmd, resource_group_name, name, slot=None):
-    result = _generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'start', slot)
-    _log_webapp_status_tip(name, resource_group_name)
-    return result
+    return _generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'start', slot)
 
 
 def restart_webapp(cmd, resource_group_name, name, slot=None):
-    result = _generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'restart', slot)
-    _log_webapp_status_tip(name, resource_group_name)
-    return result
+    return _generic_site_operation(cmd.cli_ctx, resource_group_name, name, 'restart', slot)
 
 
 def get_site_configs(cmd, resource_group_name, name, slot=None):
@@ -9628,14 +9628,14 @@ def _poll_deployment_runtime_status(cmd, resource_group_name, webapp_name, slot,
         logger.warning("Status: %s Time: %s(s)", status, time_elapsed)
         if deployment_status == "RuntimeStarting":
             if not status_tip_logged:
-                _log_webapp_status_tip(webapp_name, resource_group_name)
+                _log_webapp_status_tip(webapp_name, resource_group_name, True)
                 status_tip_logged = True
             logger.info("InprogressInstances: %s, SuccessfulInstances: %s",
                         deployment_properties.get('numberOfInstancesInProgress'),
                         deployment_properties.get('numberOfInstancesSuccessful'))
         if deployment_status == "RuntimeSuccessful":
             if not status_tip_logged:
-                _log_webapp_status_tip(webapp_name, resource_group_name)
+                _log_webapp_status_tip(webapp_name, resource_group_name, True)
             break
         if deployment_status == "RuntimeFailed":
             error_text = ""
@@ -10468,7 +10468,7 @@ def webapp_up(cmd, name=None, resource_group_name=None, plan=None, location=None
         logger.warning("You can launch the app at %s", _url)
         create_json.update({'URL': _url})
 
-    _log_webapp_status_tip(name, rg_name)
+    _log_webapp_status_tip(name, rg_name, _is_linux)
 
     if logs:
         _configure_default_logging(cmd, rg_name, name)
@@ -11076,7 +11076,7 @@ def _make_onedeploy_request(params):
                 response_body = response.json().get("properties", {})
         logger.warning("Deployment has completed successfully")
         if not (poll_async_deployment_for_debugging and params.track_status):
-            _log_webapp_status_tip(params.webapp_name, params.resource_group_name)
+            _log_webapp_status_tip(params.webapp_name, params.resource_group_name, params.is_linux_webapp)
         logger.warning("You can visit your app at: %s", _get_url(params.cmd, params.resource_group_name,
                                                                  params.webapp_name, params.slot))
         return response_body