Merge pull request #346 from helgi/slug_url

feat(builder): add the ability to optionally pass in slug_url in build hook

Author: helgi

rootfs/api/migrations/0005_auto_20160208_2156.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.1 on 2016-02-08 21:56
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0004_auto_20160124_2134'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='build',
+            name='image',
+            field=models.TextField(),
+        ),
+    ]

rootfs/api/models/app.py

@@ -149,16 +149,19 @@ def scale(self, user, structure):  # noqa
         """Scale containers up or down to match requested structure."""
         if self.release_set.latest().build is None:
             raise EnvironmentError('No build associated with this release')
+
         requested_structure = structure.copy()
         release = self.release_set.latest()
         # test for available process types
         available_process_types = release.build.procfile or {}
         for container_type in requested_structure:
             if container_type == 'cmd':
                 continue  # allow docker cmd types in case we don't have the image source
+
             if container_type not in available_process_types:
                 raise EnvironmentError(
                     'Container type {} does not exist in application'.format(container_type))
+
         msg = '{} scaled containers '.format(user.username) + ' '.join(
             "{}={}".format(k, v) for k, v in list(requested_structure.items()))
         log_event(self, msg)
@@ -177,12 +180,14 @@ def scale(self, user, structure):  # noqa
             diff = requested - len(containers)
             if diff == 0:
                 continue
+
             changed = True
             scale_types[container_type] = requested
             while diff < 0:
                 c = containers.pop()
                 to_remove.append(c)
                 diff += 1
+
             while diff > 0:
                 # create a database record
                 c = Container.objects.create(owner=self.owner,
@@ -200,8 +205,10 @@ def scale(self, user, structure):  # noqa
             else:
                 if to_add:
                     self._start_containers(to_add)
+
                 if to_remove:
                     self._destroy_containers(to_remove)
+
         # save new structure to the database
         vals = self.container_set.exclude(type='run').values(
             'type').annotate(Count('pk')).order_by()

rootfs/api/models/build.py

@@ -12,7 +12,7 @@ class Build(UuidAuditedModel):
 
     owner = models.ForeignKey(settings.AUTH_USER_MODEL)
     app = models.ForeignKey('App')
-    image = models.CharField(max_length=256)
+    image = models.TextField()
 
     # optional fields populated by builder
     sha = models.CharField(max_length=40, blank=True)

rootfs/api/models/release.py

@@ -32,8 +32,15 @@ def __str__(self):
 
     @property
     def image(self):
-        if not self.build.dockerfile and not self.build.sha:
-            return '{}:v{}'.format(self.app.id, str(self.version))
+        if not self.build.dockerfile:
+            # Deis Pull
+            if not self.build.sha:
+                return '{}:v{}'.format(self.app.id, str(self.version))
+            else:
+                # Build Pack
+                return self.build.image
+
+        # DockerFile
         return '{}:git-{}'.format(self.app.id, str(self.build.sha))
 
     def new(self, user, config, build, summary=None, source_version='latest'):

rootfs/api/tests/test_hooks.py

@@ -192,6 +192,30 @@ def test_build_hook(self):
         self.assertIn('release', response.data)
         self.assertIn('version', response.data['release'])
 
+    @mock.patch('requests.post', mock_status_ok)
+    def test_build_hook_slug_url(self):
+        """Test creating a slug_url build via an API Hook"""
+        url = '/v2/apps'
+        response = self.client.post(url, HTTP_AUTHORIZATION='token {}'.format(self.token))
+        self.assertEqual(response.status_code, 201)
+        app_id = response.data['id']
+        build = {'username': 'autotest', 'app': app_id}
+        url = '/v2/hooks/builds'.format(**locals())
+        body = {'receive_user': 'autotest',
+                'receive_repo': app_id,
+                'image': 'http://example.com/slugs/foo-12345354.tar.gz'}
+
+        # post the build without an auth token
+        response = self.client.post(url, json.dumps(body), content_type='application/json')
+        self.assertEqual(response.status_code, 401)
+
+        # post the build with the builder auth key
+        response = self.client.post(url, json.dumps(body), content_type='application/json',
+                                    HTTP_X_DEIS_BUILDER_AUTH=settings.BUILDER_KEY)
+        self.assertEqual(response.status_code, 200)
+        self.assertIn('release', response.data)
+        self.assertIn('version', response.data['release'])
+
     def test_build_hook_procfile(self):
         """Test creating a Procfile build via an API Hook"""
         url = '/v2/apps'

rootfs/deis/settings.py

@@ -273,12 +273,6 @@
 REGISTRY_PORT = os.environ.get('DEIS_REGISTRY_SERVICE_PORT', 5000)
 REGISTRY_URL = '{}:{}'.format(REGISTRY_HOST, REGISTRY_PORT)
 
-BUILDER_HOST = os.environ.get('DEIS_BUILDER_SERVICE_HOST', '127.0.0.1')
-MINIO_HOST = os.environ.get('DEIS_MINIO_SERVICE_HOST', BUILDER_HOST)
-MINIO_PORT = os.environ.get('DEIS_MINIO_SERVICE_PORT', 3000)
-S3EP_HOST = os.environ.get('DEIS_OUTSIDE_STORAGE_HOST', MINIO_HOST)
-S3EP_PORT = os.environ.get('DEIS_OUTSIDE_STORAGE_PORT', MINIO_PORT)
-S3EP = '{}:{}'.format(S3EP_HOST, S3EP_PORT)
 # logger settings
 LOGGER_HOST = os.environ.get('DEIS_LOGGER_SERVICE_HOST', '127.0.0.1')
 LOGGER_PORT = os.environ.get('DEIS_LOGGER_PORT_8088_TCP_PORT', 8088)

rootfs/scheduler/__init__.py

@@ -605,11 +605,8 @@ def _create_rc(self, name, image, command, **kwargs):  # noqa
         TEMPLATE = RCD_TEMPLATE
 
         # Check if it is a slug builder image.
-        # Example format: golden-earrings:git-5450cbcdaaf9afe6fadd219c94ac9c449bd62413s
         if kwargs.get('build_type') == "buildpack":
-            imgurl = 'http://{}/git/home/{}/push/slug.tgz'.format(
-                settings.S3EP,
-                image)
+            imgurl = image
             TEMPLATE = RCB_TEMPLATE
 
         l = {