make script for listing domains more reusable

Signed-off-by: Jakub Sokołowski <jakub@status.im>

cloudflare/fqdns.py

@@ -0,0 +1,67 @@
+#!/usr/bin/env python3
+import os
+import CloudFlare
+from optparse import OptionParser
+
+HELP_DESCRIPTION='This is a simple utility for querying CloudFlare for DNS entries.'
+HELP_EXAMPLE='Example: ./fqdns.py -d status.im -t CNAME'
+
+def format_csv(record):
+    return '{};{};{};{}'.format(
+        record['type'],
+        record['name'],
+        record['content'],
+        record['proxied'],
+    )
+
+def format_table(record):
+    return '{:1} {:>6} {:30} {:30}'.format(
+        ('P' if record['proxied'] else ''),
+        record['type'],
+        record['name'],
+        record['content'],
+    )
+
+def parse_opts():
+    parser = OptionParser(description=HELP_DESCRIPTION, epilog=HELP_EXAMPLE)
+    parser.add_option('-M', '--mail', dest='cf_email', default='jakub@status.im',
+                      help='CloudFlare Account email for auth. (default: %default)')
+    parser.add_option('-T', '--token', dest='cf_token', default=os.environ['CF_TOKEN'],
+                      help='CloudFlare API token for auth (env CF_TOKEN used). (default: %default)')
+    parser.add_option('-d', '--domain', dest='cf_domain', default='status.im',
+                      help='Specify which domain to query for. (default: %default)')
+    parser.add_option('-t', '--type',
+                      help='Type of DNS records to query for.')
+    parser.add_option('-c', '--csv', action='store_true',
+                      help='Format records as a CSV file.')
+    
+    return parser.parse_args()
+
+def main():
+    (opts, args) = parse_opts()
+    
+    cf = CloudFlare.CloudFlare(opts.cf_email, opts.cf_token)
+
+    zones = cf.zones.get(params={'per_page':100})
+    zone = next(z for z in zones if z['name'] == opts.cf_domain)
+
+    zone_id = zone['id']
+
+    settings_ssl = cf.zones.settings.ssl.get(zone_id)
+    ssl_status = settings_ssl['value']
+
+    #settings_ipv6 = cf.zones.settings.ipv6.get(zone_id)
+    #ipv6_status = settings_ipv6['value']
+    #print(zone_id, zone_name, ssl_status, ipv6_status)
+
+    records = cf.zones.dns_records.get(zone_id, params={'per_page': 1000})
+
+    formatter = format_table
+    if opts.csv:
+        formatter = format_csv
+
+    for r in records:
+        print(formatter(r))
+
+if __name__ == '__main__':
+    main()

cloudflare/get_log.py

@@ -20,9 +20,9 @@ def format_log(log):
 
 def parse_opts():
     parser = OptionParser(description=HELP_DESCRIPTION, epilog=HELP_EXAMPLE)
-    parser.add_option('-m', '--mail', dest='cf_email', default='jakub@status.im',
+    parser.add_option('-M', '--mail', dest='cf_email', default='jakub@status.im',
                       help='CloudFlare Account email for auth. (default: %default)')
-    parser.add_option('-t', '--token', dest='cf_token', default=os.environ['CF_TOKEN'],
+    parser.add_option('-T', '--token', dest='cf_token', default=os.environ['CF_TOKEN'],
                       help='CloudFlare API token for auth (env CF_TOKEN used). (default: %default)')
     parser.add_option('-o', '--organiation', dest='cf_org_id', default='113ef908d19933ef327f079a3def53fc',
                       help='Specify which CloudFlare organization to query. (default: %default)')

cloudflare/list_domains.py

@@ -1,31 +0,0 @@
-#!/usr/bin/env python3
-import os
-import CloudFlare
-
-email = 'jakub@status.im'
-token = os.environ['CF_TOKEN']
-
-cf = CloudFlare.CloudFlare(email, token)
-zones = cf.zones.get(params = {'per_page':100})
-
-for z in zones:
-    zone_id = z['id']
-    zone_name = z['name']
-
-    settings_ssl = cf.zones.settings.ssl.get(zone_id)
-    ssl_status = settings_ssl['value']
-
-    settings_ipv6 = cf.zones.settings.ipv6.get(zone_id)
-    ipv6_status = settings_ipv6['value']
-
-    #print(zone_id, zone_name, ssl_status, ipv6_status)
-
-    records = cf.zones.dns_records.get(zone_id, params={'per_page': 1000})
-
-    for r in records:
-        print('{};{};{};{}'.format(
-            r['type'],
-            r['name'],
-            r['content'],
-            r['zone_name'],
-        ))