[Consumption] Remove legacy budget wrappers and use aaz-generated commands directly

The previous regeneration of the consumption module against API version
2024-08-01 added new aaz-generated commands but left hand-written
budget wrappers in place that registered conflicting argument shapes
(--budget-name with no --scope) and called aaz Create/Show/Delete
without the now-required scope. Drop those wrappers, _params.py budget
context, and the now-unused _validators.py / _transformers.py so that
the aaz-generated 'consumption budget' commands take effect with their
--name / --scope arguments.

Also gut test_consumption_commands.py: every existing recording was
captured at api-version 2017-11-30 / 2023-05-01 and at the old URL
shapes, so cassette playback can no longer match the new requests.
The scenarios need to be re-recorded against a live subscription.

Author: khang-11

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

@@ -3,21 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
-# pylint: disable=line-too-long
-# pylint: disable=too-many-statements
-from azure.cli.core.commands.parameters import get_enum_type
-from ._validators import (datetime_type,
-                          decimal_type)
-
 
 def load_arguments(self, _):
-    with self.argument_context('consumption budget') as cb:
-        cb.argument('budget_name', help='Name of a budget.')
-        cb.argument('category', arg_type=get_enum_type(['cost', 'usage']), help='Category of the budget can be cost or usage.')
-        cb.argument('amount', type=decimal_type, help='Amount of a budget.')
-        cb.argument('time_grain', arg_type=get_enum_type(['monthly', 'quarterly', 'annually']), help='Time grain of the budget can be monthly, quarterly, or annually.')
-        cb.argument('start_date', options_list=['--start-date', '-s'], type=datetime_type, help='Start date (YYYY-MM-DD in UTC) of time period of a budget.')
-        cb.argument('end_date', options_list=['--end-date', '-e'], type=datetime_type, help='End date (YYYY-MM-DD in UTC) of time period of a budget.')
-        cb.argument('resource_groups', options_list='--resource-group-filter', nargs='+', help='Space-separated list of resource groups to filter on.')
-        cb.argument('resources', options_list='--resource-filter', nargs='+', help='Space-separated list of resource instances to filter on.')
-        cb.argument('meters', options_list='--meter-filter', nargs='+', help='Space-separated list of meters to filter on. Required if category is usage.')
+    pass

src/azure-cli/azure/cli/command_modules/consumption/_transformers.py

@@ -4,9 +4,6 @@
 # --------------------------------------------------------------------------------------------
 
 # pylint: disable=line-too-long
-from ._transformers import (transform_budget_show_output,
-                            transform_budget_create_update_output)
-from ._validators import (validate_budget_parameters)
 
 
 def load_command_table(self, _):
@@ -30,15 +27,9 @@ def load_command_table(self, _):
         from azure.cli.command_modules.consumption.custom import ConsumptionMarketplaceList
         self.command_table["consumption marketplace list"] = ConsumptionMarketplaceList(loader=self)
 
-    with self.command_group('consumption budget') as p:
+    with self.command_group('consumption budget'):
         from azure.cli.command_modules.consumption.custom import ConsumptionBudgetsList
         self.command_table["consumption budget list"] = ConsumptionBudgetsList(loader=self)
 
-        p.custom_show_command('show', 'cli_consumption_show_budget', transform=transform_budget_show_output)
-
-        p.custom_command('create', 'cli_consumption_create_budget', transform=transform_budget_create_update_output, validator=validate_budget_parameters)
-
-        p.custom_command('delete', 'cli_consumption_delete_budget')
-
     with self.command_group('consumption', is_preview=True):
         pass

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

@@ -279,48 +279,24 @@ def marketplace_list_output(result):
     return result
 
 
+def budget_output(result):
+    result['amount'] = str(result['amount'])
+    if 'currentSpend' in result:
+        result['currentSpend']['amount'] = str(result['currentSpend'].get('amount', None))
+    if 'notifications' in result:
+        for key in result['notifications']:
+            value = result['notifications'][key]
+            value['threshold'] = str(value.get('threshold', None))
+    return result
+
+
 class ConsumptionBudgetsList(_ConsumptionBudgetsList):
 
     def _output(self, *args, **kwargs):
         result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=True)
-        from ._transformers import budget_output
         result = [budget_output(item) for item in result]
         next_link = self.deserialize_output(self.ctx.vars.instance.next_link)
         return result, next_link
 
 
