format all python files in envoy (envoyproxy#5422)

Signed-off-by: Derek Schaller <[email protected]>

Author: dschaller

api/tools/capture2pcap.py

@@ -34,14 +34,9 @@ def DumpEvent(direction, timestamp, data):
   dump = StringIO.StringIO()
   dump.write('%s\n' % direction)
   # Adjust to local timezone
-  adjusted_dt = timestamp.ToDatetime() - datetime.timedelta(
-      seconds=time.altzone)
+  adjusted_dt = timestamp.ToDatetime() - datetime.timedelta(seconds=time.altzone)
   dump.write('%s\n' % adjusted_dt)
-  od = sp.Popen(
-      ['od', '-Ax', '-tx1', '-v'],
-      stdout=sp.PIPE,
-      stdin=sp.PIPE,
-      stderr=sp.PIPE)
+  od = sp.Popen(['od', '-Ax', '-tx1', '-v'], stdout=sp.PIPE, stdin=sp.PIPE, stderr=sp.PIPE)
   packet_dump = od.communicate(data)[0]
   dump.write(packet_dump)
   return dump.getvalue()

api/tools/capture2pcap_test.py

@@ -16,8 +16,7 @@
   pcap_path = os.path.join(os.getenv('TEST_TMPDIR'), 'generated.pcap')
 
   capture2pcap.Capture2Pcap(capture_path, pcap_path)
-  actual_output = sp.check_output(
-      ['tshark', '-r', pcap_path, '-d', 'tcp.port==10000,http2', '-P'])
+  actual_output = sp.check_output(['tshark', '-r', pcap_path, '-d', 'tcp.port==10000,http2', '-P'])
   with open(expected_path, 'r') as f:
     expected_output = f.read()
   if actual_output != expected_output:

api/tools/generate_listeners.py

@@ -32,17 +32,15 @@ def ProtoToStruct(proto):
 def ParseProto(path, filter_name):
   # We only know about some filter config protos ahead of time.
   KNOWN_FILTERS = {
-      'http_connection_manager':
-          lambda: http_connection_manager_pb2.HttpConnectionManager()
+      'http_connection_manager': lambda: http_connection_manager_pb2.HttpConnectionManager()
   }
   filter_config = KNOWN_FILTERS[filter_name]()
   with open(path, 'r') as f:
     text_format.Merge(f.read(), filter_config)
   return filter_config
 
 
-def GenerateListeners(listeners_pb_path, output_pb_path, output_json_path,
-                      fragments):
+def GenerateListeners(listeners_pb_path, output_pb_path, output_json_path, fragments):
   listener = lds_pb2.Listener()
   with open(listeners_pb_path, 'r') as f:
     text_format.Merge(f.read(), listener)

api/tools/generate_listeners_test.py

@@ -7,9 +7,5 @@
 if __name__ == "__main__":
   srcdir = os.path.join(os.getenv("TEST_SRCDIR"), 'envoy_api')
   generate_listeners.GenerateListeners(
-      os.path.join(srcdir, "examples/service_envoy/listeners.pb"),
-      "/dev/stdout", "/dev/stdout",
-      iter([
-          os.path.join(srcdir,
-                       "examples/service_envoy/http_connection_manager.pb")
-      ]))
+      os.path.join(srcdir, "examples/service_envoy/listeners.pb"), "/dev/stdout", "/dev/stdout",
+      iter([os.path.join(srcdir, "examples/service_envoy/http_connection_manager.pb")]))

bazel/cc_wrapper.py

@@ -34,8 +34,7 @@ def main():
   # https://github.com/bazelbuild/bazel/issues/4572
   # https://bazel-review.googlesource.com/c/bazel/+/39951
   if sys.argv[1:] == ["-E", "-xc++", "-", "-v"] and "clang" in compiler:
-    os.execv(envoy_real_cxx,
-             [envoy_real_cxx, "-E", "-", "-v", "-no-canonical-prefixes"])
+    os.execv(envoy_real_cxx, [envoy_real_cxx, "-E", "-", "-v", "-no-canonical-prefixes"])
 
   # `g++` and `gcc -lstdc++` have similar behavior and Bazel treats them as
   # interchangeable, but `gcc` will ignore the `-static-libstdc++` flag.
@@ -55,8 +54,7 @@ def main():
         # unless the user has explicitly set environment variables
         # before starting Bazel. But here in $PWD is the Bazel sandbox,
         # which will be deleted automatically after the compiler exits.
