[AppService] az functionapp: Use the sku from the function app to validate if on a flex plan

src/azure-cli/azure/cli/command_modules/appservice/tests/latest/test_functionapp_commands.py

@@ -737,8 +737,8 @@ def test_functionapp_list_flexconsumption_locations(self):
         self.assertTrue(len(locations) == 13)
 
     def test_functionapp_list_flexconsumption_runtimes(self):
-        runtimes = self.cmd('functionapp list-flexconsumption-runtimes').get_output_in_json()
-        self.assertTrue(len(runtimes) == 8)
+        runtimes = self.cmd('functionapp list-flexconsumption-runtimes -l eastasia --runtime python').get_output_in_json()
+        self.assertTrue(len(runtimes) == 2)
 
     @ResourceGroupPreparer(location=FLEX_ASP_LOCATION_FUNCTIONAPP)
     @StorageAccountPreparer()
@@ -1390,7 +1390,7 @@ def test_functionapp_windows_runtime_functions_version(self, resource_group, sto
         self.cmd('functionapp config appsettings list -g {} -n {}'.format(resource_group, functionapp_name), checks=[
                  JMESPathCheck(
                      "[?name=='FUNCTIONS_EXTENSION_VERSION'].value|[0]", '~4'),
-                 JMESPathCheck("[?name=='WEBSITE_NODE_DEFAULT_VERSION'].value|[0]", '~18')])
+                 JMESPathCheck("[?name=='WEBSITE_NODE_DEFAULT_VERSION'].value|[0]", '~20')])
 
     @ResourceGroupPreparer(location=WINDOWS_ASP_LOCATION_FUNCTIONAPP)
     @StorageAccountPreparer()
@@ -1741,7 +1741,7 @@ def test_functionapp_on_linux_functions_version(self, resource_group, storage_ac
                  ])
 
         self.cmd('functionapp config show -g {} -n {}'.format(resource_group, functionapp), checks=[
-            JMESPathCheck('linuxFxVersion', 'Node|18')
+            JMESPathCheck('linuxFxVersion', 'Node|20')
         ])
         self.cmd('functionapp config appsettings list -g {} -n {}'.format(resource_group, functionapp)).assert_with_checks([
             JMESPathCheck(
@@ -1778,7 +1778,7 @@ def test_functionapp_on_linux_functions_version_consumption(self, resource_group
                  ])
 
         self.cmd('functionapp config show -g {} -n {}'.format(resource_group, functionapp), checks=[
-            JMESPathCheck('linuxFxVersion', 'Node|18')
+            JMESPathCheck('linuxFxVersion', 'Node|20')
         ])
         self.cmd('functionapp config appsettings list -g {} -n {}'.format(resource_group, functionapp)).assert_with_checks([
             JMESPathCheck(

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

@@ -201,13 +201,11 @@ def is_centauri_functionapp(cmd, resource_group, name):
 
 
 def is_flex_functionapp(cli_ctx, resource_group, name):
-    client = web_client_factory(cli_ctx)
-    app = client.web_apps.get(resource_group, name)
-    if app.server_farm_id is None:
+    app = get_raw_functionapp(cli_ctx, resource_group, name)
+    if app["properties"]["serverFarmId"] is None:
         return False
-    parse_plan_id = parse_resource_id(app.server_farm_id)
-    plan_info = client.app_service_plans.get(parse_plan_id['resource_group'], parse_plan_id['name'])
-    return plan_info.sku.tier.lower() == 'flexconsumption'
+    sku = app["properties"]["sku"]
+    return sku and sku.lower() == 'flexconsumption'
 
 
 def _list_app(cli_ctx, resource_group_name=None):
@@ -228,12 +226,12 @@ def _rename_server_farm_props(webapp):
     return webapp
 
 
-def get_raw_functionapp(cmd, resource_group_name, name):
+def get_raw_functionapp(cli_ctx, resource_group_name, name):
     site_url_base = '/subscriptions/{}/resourceGroups/{}/providers/Microsoft.Web/sites/{}?api-version={}'
-    subscription_id = get_subscription_id(cmd.cli_ctx)
+    subscription_id = get_subscription_id(cli_ctx)
     site_url = site_url_base.format(subscription_id, resource_group_name, name, '2023-12-01')
-    request_url = cmd.cli_ctx.cloud.endpoints.resource_manager + site_url
-    response = send_raw_request(cmd.cli_ctx, "GET", request_url)
+    request_url = cli_ctx.cloud.endpoints.resource_manager + site_url
+    response = send_raw_request(cli_ctx, "GET", request_url)
     return response.json()