Skip to content

Commit 2f5c019

Browse files
author
Matthew Fisher
authored
fix(api): create TLS object on app create (#1043)
This PR creates a TLS object when an application is created, fixing the issue where a server error is shown after `deis tls:info` is called after `deis create`.
1 parent 98d809a commit 2f5c019

2 files changed

Lines changed: 16 additions & 0 deletions

File tree

rootfs/api/models/app.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
from api.models.release import Release
2727
from api.models.config import Config
2828
from api.models.domain import Domain
29+
from api.models.tls import TLS
2930
from api.models.appsettings import AppSettings
3031

3132
from scheduler import KubeHTTPException, KubeException
@@ -228,6 +229,10 @@ def create(self, *args, **kwargs): # noqa
228229
self.appsettings_set.latest()
229230
except AppSettings.DoesNotExist:
230231
AppSettings.objects.create(owner=self.owner, app=self)
232+
try:
233+
self.tls_set.latest()
234+
except TLS.DoesNotExist:
235+
TLS.objects.create(owner=self.owner, app=self)
231236
# Attach the platform specific application sub domain to the k8s service
232237
# Only attach it on first release in case a customer has remove the app domain
233238
if rel.version == 1 and not Domain.objects.filter(domain=self.id).exists():

rootfs/api/tests/test_tls.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,14 @@ def test_tls_enforced(self, mock_requests):
6161
'/v2/apps/{app_id}/tls'.format(**locals()),
6262
data)
6363
self.assertEqual(response.status_code, 400, response.data)
64+
65+
def test_tls_created_on_app_create(self, mock_requests):
66+
"""
67+
Ensure that a TLS object is created for an App with default values.
68+
69+
See https://github.com/deis/controller/issues/1042
70+
"""
71+
app_id = self.create_app()
72+
response = self.client.get('/v2/apps/{}/tls'.format(app_id))
73+
self.assertEqual(response.status_code, 200, response.data)
74+
self.assertEqual(response.data['https_enforced'], None)

0 commit comments

Comments
 (0)