ConfigProviders abstract over path construction

Fixes issue where certs can't be uploaded in UI in k8s
This commit is contained in:
Evan Cordell 2017-05-17 08:12:09 -04:00
parent 702cdf59ff
commit 01b59e8d66
5 changed files with 32 additions and 3 deletions

View file

@ -109,6 +109,11 @@ class BaseProvider(object):
indicating that this container requires a restart.
"""
raise NotImplementedError
def get_volume_path(self, directory, file):
""" Helper for constructing file paths, which may differ between providers. For example,
kubernetes can't have subfolders in configmaps """
raise NotImplementedError
def _get_license_file(self):
""" Returns the contents of the license file. """

View file

@ -110,3 +110,6 @@ class FileConfigProvider(BaseProvider):
return True
return False
def get_volume_path(self, directory, file):
return os.path.join(directory, file)

View file

@ -54,6 +54,19 @@ class KubernetesConfigProvider(FileConfigProvider):
self._update_secret_file(filename, contents)
except IOError as ioe:
raise CannotWriteConfigException(str(ioe))
def volume_file_exists(self, filename):
secret = self._lookup_secret()
return filename in secret
def list_volume_directory(self, path):
secret = self._lookup_secret()
paths = []
for filename in secret:
if filename.startswith(path):
paths.append(filename[len(path) + 1:])
def remove_volume_file(self, filename):
super(KubernetesConfigProvider, self).remove_volume_file(filename)
@ -130,3 +143,6 @@ class KubernetesConfigProvider(FileConfigProvider):
request = Request(method, url, data=data, headers=headers)
return session.send(request.prepare(), verify=False, timeout=2)
def get_volume_path(self, directory, file):
return "_".join([directory, file])

View file

@ -1,5 +1,6 @@
import json
import io
import os
from datetime import datetime, timedelta
from util.config.provider.baseprovider import BaseProvider
@ -88,3 +89,7 @@ class TestConfigProvider(BaseProvider):
def reset_for_test(self):
self._config['SUPER_USERS'] = ['devtable']
self.files = {}
def get_volume_path(self, directory, file):
return os.path.join(directory, file)