Fix links to app logs (#736)

Author: andyhd

controlpanel/api/models/app.py

@@ -4,7 +4,11 @@
 from django_extensions.db.models import TimeStampedModel
 
 from controlpanel.api import auth0, cluster
-from controlpanel.utils import github_repository_name, s3_slugify
+from controlpanel.utils import (
+    github_repository_name,
+    s3_slugify,
+    webapp_release_name,
+)
 
 
 class App(TimeStampedModel):
@@ -30,6 +34,10 @@ def iam_role_name(self):
     def _repo_name(self):
         return github_repository_name(self.repo_url)
 
+    @property
+    def release_name(self):
+        return webapp_release_name(self._repo_name)
+
     @property
     def customers(self):
         return auth0.AuthorizationAPI().get_group_members(group_name=self.slug) or []
@@ -62,7 +70,6 @@ def save(self, *args, **kwargs):
 
         return self
 
-
     def delete(self, *args, **kwargs):
         cluster.delete_app_role(self.iam_role_name)
         super().delete(*args, **kwargs)

controlpanel/frontend/jinja2/includes/app-logs.html

@@ -65,16 +65,16 @@
       key:app_name,
       negate:!f,
       params:(
-        query:{{object.name}}-webapp,
+        query:{{app.release_name}}-webapp,
         type:phrase
       ),
       type:phrase,
-      value:{{object.name}}-webapp
+      value:{{app.release_name}}-webapp
     ),
     query:(
       match:(
         app_name:(
-          query:{{object.name}}-webapp,
+          query:{{app.release_name}}-webapp,
           type:phrase
         )
       )

controlpanel/utils.py

@@ -5,6 +5,10 @@
 from django.template.defaultfilters import slugify
 
 
+INVALID_CHARS = re.compile(r"[^-a-z0-9]")
+SURROUNDING_HYPHENS = re.compile(r"^-*|-*$")
+
+
 def github_repository_name(url):
     """
     Get the repository name from a Github URL
@@ -53,6 +57,12 @@ def sanitize_environment_variable(s):
     return name.upper().replace("-", "_")
 
 
+def webapp_release_name(repo_name):
+    name = repo_name.lower()
+    name = SURROUNDING_HYPHENS.sub("", INVALID_CHARS.sub("-", name))
+    return name[:50]
+
+
 class PatchedAsyncHttpConsumer(AsyncHttpConsumer):
     """
     Patch AsyncHttpConsumer so that it doesn't disconnect immediately