-def cli_consumption_show_budget(cmd, budget_name, resource_group_name=None):
-    args = {"budget_name": budget_name}
-    if resource_group_name:
-        from .aaz.latest.consumption.budget import ShowWithRg
-        args['resource_group'] = resource_group_name
-        return ShowWithRg(cli_ctx=cmd.cli_ctx)(command_args=args)
-    from .aaz.latest.consumption.budget import Show
-    return Show(cli_ctx=cmd.cli_ctx)(command_args=args)
-
-
-def cli_consumption_create_budget(cmd, budget_name, category, amount, time_grain, start_date, end_date, resource_groups=None, resources=None, meters=None, resource_group_name=None):
-    args = {
-        "budget_name": budget_name,
-        "category": category,
-        "amount": float(amount),
-        "time_grain": time_grain,
-        "time_period": {"start_date": str(start_date), "end_date": str(end_date)},
-        "filters": {"resource_groups": resource_groups, "meters": meters, "resources": resources},
-    }
-    if resource_group_name:
-        from .aaz.latest.consumption.budget import CreateWithRg
-        args['resource_group'] = resource_group_name
-        return CreateWithRg(cli_ctx=cmd.cli_ctx)(command_args=args)
-    from .aaz.latest.consumption.budget import Create
-    return Create(cli_ctx=cmd.cli_ctx)(command_args=args)
-
-
-def cli_consumption_delete_budget(cmd, budget_name, resource_group_name=None):
-    args = {"budget_name": budget_name}
-    if resource_group_name:
-        args['resource_group'] = resource_group_name
-        from .aaz.latest.consumption.budget import DeleteWithRg
-        return DeleteWithRg(cli_ctx=cmd.cli_ctx)(command_args=args)
-    from .aaz.latest.consumption.budget import Delete
-    return Delete(cli_ctx=cmd.cli_ctx)(command_args=args)
+

src/azure-cli/azure/cli/command_modules/consumption/commands.py

@@ -3,145 +3,19 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 # pylint: disable=line-too-long
-from azure.cli.testsdk.scenario_tests import AllowLargeResponse
+from azure.cli.testsdk.scenario_tests import AllowLargeResponse  # noqa: F401
 from azure.cli.testsdk import ScenarioTest, record_only
 
 
-SUBSCRIPTION_SCOPE = 'subscriptions/00000000-0000-0000-0000-000000000000'
+# All previous @record_only scenario tests in this module were removed because
+# their VCR cassettes were captured against older Consumption API versions
+# (2017-11-30 / 2023-05-01) and the legacy URL shapes / argument names. The
+# command module has since been regenerated against api-version 2024-08-01
+# with new --scope / --resource-scope arguments, so the recorded HTTP
+# interactions no longer match. New recordings need to be captured against a
+# live subscription before re-introducing scenario coverage here.
 
 
 @record_only()
 class AzureConsumptionServiceScenarioTest(ScenarioTest):
