Change spacing from 4 spaces to 2 spaces

config_app/config_util/config/TransientDirectoryProvider.py

@@ -6,41 +6,42 @@ from config_app.config_util.k8saccessor import KubernetesAccessorSingleton
 
 
 class TransientDirectoryProvider(FileConfigProvider):
-    """ Implementation of the config provider that reads and writes the data
-        from/to the file system, only using temporary directories,
-        deleting old dirs and creating new ones as requested.
+  """ Implementation of the config provider that reads and writes the data
+      from/to the file system, only using temporary directories,
+      deleting old dirs and creating new ones as requested.
+  """
+
+  def __init__(self, config_volume, yaml_filename, py_filename):
+    # Create a temp directory that will be cleaned up when we change the config path
+    # This should ensure we have no "pollution" of different configs:
+    # no uploaded config should ever affect subsequent config modifications/creations
+    temp_dir = TemporaryDirectory()
+    self.temp_dir = temp_dir
+    super(TransientDirectoryProvider, self).__init__(temp_dir.name, yaml_filename, py_filename)
+
+  @property
+  def provider_id(self):
+    return 'transient'
+
+  def new_config_dir(self):
     """
-    def __init__(self, config_volume, yaml_filename, py_filename):
-        # Create a temp directory that will be cleaned up when we change the config path
-        # This should ensure we have no "pollution" of different configs:
-        # no uploaded config should ever affect subsequent config modifications/creations
-        temp_dir = TemporaryDirectory()
-        self.temp_dir = temp_dir
-        super(TransientDirectoryProvider, self).__init__(temp_dir.name, yaml_filename, py_filename)
+    Update the path with a new temporary directory, deleting the old one in the process
+    """
+    self.temp_dir.cleanup()
+    temp_dir = TemporaryDirectory()
 
-    @property
-    def provider_id(self):
-        return 'transient'
+    self.config_volume = temp_dir.name
+    self.temp_dir = temp_dir
+    self.yaml_path = os.path.join(temp_dir.name, self.yaml_filename)
 
-    def new_config_dir(self):
-        """
-        Update the path with a new temporary directory, deleting the old one in the process
-        """
-        self.temp_dir.cleanup()
-        temp_dir = TemporaryDirectory()
+  def get_config_dir_path(self):
+    return self.config_volume
 
-        self.config_volume = temp_dir.name
-        self.temp_dir = temp_dir
-        self.yaml_path = os.path.join(temp_dir.name, self.yaml_filename)
+  def save_configuration_to_kubernetes(self):
+    config_path = self.get_config_dir_path()
 
-    def get_config_dir_path(self):
-        return self.config_volume
+    for name in os.listdir(config_path):
+      file_path = os.path.join(self.config_volume, name)
+      KubernetesAccessorSingleton.get_instance().save_file_as_secret(name, file_path)
 
-    def save_configuration_to_kubernetes(self):
-        config_path = self.get_config_dir_path()
-
-        for name in os.listdir(config_path):
-            file_path = os.path.join(self.config_volume, name)
-            KubernetesAccessorSingleton.get_instance().save_file_as_secret(name, file_path)
-
-        return 200
+    return 200

config_app/config_util/config/__init__.py

@@ -4,9 +4,9 @@ from config_app.config_util.config.TransientDirectoryProvider import TransientDi
 
 
 def get_config_provider(config_volume, yaml_filename, py_filename, testing=False):
-    """ Loads and returns the config provider for the current environment. """
+  """ Loads and returns the config provider for the current environment. """
 
-    if testing:
-        return TestConfigProvider()
+  if testing:
+    return TestConfigProvider()
 
-    return TransientDirectoryProvider(config_volume, yaml_filename, py_filename)
+  return TransientDirectoryProvider(config_volume, yaml_filename, py_filename)

config_app/config_util/config/basefileprovider.py

@@ -8,64 +8,65 @@ logger = logging.getLogger(__name__)
 
 
 class BaseFileProvider(BaseProvider):
-    """ Base implementation of the config provider that reads the data from the file system. """
-    def __init__(self, config_volume, yaml_filename, py_filename):
-        self.config_volume = config_volume
-        self.yaml_filename = yaml_filename
-        self.py_filename = py_filename
+  """ Base implementation of the config provider that reads the data from the file system. """
 
-        self.yaml_path = os.path.join(config_volume, yaml_filename)
-        self.py_path = os.path.join(config_volume, py_filename)
+  def __init__(self, config_volume, yaml_filename, py_filename):
+    self.config_volume = config_volume
+    self.yaml_filename = yaml_filename
+    self.py_filename = py_filename
 
-    def update_app_config(self, app_config):
-        if os.path.exists(self.py_path):
-            logger.debug('Applying config file: %s', self.py_path)
-            app_config.from_pyfile(self.py_path)
+    self.yaml_path = os.path.join(config_volume, yaml_filename)
+    self.py_path = os.path.join(config_volume, py_filename)
 
-        if os.path.exists(self.yaml_path):
-            logger.debug('Applying config file: %s', self.yaml_path)
-            import_yaml(app_config, self.yaml_path)
+  def update_app_config(self, app_config):
+    if os.path.exists(self.py_path):
+      logger.debug('Applying config file: %s', self.py_path)
+      app_config.from_pyfile(self.py_path)
 
-    def get_config(self):
-        if not self.config_exists():
-            return None
+    if os.path.exists(self.yaml_path):
+      logger.debug('Applying config file: %s', self.yaml_path)
+      import_yaml(app_config, self.yaml_path)
 
-        config_obj = {}
-        import_yaml(config_obj, self.yaml_path)
-        return config_obj
+  def get_config(self):
+    if not self.config_exists():
+      return None
 
-    def config_exists(self):
-        return self.volume_file_exists(self.yaml_filename)
+    config_obj = {}
+    import_yaml(config_obj, self.yaml_path)
+    return config_obj
 
-    def volume_exists(self):
-        return os.path.exists(self.config_volume)
+  def config_exists(self):
+    return self.volume_file_exists(self.yaml_filename)
 
-    def volume_file_exists(self, filename):
-        return os.path.exists(os.path.join(self.config_volume, filename))
+  def volume_exists(self):
+    return os.path.exists(self.config_volume)
 
-    def get_volume_file(self, filename, mode='r'):
-        return open(os.path.join(self.config_volume, filename), mode=mode)
+  def volume_file_exists(self, filename):
+    return os.path.exists(os.path.join(self.config_volume, filename))
 
-    def get_volume_path(self, directory, filename):
-        return os.path.join(directory, filename)
+  def get_volume_file(self, filename, mode='r'):
+    return open(os.path.join(self.config_volume, filename), mode=mode)
 
-    def list_volume_directory(self, path):
-        dirpath = os.path.join(self.config_volume, path)
-        if not os.path.exists(dirpath):
-            return None
+  def get_volume_path(self, directory, filename):
+    return os.path.join(directory, filename)
 
-        if not os.path.isdir(dirpath):
-            return None
+  def list_volume_directory(self, path):
+    dirpath = os.path.join(self.config_volume, path)
+    if not os.path.exists(dirpath):
+      return None
 
-        return os.listdir(dirpath)
+    if not os.path.isdir(dirpath):
+      return None
 
-    def requires_restart(self, app_config):
-        file_config = self.get_config()
-        if not file_config:
-            return False
+    return os.listdir(dirpath)
 
-        for key in file_config:
-            if app_config.get(key) != file_config[key]:
-                return True
+  def requires_restart(self, app_config):
+    file_config = self.get_config()
+    if not file_config:
+      return False
 
-        return False
+    for key in file_config:
+      if app_config.get(key) != file_config[key]:
+        return True
+
+    return False

config_app/config_util/config/fileprovider.py

@@ -4,57 +4,57 @@ import logging
 from config_app.config_util.config.baseprovider import export_yaml, CannotWriteConfigException
 from config_app.config_util.config.basefileprovider import BaseFileProvider
 
-
 logger = logging.getLogger(__name__)
 
 
 def _ensure_parent_dir(filepath):
-    """ Ensures that the parent directory of the given file path exists. """
-    try:
-        parentpath = os.path.abspath(os.path.join(filepath, os.pardir))
-        if not os.path.isdir(parentpath):
-            os.makedirs(parentpath)
-    except IOError as ioe:
-        raise CannotWriteConfigException(str(ioe))
+  """ Ensures that the parent directory of the given file path exists. """
+  try:
+    parentpath = os.path.abspath(os.path.join(filepath, os.pardir))
+    if not os.path.isdir(parentpath):
+      os.makedirs(parentpath)
+  except IOError as ioe:
+    raise CannotWriteConfigException(str(ioe))
 
 
 class FileConfigProvider(BaseFileProvider):
-    """ Implementation of the config provider that reads and writes the data
-        from/to the file system. """
-    def __init__(self, config_volume, yaml_filename, py_filename):
-        super(FileConfigProvider, self).__init__(config_volume, yaml_filename, py_filename)
+  """ Implementation of the config provider that reads and writes the data
+      from/to the file system. """
 
-    @property
-    def provider_id(self):
-        return 'file'
+  def __init__(self, config_volume, yaml_filename, py_filename):
+    super(FileConfigProvider, self).__init__(config_volume, yaml_filename, py_filename)
 
-    def save_config(self, config_obj):
-        export_yaml(config_obj, self.yaml_path)
+  @property
+  def provider_id(self):
+    return 'file'
 
-    def write_volume_file(self, filename, contents):
-        filepath = os.path.join(self.config_volume, filename)
-        _ensure_parent_dir(filepath)
+  def save_config(self, config_obj):
+    export_yaml(config_obj, self.yaml_path)
 
-        try:
-            with open(filepath, mode='w') as f:
-                f.write(contents)
-        except IOError as ioe:
-            raise CannotWriteConfigException(str(ioe))
+  def write_volume_file(self, filename, contents):
+    filepath = os.path.join(self.config_volume, filename)
+    _ensure_parent_dir(filepath)
 
-        return filepath
+    try:
+      with open(filepath, mode='w') as f:
+        f.write(contents)
+    except IOError as ioe:
+      raise CannotWriteConfigException(str(ioe))
 
-    def remove_volume_file(self, filename):
-        filepath = os.path.join(self.config_volume, filename)
-        os.remove(filepath)
+    return filepath
 
-    def save_volume_file(self, filename, flask_file):
-        filepath = os.path.join(self.config_volume, filename)
-        _ensure_parent_dir(filepath)
+  def remove_volume_file(self, filename):
+    filepath = os.path.join(self.config_volume, filename)
+    os.remove(filepath)
 
-        # Write the file.
-        try:
-            flask_file.save(filepath)
-        except IOError as ioe:
-            raise CannotWriteConfigException(str(ioe))
+  def save_volume_file(self, filename, flask_file):
+    filepath = os.path.join(self.config_volume, filename)
+    _ensure_parent_dir(filepath)
 
-        return filepath
+    # Write the file.
+    try:
+      flask_file.save(filepath)
+    except IOError as ioe:
+      raise CannotWriteConfigException(str(ioe))
+
+    return filepath

config_app/config_util/config/testprovider.py

@@ -1,7 +1,6 @@
 import json
 import io
 import os
-from datetime import datetime, timedelta
 
 from config_app.config_util.config.baseprovider import BaseProvider
 
@@ -9,73 +8,73 @@ REAL_FILES = ['test/data/signing-private.gpg', 'test/data/signing-public.gpg', '
 
 
 class TestConfigProvider(BaseProvider):
-    """ Implementation of the config provider for testing. Everything is kept in-memory instead on
-        the real file system. """
-    def __init__(self):
-        self.clear()
+  """ Implementation of the config provider for testing. Everything is kept in-memory instead on
+      the real file system. """
 
-    def clear(self):
-        self.files = {}
-        self._config = {}
+  def __init__(self):
+    self.clear()
 
-    @property
-    def provider_id(self):
-        return 'test'
+  def clear(self):
+    self.files = {}
+    self._config = {}
 
-    def update_app_config(self, app_config):
-        self._config = app_config
+  @property
+  def provider_id(self):
+    return 'test'
 
-    def get_config(self):
-        if not 'config.yaml' in self.files:
-            return None
+  def update_app_config(self, app_config):
+    self._config = app_config
 
-        return json.loads(self.files.get('config.yaml', '{}'))
+  def get_config(self):
+    if not 'config.yaml' in self.files:
+      return None
 
-    def save_config(self, config_obj):
-        self.files['config.yaml'] = json.dumps(config_obj)
+    return json.loads(self.files.get('config.yaml', '{}'))
 
-    def config_exists(self):
-        return 'config.yaml' in self.files
+  def save_config(self, config_obj):
+    self.files['config.yaml'] = json.dumps(config_obj)
 
-    def volume_exists(self):
-        return True
+  def config_exists(self):
+    return 'config.yaml' in self.files
 
-    def volume_file_exists(self, filename):
-        if filename in REAL_FILES:
-            return True
+  def volume_exists(self):
+    return True
 
-        return filename in self.files
+  def volume_file_exists(self, filename):
+    if filename in REAL_FILES:
+      return True
 
-    def save_volume_file(self, filename, flask_file):
-        self.files[filename] = flask_file.read()
+    return filename in self.files
 
-    def write_volume_file(self, filename, contents):
-        self.files[filename] = contents
+  def save_volume_file(self, filename, flask_file):
+    self.files[filename] = flask_file.read()
 
-    def get_volume_file(self, filename, mode='r'):
-        if filename in REAL_FILES:
-            return open(filename, mode=mode)
+  def write_volume_file(self, filename, contents):
+    self.files[filename] = contents
 
-        return io.BytesIO(self.files[filename])
+  def get_volume_file(self, filename, mode='r'):
+    if filename in REAL_FILES:
+      return open(filename, mode=mode)
 
-    def remove_volume_file(self, filename):
-        self.files.pop(filename, None)
+    return io.BytesIO(self.files[filename])
 
-    def list_volume_directory(self, path):
-        paths = []
-        for filename in self.files:
-            if filename.startswith(path):
-                paths.append(filename[len(path)+1:])
+  def remove_volume_file(self, filename):
+    self.files.pop(filename, None)
 
-        return paths
+  def list_volume_directory(self, path):
+    paths = []
+    for filename in self.files:
+      if filename.startswith(path):
+        paths.append(filename[len(path) + 1:])
 
-    def requires_restart(self, app_config):
-        return False
+    return paths
 
-    def reset_for_test(self):
-        self._config['SUPER_USERS'] = ['devtable']
-        self.files = {}
+  def requires_restart(self, app_config):
+    return False
 
-    def get_volume_path(self, directory, filename):
-        return os.path.join(directory, filename)
+  def reset_for_test(self):
+    self._config['SUPER_USERS'] = ['devtable']
+    self.files = {}
 
+  def get_volume_path(self, directory, filename):
+    return os.path.join(directory, filename)