1 files changed, 44 insertions, 24 deletions
diff --git a/cloudinit/cmd/cloud_id.py b/cloudinit/cmd/cloud_id.py
index 0cdc9675..b92b03a8 100755
--- a/cloudinit/cmd/cloud_id.py
+++ b/cloudinit/cmd/cloud_id.py
@@ -6,13 +6,16 @@ import argparse
 import json
 import sys
 
-from cloudinit.util import error
 from cloudinit.sources import (
-    INSTANCE_JSON_FILE, METADATA_UNKNOWN, canonical_cloud_id)
+    INSTANCE_JSON_FILE,
+    METADATA_UNKNOWN,
+    canonical_cloud_id,
+)
+from cloudinit.util import error
 
-DEFAULT_INSTANCE_JSON = '/run/cloud-init/%s' % INSTANCE_JSON_FILE
+DEFAULT_INSTANCE_JSON = "/run/cloud-init/%s" % INSTANCE_JSON_FILE
 
-NAME = 'cloud-id'
+NAME = "cloud-id"
 
 
 def get_parser(parser=None):
@@ -27,17 +30,30 @@ def get_parser(parser=None):
     if not parser:
         parser = argparse.ArgumentParser(
             prog=NAME,
-            description='Report the canonical cloud-id for this instance')
+            description="Report the canonical cloud-id for this instance",
+        )
     parser.add_argument(
-        '-j', '--json', action='store_true', default=False,
-        help='Report all standardized cloud-id information as json.')
+        "-j",
+        "--json",
+        action="store_true",
+        default=False,
+        help="Report all standardized cloud-id information as json.",
+    )
     parser.add_argument(
-        '-l', '--long', action='store_true', default=False,
-        help='Report extended cloud-id information as tab-delimited string.')
+        "-l",
+        "--long",
+        action="store_true",
+        default=False,
+        help="Report extended cloud-id information as tab-delimited string.",
+    )
     parser.add_argument(
-        '-i', '--instance-data', type=str, default=DEFAULT_INSTANCE_JSON,
-        help=('Path to instance-data.json file. Default is %s' %
-              DEFAULT_INSTANCE_JSON))
+        "-i",
+        "--instance-data",
+        type=str,
+        default=DEFAULT_INSTANCE_JSON,
+        help="Path to instance-data.json file. Default is %s"
+        % DEFAULT_INSTANCE_JSON,
+    )
     return parser
 
 
@@ -53,24 +69,28 @@ def handle_args(name, args):
     except IOError:
         return error(
             "File not found '%s'. Provide a path to instance data json file"
-            ' using --instance-data' % args.instance_data)
+            " using --instance-data" % args.instance_data
+        )
     except ValueError as e:
         return error(
-            "File '%s' is not valid json. %s" % (args.instance_data, e))
-    v1 = instance_data.get('v1', {})
+            "File '%s' is not valid json. %s" % (args.instance_data, e)
+        )
+    v1 = instance_data.get("v1", {})
     cloud_id = canonical_cloud_id(
-        v1.get('cloud_name', METADATA_UNKNOWN),
-        v1.get('region', METADATA_UNKNOWN),
-        v1.get('platform', METADATA_UNKNOWN))
+        v1.get("cloud_name", METADATA_UNKNOWN),
+        v1.get("region", METADATA_UNKNOWN),
+        v1.get("platform", METADATA_UNKNOWN),
+    )
     if args.json:
-        v1['cloud_id'] = cloud_id
-        response = json.dumps(   # Pretty, sorted json
-            v1, indent=1, sort_keys=True, separators=(',', ': '))
+        v1["cloud_id"] = cloud_id
+        response = json.dumps(  # Pretty, sorted json
+            v1, indent=1, sort_keys=True, separators=(",", ": ")
+        )
     elif args.long:
-        response = '%s\t%s' % (cloud_id, v1.get('region', METADATA_UNKNOWN))
+        response = "%s\t%s" % (cloud_id, v1.get("region", METADATA_UNKNOWN))
     else:
         response = cloud_id
-    sys.stdout.write('%s\n' % response)
+    sys.stdout.write("%s\n" % response)
     return 0
 
 
@@ -80,7 +100,7 @@ def main():
     sys.exit(handle_args(NAME, parser.parse_args()))
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
 
 # vi: ts=4 expandtab