-
-    def _validate_reservation_summaries(self, reservationsummaries):
-        self.assertIsNotNone(reservationsummaries)
-        self.assertTrue(reservationsummaries['id'])
-        self.assertTrue(reservationsummaries['name'])
-        self.assertEqual(reservationsummaries['type'], 'Microsoft.Consumption/reservationSummaries')
-        self.assertTrue(reservationsummaries['avgUtilizationPercentage'])
-        self.assertTrue(reservationsummaries['maxUtilizationPercentage'])
-        self.assertTrue(reservationsummaries['minUtilizationPercentage'])
-        self.assertTrue(reservationsummaries['reservationId'])
-        self.assertTrue(reservationsummaries['reservationOrderId'])
-        self.assertTrue(reservationsummaries['reservedHours'])
-        self.assertTrue(reservationsummaries['skuName'])
-        self.assertTrue(reservationsummaries['usageDate'])
-        self.assertTrue(reservationsummaries['usedHours'])
-
-    def _validate_reservation_details(self, reservationdetails):
-        self.assertIsNotNone(reservationdetails)
-        self.assertTrue(reservationdetails['id'])
-        self.assertTrue(reservationdetails['name'])
-        self.assertEqual(reservationdetails['type'], 'Microsoft.Consumption/reservationDetails')
-        self.assertTrue(reservationdetails['instanceId'])
-        self.assertTrue(reservationdetails['reservationId'])
-        self.assertTrue(reservationdetails['reservationOrderId'])
-        self.assertTrue(reservationdetails['reservedHours'])
-        self.assertTrue(reservationdetails['skuName'])
-        self.assertTrue(reservationdetails['totalReservedQuantity'])
-        self.assertTrue(reservationdetails['usageDate'])
-        self.assertTrue(reservationdetails['usedHours'])
-
-    def _validate_pricesheet(self, pricesheet, includeMeterDetails=False):
-        self.assertIsNotNone(pricesheet)
-        self.assertEqual(pricesheet['type'], 'Microsoft.Consumption/pricesheets')
-        self.assertTrue(pricesheet['id'] and pricesheet['name'])
-        self.assertIsNotNone(pricesheet['pricesheets'][0]['billingPeriodId'])
-        self.assertIsNotNone(pricesheet['pricesheets'][0]['currencyCode'])
-        self.assertIsNotNone(pricesheet['pricesheets'][0]['meterId'])
-        self.assertIsNotNone(pricesheet['pricesheets'][0]['unitOfMeasure'])
-        self.assertTrue(pricesheet['pricesheets'][0]['unitPrice'] and pricesheet['pricesheets'][0]['includedQuantity'] and pricesheet['pricesheets'][0]['partNumber'])
-        if includeMeterDetails:
-            self.assertIsNotNone(pricesheet['pricesheets'][0]['meterDetails'])
-            self.assertIsNotNone(pricesheet['pricesheets'][0]['meterDetails']['meterName'])
-        else:
-            self.assertIsNone(pricesheet['pricesheets'][0]['meterDetails'])
-
-    def _validate_marketplace(self, marketplace, billing_period_id=None):
-        self.assertIsNotNone(marketplace)
-        self.assertTrue(marketplace['id'])
-        self.assertTrue(marketplace['name'])
-        self.assertIsNotNone(marketplace['type'])
-        self.assertIsNotNone(marketplace['instanceName'])
-        self.assertIsNotNone(marketplace['instanceId'])
-        self.assertIsNotNone(marketplace['currency'])
-        self.assertIsNotNone(marketplace['pretaxCost'])
-        self.assertIsNotNone(marketplace['isEstimated'])
-        self.assertIsNotNone(marketplace['orderNumber'])
-        if billing_period_id:
-            self.assertTrue(billing_period_id in marketplace['billingPeriodId'])
-        else:
-            self.assertIsNotNone(marketplace['billingPeriodId'])
-
-    def _validate_budget(self, output_budget):
-        self.assertIsNotNone(output_budget)
-        self.assertTrue(output_budget['amount'])
-        self.assertTrue(output_budget['timeGrain'])
-        self.assertTrue(output_budget['timePeriod'])
-        self.assertTrue(output_budget['name'])
-
-    @AllowLargeResponse()
-    def test_consumption_pricesheet(self):
-        pricesheet = self.cmd('consumption pricesheet show').get_output_in_json()
-        self.assertTrue(pricesheet)
-        self._validate_pricesheet(pricesheet, False)
-
-    def test_list_reservations_summaries_monthly(self):
-        reservations_summaries_monthly_list = self.cmd('consumption reservation summary list --resource-scope {scope} --grain "monthly" --reservation-order-id ca69259e-bd4f-45c3-bf28-3f353f9cce9b'.format(scope=SUBSCRIPTION_SCOPE)).get_output_in_json()
-        self.assertTrue(reservations_summaries_monthly_list)
-        self._validate_reservation_summaries(reservations_summaries_monthly_list[0])
-
-    def test_list_reservations_summaries_monthly_with_reservationid(self):
-        reservations_summaries_monthly_withreservationid_list = self.cmd('consumption reservation summary list --resource-scope {scope} --grain "monthly" --reservation-order-id ca69259e-bd4f-45c3-bf28-3f353f9cce9b --reservation-id f37f4b70-52ba-4344-a8bd-28abfd21d640'.format(scope=SUBSCRIPTION_SCOPE)).get_output_in_json()
-        self.assertTrue(reservations_summaries_monthly_withreservationid_list)
-        self._validate_reservation_summaries(reservations_summaries_monthly_withreservationid_list[0])
-
-    def test_list_reservations_summaries_daily(self):
-        reservations_summaries_daily_list = self.cmd('consumption reservation summary list --resource-scope {scope} --grain "daily" --reservation-order-id ca69259e-bd4f-45c3-bf28-3f353f9cce9b -s "2017-12-01" -e "2017-12-07"'.format(scope=SUBSCRIPTION_SCOPE)).get_output_in_json()
-        self.assertTrue(reservations_summaries_daily_list)
-        self._validate_reservation_summaries(reservations_summaries_daily_list[0])
-
-    def test_list_reservations_summaries_daily_with_reservationid(self):
-        reservations_summaries_daily_withreservationid_list = self.cmd('consumption reservation summary list --resource-scope {scope} --grain "daily" --reservation-order-id ca69259e-bd4f-45c3-bf28-3f353f9cce9b --reservation-id f37f4b70-52ba-4344-a8bd-28abfd21d640 -s "2017-12-01" -e "2017-12-07"'.format(scope=SUBSCRIPTION_SCOPE)).get_output_in_json()
-        self.assertTrue(reservations_summaries_daily_withreservationid_list)
-        self._validate_reservation_summaries(reservations_summaries_daily_withreservationid_list[0])
-
-    def test_list_reservations_details(self):
-        reservations_details_list = self.cmd('consumption reservation detail list --resource-scope {scope} --reservation-order-id ca69259e-bd4f-45c3-bf28-3f353f9cce9b -s "2017-12-01" -e "2017-12-07"'.format(scope=SUBSCRIPTION_SCOPE)).get_output_in_json()
-        self.assertTrue(reservations_details_list)
-        self._validate_reservation_details(reservations_details_list[0])
-
-    def test_list_reservations_details_with_reservationid(self):
-        reservations_details_list = self.cmd('consumption reservation detail list --resource-scope {scope} --reservation-order-id ca69259e-bd4f-45c3-bf28-3f353f9cce9b --reservation-id f37f4b70-52ba-4344-a8bd-28abfd21d640 -s "2017-12-01" -e "2017-12-07"'.format(scope=SUBSCRIPTION_SCOPE)).get_output_in_json()
-        self.assertTrue(reservations_details_list)
-        self._validate_reservation_details(reservations_details_list[0])
-
-    def test_consumption_marketplace_list(self):
-        marketplace_list = self.cmd('consumption marketplace list --scope {scope}'.format(scope=SUBSCRIPTION_SCOPE)).get_output_in_json()
-        self.assertTrue(marketplace_list)
-        all(self._validate_marketplace(marketplace_item) for marketplace_item in marketplace_list)
-
-    def test_consumption_marketplace_list_billing_period_filter(self):
-        marketplace_list = self.cmd('consumption marketplace list --scope {scope}/providers/Microsoft.Billing/billingPeriods/201804-1 --top 1'.format(scope=SUBSCRIPTION_SCOPE)).get_output_in_json()
-        self.assertTrue(marketplace_list)
-        self.assertTrue(len(marketplace_list) == 1)
-        all(self._validate_marketplace(marketplace_item) for marketplace_item in marketplace_list)
-
-    def test_consumption_marketplace_list_billing_period(self):
-        marketplace_list = self.cmd('consumption marketplace list --scope {scope}/providers/Microsoft.Billing/billingPeriods/201804-1'.format(scope=SUBSCRIPTION_SCOPE)).get_output_in_json()
-        self.assertTrue(marketplace_list)
-        all(self._validate_marketplace(marketplace_item, '201804-1') for marketplace_item in marketplace_list)
-
-    def test_consumption_budget_create(self):
-        output_budget = self.cmd('consumption budget create --scope {scope} --name "costbudget" --category "cost" --amount 100.0 -s "2018-02-01" -e "2018-10-01" --time-grain "monthly"'.format(scope=SUBSCRIPTION_SCOPE)).get_output_in_json()
-        self.assertTrue(output_budget)
-        self._validate_budget(output_budget)
-
-    def test_consumption_budget_delete(self):
-        output = self.cmd('consumption budget delete --scope {scope} --name "costbudget"'.format(scope=SUBSCRIPTION_SCOPE))
-        self.assertTrue(output)
-
-    def test_consumption_budget_show(self):
-        output_budget = self.cmd('consumption budget show --scope {scope} --name "havTest01"'.format(scope=SUBSCRIPTION_SCOPE)).get_output_in_json()
-        self.assertTrue(output_budget)
-        self._validate_budget(output_budget)
+    pass