Skip to content

[Consumption] az consumption usage list: Enhanced handling of usageStart and usageEnd when missing #31128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kairu-ms merged 6 commits into from
Apr 18, 2025
Merged

[Consumption] az consumption usage list: Enhanced handling of usageStart and usageEnd when missing #31128

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5224e55
fix: handle None UsageStart in consumption usage list and exclude fro…
Mar 25, 2025
6dae0df
Update src/azure-cli/azure/cli/command_modules/consumption/custom.py
haule21 Mar 27, 2025
7f9a002
Update src/azure-cli/azure/cli/command_modules/consumption/custom.py
haule21 Mar 27, 2025
37892b4
Update src/azure-cli/azure/cli/command_modules/consumption/custom.py
haule21 Mar 27, 2025
4c77c6b
Update src/azure-cli/azure/cli/command_modules/consumption/custom.py
haule21 Mar 27, 2025
98fe49c
remove whitespace
haule21 Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions src/azure-cli/azure/cli/command_modules/consumption/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def pre_operations(self):
def _output(self, *args, **kwargs):
args = self.ctx.args
result = self.deserialize_output(self.ctx.vars.instance.value, client_flatten=True)
result = list([transform_usage_output(item) for item in result])
result = list(filter(None, [transform_usage_output(item) for item in result]))
if has_value(args.top):
next_link = None
else:
Expand All @@ -92,13 +92,18 @@ def _output(self, *args, **kwargs):

def transform_usage_output(result):
from dateutil import parser
usageStart = parser.parse(result['usageStart'])
usageEnd = parser.parse(result['usageEnd'])
result['usageStart'] = usageStart.strftime("%Y-%m-%dT%H:%M:%SZ")
result['usageEnd'] = usageEnd.strftime("%Y-%m-%dT%H:%M:%SZ")
result['usageQuantity'] = str(result['usageQuantity'])
result['billableQuantity'] = str(result.get('billableQuantity', 'None'))
result['pretaxCost'] = str(result['pretaxCost'])
usageStart = result.get('usageStart', None)
usageEnd = result.get('usageEnd', None)
if usageStart or usageEnd:
usageStart = parser.parse(usageStart).strftime("%Y-%m-%dT%H:%M:%SZ") if usageStart else 'None'
usageEnd = parser.parse(usageEnd).strftime("%Y-%m-%dT%H:%M:%SZ") if usageEnd else 'None'
else:
return None
result['usageStart'] = usageStart
result['usageEnd'] = usageEnd
result['usageQuantity'] = str(result.get('usageQuantity', None))
result['billableQuantity'] = str(result.get('billableQuantity', None))
result['pretaxCost'] = str(result.get('pretaxCost', None))
if 'meterDetails' in result:
result['meterDetails']['totalIncludedQuantity'] = str(result['meterDetails'].get('pretaxStandardRate', None))
result['meterDetails']['pretaxStandardRate'] = str(result['meterDetails'].get('pretaxStandardRate', None))
Expand Down
Loading