-        (flagfile_fd, flagfile_path) = tempfile.mkstemp(
-            dir='./', suffix=".linker-params")
+        (flagfile_fd, flagfile_path) = tempfile.mkstemp(dir='./', suffix=".linker-params")
         with closing_fd(flagfile_fd):
           sanitize_flagfile(arg[len("-Wl,@"):], flagfile_fd)
         argv.append("-Wl,@" + flagfile_path)

bazel/git_repository_info.py

@@ -17,4 +17,4 @@
     print 'Unknown repository: %s' % repo
     sys.exit(1)
   repoloc = repolocs.REPOSITORY_LOCATIONS[repo]
-  print '%s %s' % (repoloc['remote'], repoloc['commit']) 
+  print '%s %s' % (repoloc['remote'], repoloc['commit'])

configs/configgen.py

@@ -22,12 +22,7 @@
 # in envoy_router.template.json must be specified here. It is a dictionary of dictionaries.
 # Options can be specified for each cluster if needed. See make_route_internal() in
 # routing_helper.template.json for the types of options supported.
-front_envoy_clusters = {
-    'service1': {},
-    'service2': {},
-    'service3': {},
-    'ratelimit': {}
-}
+front_envoy_clusters = {'service1': {}, 'service2': {}, 'service3': {}, 'ratelimit': {}}
 
 # This is the set of internal services that local Envoys will route to. All services that will be
 # accessed via the 9001 egress port need to be listed here. It is a dictionary of dictionaries.
@@ -46,24 +41,28 @@
 # we demonstrate setting up proxying for DynamoDB. In the config, this ends up using the HTTP
 # DynamoDB statistics filter, as well as generating a special access log which includes the
 # X-AMZN-RequestId response header.
