fix(app): an app can now be removed from the database even if the namespace for it was already deleted (#1101)

Fixes #1100

Author: helgi

rootfs/api/models/app.py

@@ -242,16 +242,25 @@ def delete(self, *args, **kwargs):
         """Delete this application including all containers"""
         self.log("deleting environment")
         try:
-            self._scheduler.ns.delete(self.id)
+            # check if namespace exists
+            self._scheduler.ns.get(self.id)
 
-            # wait 30 seconds for termination
-            for _ in range(30):
-                try:
-                    self._scheduler.ns.get(self.id)
-                except KubeException:
-                    break
-        except KubeException as e:
-            raise ServiceUnavailable('Could not delete Kubernetes Namespace {}'.format(self.id)) from e  # noqa
+            try:
+                self._scheduler.ns.delete(self.id)
+
+                # wait 30 seconds for termination
+                for _ in range(30):
+                    try:
+                        self._scheduler.ns.get(self.id)
+                    except KubeHTTPException as e:
+                        # only break out on a 404
+                        if e.response.status_code == 404:
+                            break
+            except KubeException as e:
+                raise ServiceUnavailable('Could not delete Kubernetes Namespace {} within 30 seconds'.format(self.id)) from e  # noqa
+        except KubeHTTPException:
+            # it's fine if the namespace does not exist - delete app from the DB
+            pass
 
         self._clean_app_logs()
         return super(App, self).delete(*args, **kwargs)

rootfs/api/tests/test_app.py

@@ -17,7 +17,7 @@
 from rest_framework.authtoken.models import Token
 
 from api.models import App, Config
-from scheduler import KubeException
+from scheduler import KubeException, KubeHTTPException
 
 from api.exceptions import DeisException
 from api.tests import adapter, mock_port, DeisTestCase
@@ -101,7 +101,7 @@ def test_app_logs(self, mock_requests, mock_get):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 204, response.content)
 
-        # test logs - 404 from deis-logger
+        # test logs -  from deis-logger
         mock_response.status_code = 404
         response = self.client.get(url)
         self.assertEqual(response.status_code, 204, response.content)
@@ -405,6 +405,33 @@ def test_app_delete_failure_kubernetes_destroy(self, mock_requests):
             response = self.client.delete('/v2/apps/{}'.format(app_id))
             self.assertEqual(response.status_code, 503, response.data)
 
+    def test_app_delete_missing_namespace(self, mock_requests):
+        """
+        Create an app and then delete but have namespace missing
+        Should still succeed
+        """
+        # create
+        app_id = self.create_app()
+
+        with mock.patch('scheduler.resources.namespace.Namespace.get') as mock_kube:
+            # instead of full request mocking, fake it out in a simple way
+            class Response(object):
+                def json(self):
+                    return '{}'
+
+            response = Response()
+            response.status_code = 404
+            response.reason = "Not Found"
+            kube_exception = KubeHTTPException(response, 'big boom')
+            mock_kube.side_effect = kube_exception
+
+            response = self.client.delete('/v2/apps/{}'.format(app_id))
+            self.assertEqual(response.status_code, 204, response.data)
+
+        # verify that app is gone
+        response = self.client.get('/v2/apps/{}'.format(app_id))
+        self.assertEqual(response.status_code, 404, response.data)
+
     def test_app_verify_application_health_success(self, mock_requests):
         """
         Create an application which in turn causes a health check to run against