ref(build): give Build model awareness of what type it is and what version it is

Author: helgi

rootfs/api/models/app.py

@@ -18,7 +18,7 @@
 from api.models import UuidAuditedModel, log_event, AlreadyExists, \
     DeisException, ServiceUnavailable
 
-from api.utils import generate_app_name, app_build_type
+from api.utils import generate_app_name
 from api.models.release import Release
 from api.models.config import Config
 from api.models.domain import Domain
@@ -307,7 +307,6 @@ def scale(self, user, structure):  # noqa
 
     def _scale_pods(self, scale_types):
         release = self.release_set.latest()
-        build_type = app_build_type(release)
         for scale_type, replicas in scale_types.items():
             image = release.image
             version = "v{}".format(release.version)
@@ -319,7 +318,7 @@ def _scale_pods(self, scale_types):
                 'version': version,
                 'replicas': replicas,
                 'app_type': scale_type,
-                'build_type': build_type,
+                'build_type': release.build.type,
                 'healthcheck': release.config.healthcheck(),
                 # http://docs.deis.io/en/latest/using_deis/process-types/#web-vs-cmd-process-types
                 'routable': True if scale_type in ['web', 'cmd'] else False
@@ -356,7 +355,6 @@ def deploy(self, release):
 
         # deploy application to k8s. Also handles initial scaling
         deploys = {}
-        build_type = app_build_type(release)
         for scale_type, replicas in self.structure.items():
             deploys[scale_type] = {
                 'memory': release.config.memory,
@@ -367,7 +365,7 @@ def deploy(self, release):
                 'replicas': replicas,
                 'version': "v{}".format(release.version),
                 'app_type': scale_type,
-                'build_type': build_type,
+                'build_type': release.build.type,
                 'healthcheck': release.config.healthcheck(),
                 # http://docs.deis.io/en/latest/using_deis/process-types/#web-vs-cmd-process-types
                 'routable': True if scale_type in ['web', 'cmd'] else False,

rootfs/api/models/build.py

@@ -27,17 +27,37 @@ class Meta:
         ordering = ['-created']
         unique_together = (('app', 'uuid'),)
 
+    @property
+    def type(self):
+        """Figures out what kind of build type is being deal it with"""
+        if self.dockerfile:
+            return 'dockerfile'
+        elif self.sha:
+            return 'buildpack'
+        else:
+            # docker image (or any sort of image) used via deis pull
+            return 'image'
+
+    @property
+    def source_based(self):
+        """
+        Checks if a build is source (has a sha) based or not
+        If True then the Build is coming from the deis builder or something that
+        built from git / svn / hg / etc directly
+        """
+        return self.sha != ''
+
+    @property
+    def version(self):
+        return 'git-{}'.format(self.sha) if self.source_based else 'latest'
+
     def create(self, user, *args, **kwargs):
         latest_release = self.app.release_set.latest()
-        source_version = 'latest'
-        if self.sha:
-            source_version = 'git-{}'.format(self.sha)
-
         new_release = latest_release.new(
             user,
             build=self,
             config=latest_release.config,
-            source_version=source_version
+            source_version=self.version
         )
 
         try:
@@ -62,6 +82,7 @@ def save(self, **kwargs):
             self.app.scale(self.owner, removed)
         except Build.DoesNotExist:
             pass
+
         return super(Build, self).save(**kwargs)
 
     def __str__(self):

rootfs/api/models/release.py

@@ -45,17 +45,17 @@ def image(self):
             image = self.build.image.replace('{}/'.format(settings.REGISTRY_URL), '')
             return image.replace('{}/'.format(settings.REGISTRY_HOST), '')
 
-        if not self.build.dockerfile:
-            # Deis Pull
-            if not self.build.sha:
-                return '{}/{}:v{}'.format(settings.REGISTRY_URL, self.app.id, str(self.version))
-
+        # Sort out image information based on build type
+        if self.build.type == 'dockerfile':
+            # DockerFile
+            return '{}/{}:git-{}'.format(settings.REGISTRY_URL, self.app.id, str(self.build.sha))
+        elif self.build.type == 'image':
+            # Deis Pull, docker image in local registry
+            return '{}/{}:v{}'.format(settings.REGISTRY_URL, self.app.id, str(self.version))
+        elif self.build.type == 'buildpack':
             # Build Pack - Registry URL not prepended since slugrunner image will download slug
             return self.build.image
 
-        # DockerFile
-        return '{}/{}:git-{}'.format(settings.REGISTRY_URL, self.app.id, str(self.build.sha))
-
     def new(self, user, config, build, summary=None, source_version='latest'):
         """
         Create a new application release using the provided Build and Config
@@ -83,12 +83,12 @@ def new(self, user, config, build, summary=None, source_version='latest'):
 
         return release
 
-    def publish(self, source_version='latest'):
+    def publish(self):
         if self.build is None:
             raise DeisException('No build associated with this release to publish')
 
         # If the build has a SHA, assume it's from deis-builder and in the deis-registry already
-        if self.build.dockerfile or self.build.sha:
+        if self.build.source_based:
             return
 
         source_image = self.build.image
@@ -102,8 +102,7 @@ def publish(self, source_version='latest'):
 
         # add tag if it was not provided
         if ':' not in source_image:
-            source_tag = 'git-{}'.format(self.build.sha) if self.build.sha else source_version
-            source_image = "{}:{}".format(source_image, source_tag)
+            source_image = "{}:{}".format(source_image, self.build.version)
 
         # gather custom login information for registry if needed
         auth = None
@@ -114,7 +113,8 @@ def publish(self, source_version='latest'):
                 'email': self.owner.email
             }
 
-        deis_registry = bool(self.build.sha)
+        # if build is source based then it was pushed into the deis registry
+        deis_registry = bool(self.build.source_based)
         publish_release(source_image, self.image, deis_registry, auth)
 
     def previous(self):

rootfs/api/utils.py

@@ -109,15 +109,6 @@ def fingerprint(key):
     return ':'.join(a + b for a, b in zip(fp_plain[::2], fp_plain[1::2]))
 
 
-def app_build_type(release):
-    if not release.build.dockerfile:
-        if not release.build.sha:
-            return "deispull"
-        else:
-            return "buildpack"
-    return "dockerfile"
-
-
 def dict_merge(origin, merge):
     """
     Recursively merges dict's. not just simple a["key"] = b["key"], if