-external_virtual_hosts = [
-{
-    'name': 'dynamodb_iad',
-    'address': "127.0.0.1",
-    'protocol':"TCP",
-    'port_value':"9204",
-    'hosts': [
-        {
-            'name': 'dynamodb_iad', 'domain': '*',
-            'remote_address': 'dynamodb.us-east-1.amazonaws.com',
-            'protocol': 'TCP',
-            'port_value': '443',
-            'verify_subject_alt_name': [ 'dynamodb.us-east-1.amazonaws.com' ],
-            'ssl': True
-        }
-    ],
-    'is_amzn_service': True,
-    'cluster_type': 'logical_dns'
+external_virtual_hosts = [{
+    'name':
+    'dynamodb_iad',
+    'address':
+    "127.0.0.1",
+    'protocol':
+    "TCP",
+    'port_value':
+    "9204",
+    'hosts': [{
+        'name': 'dynamodb_iad',
+        'domain': '*',
+        'remote_address': 'dynamodb.us-east-1.amazonaws.com',
+        'protocol': 'TCP',
+        'port_value': '443',
+        'verify_subject_alt_name': ['dynamodb.us-east-1.amazonaws.com'],
+        'ssl': True
+    }],
+    'is_amzn_service':
+    True,
+    'cluster_type':
+    'logical_dns'
 }]
 
 # This is the set of mongo clusters that local Envoys can talk to. Each database defines a set of
@@ -73,31 +72,57 @@
 # as it demonstrates how to setup TCP proxy and the network rate limit filter.
 mongos_servers = {
     'somedb': {
-        'address': "127.0.0.1",
-        'protocol': "TCP",
-        'port_value': 27019,
+        'address':
+        "127.0.0.1",
+        'protocol':
+        "TCP",
+        'port_value':
+        27019,
         'hosts': [
-            {'port_value' : 27817, 'address':'router1.yourcompany.net' , 'protocol': 'TCP'},
-            {'port_value' : 27817, 'address':'router2.yourcompany.net' , 'protocol': 'TCP'},
-            {'port_value' : 27817, 'address':'router3.yourcompany.net' , 'protocol': 'TCP'},
-            {'port_value' : 27817, 'address':'router4.yourcompany.net' , 'protocol': 'TCP'},
+            {
+                'port_value': 27817,
+                'address': 'router1.yourcompany.net',
+                'protocol': 'TCP'
+            },
+            {
+                'port_value': 27817,
+                'address': 'router2.yourcompany.net',
+                'protocol': 'TCP'
+            },
+            {
+                'port_value': 27817,
+                'address': 'router3.yourcompany.net',
+                'protocol': 'TCP'
+            },
+            {
+                'port_value': 27817,
+                'address': 'router4.yourcompany.net',
+                'protocol': 'TCP'
+            },
         ],
-        'ratelimit': True
+        'ratelimit':
+        True
     }
 }
 
+
 def generate_config(template_path, template, output_file, **context):
-    """ Generate a final config file based on a template and some context. """
-    env = jinja2.Environment(loader=jinja2.FileSystemLoader(template_path, followlinks=True),
-                             undefined=jinja2.StrictUndefined)
-    raw_output = env.get_template(template).render(**context)
-    with open(output_file, 'w') as fh:
-        fh.write(raw_output)
+  """ Generate a final config file based on a template and some context. """
+  env = jinja2.Environment(
+      loader=jinja2.FileSystemLoader(template_path, followlinks=True),
+      undefined=jinja2.StrictUndefined)
+  raw_output = env.get_template(template).render(**context)
+  with open(output_file, 'w') as fh:
+    fh.write(raw_output)
+
 
 # Generate a demo config for the main front proxy. This sets up both HTTP and HTTPS listeners,
 # as well as a listener for the double proxy to connect to via SSL client authentication.
-generate_config(SCRIPT_DIR, 'envoy_front_proxy_v2.template.yaml',
-                '{}/envoy_front_proxy.v2.yaml'.format(OUT_DIR), clusters=front_envoy_clusters)
+generate_config(
+    SCRIPT_DIR,
+    'envoy_front_proxy_v2.template.yaml',
+    '{}/envoy_front_proxy.v2.yaml'.format(OUT_DIR),
+    clusters=front_envoy_clusters)
 
 # Generate a demo config for the double proxy. This sets up both an HTTP and HTTPS listeners,
 # and backhauls the traffic to the main front proxy.
@@ -112,11 +137,13 @@ def generate_config(template_path, template, output_file, **context):
 # optional external service ports: built from external_virtual_hosts above. Each external host
 #                                  that Envoy proxies to listens on its own port.
 # optional mongo ports: built from mongos_servers above.
-generate_config(SCRIPT_DIR, 'envoy_service_to_service_v2.template.yaml',
-                '{}/envoy_service_to_service.yaml'.format(OUT_DIR),
-                internal_virtual_hosts=service_to_service_envoy_clusters,
-                external_virtual_hosts=external_virtual_hosts,
-                mongos_servers=mongos_servers)
+generate_config(
+    SCRIPT_DIR,
+    'envoy_service_to_service_v2.template.yaml',
+    '{}/envoy_service_to_service.yaml'.format(OUT_DIR),
+    internal_virtual_hosts=service_to_service_envoy_clusters,
+    external_virtual_hosts=external_virtual_hosts,
+    mongos_servers=mongos_servers)
 
 for google_ext in ['v2.yaml']:
   shutil.copy(os.path.join(SCRIPT_DIR, 'google_com_proxy.%s' % google_ext), OUT_DIR)

docs/conf.py

@@ -16,9 +16,11 @@
 import sys
 import os
 
+
 def setup(app):
   app.add_config_value('release_level', '', 'env')
 
+
 if not os.environ.get('ENVOY_DOCS_RELEASE_LEVEL'):
   raise Exception("ENVOY_DOCS_RELEASE_LEVEL env var must be defined")
 
@@ -39,8 +41,8 @@ def setup(app):
 # ones.
 extensions = ['sphinxcontrib.httpdomain', 'sphinx.ext.extlinks', 'sphinx.ext.ifconfig']
 extlinks = {
-  'repo': ('https://github.com/envoyproxy/envoy/blob/master/%s', ''),
-  'api': ('https://github.com/envoyproxy/envoy/blob/master/api/%s', ''),
+    'repo': ('https://github.com/envoyproxy/envoy/blob/master/%s', ''),
+    'api': ('https://github.com/envoyproxy/envoy/blob/master/api/%s', ''),
 }
 
 # Add any paths that contain templates here, relative to this directory.
@@ -119,7 +121,6 @@ def setup(app):
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
 
-
 # -- Options for HTML output ----------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for

examples/cors/backend/service.py

@@ -6,8 +6,8 @@
 
 @app.route('/cors/<status>')
 def cors_enabled(status):
-    return 'Success!'
+  return 'Success!'
 
 
 if __name__ == "__main__":
-    app.run(host='127.0.0.1', port=8080, debug=True)
+  app.run(host='127.0.0.1', port=8080, debug=True)

examples/cors/frontend/service.py

@@ -6,9 +6,9 @@
 
 @app.route('/')
 def index():
-    file_dir = os.path.dirname(os.path.realpath(__file__))
-    return send_from_directory(file_dir, 'index.html')
+  file_dir = os.path.dirname(os.path.realpath(__file__))
+  return send_from_directory(file_dir, 'index.html')
 
 
 if __name__ == "__main__":
-    app.run(host='127.0.0.1', port=8080, debug=True)
+  app.run(host='127.0.0.1', port=8080, debug=True)