vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ConfigProviders abstract over path construction

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

6
endpoints/api/superuser.py
View file

@ -852,7 +852,7 @@ class SuperUserCustomCertificates(ApiResource):
cert_views = []
for extra_cert_path in extra_certs_found:
try:
cert_full_path = os.path.join(EXTRA_CA_DIRECTORY, extra_cert_path)
cert_full_path = config_provider.get_volume_path(EXTRA_CA_DIRECTORY, extra_cert_path)
with config_provider.get_volume_file(cert_full_path) as f:
certificate = load_certificate(f.read())
cert_views.append({
@ -900,7 +900,7 @@ class SuperUserCustomCertificate(ApiResource):
abort(400)
logger.debug('Saving custom certificate %s', certpath)
cert_full_path = os.path.join(EXTRA_CA_DIRECTORY, certpath)
cert_full_path = config_provider.get_volume_path(EXTRA_CA_DIRECTORY, certpath)
config_provider.save_volume_file(cert_full_path, uploaded_file)
logger.debug('Saved custom certificate %s', certpath)
@ -934,7 +934,7 @@ class SuperUserCustomCertificate(ApiResource):
@verify_not_prod
def delete(self, certpath):
if SuperUserPermission().can():
cert_full_path = os.path.join(EXTRA_CA_DIRECTORY, certpath)
cert_full_path = config_provider.get_volume_path(EXTRA_CA_DIRECTORY, certpath)
config_provider.remove_volume_file(cert_full_path)
return '', 204