Skip to content
Merged
Changes from 4 commits
Commits
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
19 changes: 12 additions & 7 deletions src/azure-cli/azure/cli/command_modules/consumption/custom.py
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'])
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'))
Comment thread
haule21 marked this conversation as resolved.
Outdated
result['pretaxCost'] = str(result['pretaxCost'])
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