Skip to content

Commit e639e2a

Browse files
helgihelgi
committed
Merge pull request #90 from helgi/django_1.7
[WIP] feat(*): update from django 1.6 to 1.7
2 parents d7e2a60 + 4d5a9c2 commit e639e2a

33 files changed

Lines changed: 226 additions & 5136 deletions

‎rootfs/api/migrations/0001_initial.py‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
import jsonfield.fields
6+
import api.models
7+
import api.fields
8+
from django.conf import settings
9+
10+
11+
class Migration(migrations.Migration):
12+
13+
dependencies = [
14+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
15+
]
16+
17+
operations = [
18+
migrations.CreateModel(
19+
name='App',
20+
fields=[
21+
('uuid', api.fields.UuidField(auto_created=True, primary_key=True, serialize=False, editable=False, max_length=32, unique=True, verbose_name='UUID')),
22+
('created', models.DateTimeField(auto_now_add=True)),
23+
('updated', models.DateTimeField(auto_now=True)),
24+
('id', models.SlugField(max_length=24, unique=True, null=True, validators=[api.models.validate_id_is_docker_compatible, api.models.validate_reserved_names])),
25+
('structure', jsonfield.fields.JSONField(default={}, blank=True, validators=[api.models.validate_app_structure])),
26+
('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
27+
],
28+
options={
29+
'permissions': (('use_app', 'Can use app'),),
30+
},
31+
bases=(models.Model,),
32+
),
33+
migrations.CreateModel(
34+
name='Build',
35+
fields=[
36+
('uuid', api.fields.UuidField(auto_created=True, primary_key=True, serialize=False, editable=False, max_length=32, unique=True, verbose_name='UUID')),
37+
('created', models.DateTimeField(auto_now_add=True)),
38+
('updated', models.DateTimeField(auto_now=True)),
39+
('image', models.CharField(max_length=256)),
40+
('sha', models.CharField(max_length=40, blank=True)),
41+
('procfile', jsonfield.fields.JSONField(default={}, blank=True)),
42+
('dockerfile', models.TextField(blank=True)),
43+
('app', models.ForeignKey(to='api.App')),
44+
('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
45+
],
46+
options={
47+
'ordering': ['-created'],
48+
'get_latest_by': 'created',
49+
},
50+
bases=(models.Model,),
51+
),
52+
migrations.CreateModel(
53+
name='Certificate',
54+
fields=[
55+
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
56+
('created', models.DateTimeField(auto_now_add=True)),
57+
('updated', models.DateTimeField(auto_now=True)),
58+
('certificate', models.TextField(validators=[api.models.validate_certificate])),
59+
('key', models.TextField()),
60+
('common_name', models.TextField(unique=True)),
61+
('expires', models.DateTimeField()),
62+
('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
63+
],
64+
options={
65+
'abstract': False,
66+
},
67+
bases=(models.Model,),
68+
),
69+
migrations.CreateModel(
70+
name='Config',
71+
fields=[
72+
('uuid', api.fields.UuidField(auto_created=True, primary_key=True, serialize=False, editable=False, max_length=32, unique=True, verbose_name='UUID')),
73+
('created', models.DateTimeField(auto_now_add=True)),
74+
('updated', models.DateTimeField(auto_now=True)),
75+
('values', jsonfield.fields.JSONField(default={}, blank=True)),
76+
('memory', jsonfield.fields.JSONField(default={}, blank=True)),
77+
('cpu', jsonfield.fields.JSONField(default={}, blank=True)),
78+
('tags', jsonfield.fields.JSONField(default={}, blank=True)),
79+
('app', models.ForeignKey(to='api.App')),
80+
('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
81+
],
82+
options={
83+
'ordering': ['-created'],
84+
'get_latest_by': 'created',
85+
},
86+
bases=(models.Model,),
87+
),
88+
migrations.CreateModel(
89+
name='Container',
90+
fields=[
91+
('uuid', api.fields.UuidField(auto_created=True, primary_key=True, serialize=False, editable=False, max_length=32, unique=True, verbose_name='UUID')),
92+
('created', models.DateTimeField(auto_now_add=True)),
93+
('updated', models.DateTimeField(auto_now=True)),
94+
('type', models.CharField(max_length=128)),
95+
('num', models.PositiveIntegerField()),
96+
('app', models.ForeignKey(to='api.App')),
97+
('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
98+
],
99+
options={
100+
'ordering': ['created'],
101+
'get_latest_by': '-created',
102+
},
103+
bases=(models.Model,),
104+
),
105+
migrations.CreateModel(
106+
name='Domain',
107+
fields=[
108+
('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
109+
('created', models.DateTimeField(auto_now_add=True)),
110+
('updated', models.DateTimeField(auto_now=True)),
111+
('domain', models.TextField(unique=True)),
112+
('app', models.ForeignKey(to='api.App')),
113+
('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
114+
],
115+
options={
116+
'abstract': False,
117+
},
118+
bases=(models.Model,),
119+
),
120+
migrations.CreateModel(
121+
name='Key',
122+
fields=[
123+
('uuid', api.fields.UuidField(auto_created=True, primary_key=True, serialize=False, editable=False, max_length=32, unique=True, verbose_name='UUID')),
124+
('created', models.DateTimeField(auto_now_add=True)),
125+
('updated', models.DateTimeField(auto_now=True)),
126+
('id', models.CharField(max_length=128)),
127+
('public', models.TextField(unique=True, validators=[api.models.validate_base64])),
128+
('fingerprint', models.CharField(max_length=128)),
129+
('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
130+
],
131+
options={
132+
'verbose_name': 'SSH Key',
133+
},
134+
bases=(models.Model,),
135+
),
136+
migrations.CreateModel(
137+
name='Push',
138+
fields=[
139+
('uuid', api.fields.UuidField(auto_created=True, primary_key=True, serialize=False, editable=False, max_length=32, unique=True, verbose_name='UUID')),
140+
('created', models.DateTimeField(auto_now_add=True)),
141+
('updated', models.DateTimeField(auto_now=True)),
142+
('sha', models.CharField(max_length=40)),
143+
('fingerprint', models.CharField(max_length=255)),
144+
('receive_user', models.CharField(max_length=255)),
145+
('receive_repo', models.CharField(max_length=255)),
146+
('ssh_connection', models.CharField(max_length=255)),
147+
('ssh_original_command', models.CharField(max_length=255)),
148+
('app', models.ForeignKey(to='api.App')),
149+
('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
150+
],
151+
options={
152+
'ordering': ['-created'],
153+
'get_latest_by': 'created',
154+
},
155+
bases=(models.Model,),
156+
),
157+
migrations.CreateModel(
158+
name='Release',
159+
fields=[
160+
('uuid', api.fields.UuidField(auto_created=True, primary_key=True, serialize=False, editable=False, max_length=32, unique=True, verbose_name='UUID')),
161+
('created', models.DateTimeField(auto_now_add=True)),
162+
('updated', models.DateTimeField(auto_now=True)),
163+
('version', models.PositiveIntegerField()),
164+
('summary', models.TextField(null=True, blank=True)),
165+
('app', models.ForeignKey(to='api.App')),
166+
('build', models.ForeignKey(to='api.Build', null=True)),
167+
('config', models.ForeignKey(to='api.Config')),
168+
('owner', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
169+
],
170+
options={
171+
'ordering': ['-created'],
172+
'get_latest_by': 'created',
173+
},
174+
bases=(models.Model,),
175+
),
176+
migrations.AlterUniqueTogether(
177+
name='release',
178+
unique_together=set([('app', 'version')]),
179+
),
180+
migrations.AlterUniqueTogether(
181+
name='push',
182+
unique_together=set([('app', 'uuid')]),
183+
),
184+
migrations.AlterUniqueTogether(
185+
name='key',
186+
unique_together=set([('owner', 'fingerprint')]),
187+
),
188+
migrations.AddField(
189+
model_name='container',
190+
name='release',
191+
field=models.ForeignKey(to='api.Release'),
192+
preserve_default=True,
193+
),
194+
migrations.AlterUniqueTogether(
195+
name='config',
196+
unique_together=set([('app', 'uuid')]),
197+
),
198+
migrations.AlterUniqueTogether(
199+
name='build',
200+
unique_together=set([('app', 'uuid')]),
201+
),
202+
]

rootfs/api/south_migrations/__init__.py renamed to rootfs/api/migrations/__init__.py

File renamed without changes.

‎rootfs/api/models.py‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from threading import Thread
1717

1818
from django.conf import settings
19-
from django.contrib.auth import get_user_model
2019
from django.core.exceptions import ValidationError, SuspiciousOperation
2120
from django.db import models
2221
from django.db.models import Count
@@ -34,6 +33,7 @@
3433
from utils import dict_diff, dict_merge, fingerprint
3534

3635

36+
User = settings.AUTH_USER_MODEL
3737
logger = logging.getLogger(__name__)
3838

3939

@@ -126,16 +126,6 @@ class Meta:
126126
abstract = True
127127

128128

129-
def select_app_name():
130-
"""Select a unique randomly generated app name"""
131-
name = utils.generate_app_name()
132-
133-
while App.objects.filter(id=name).exists():
134-
name = utils.generate_app_name()
135-
136-
return name
137-
138-
139129
class UuidAuditedModel(AuditedModel):
140130
"""Add a UUID primary key to an :class:`AuditedModel`."""
141131

@@ -153,21 +143,39 @@ class App(UuidAuditedModel):
153143
"""
154144

155145
owner = models.ForeignKey(settings.AUTH_USER_MODEL)
156-
id = models.SlugField(max_length=24, unique=True, default=select_app_name,
146+
id = models.SlugField(max_length=24, unique=True, null=True,
157147
validators=[validate_id_is_docker_compatible,
158148
validate_reserved_names])
159149
structure = JSONField(default={}, blank=True, validators=[validate_app_structure])
160150

161151
class Meta:
162152
permissions = (('use_app', 'Can use app'),)
163153

154+
@property
155+
def select_app_name(self):
156+
"""Select a unique randomly generated app name"""
157+
name = utils.generate_app_name()
158+
159+
while App.objects.filter(id=name).exists():
160+
name = utils.generate_app_name()
161+
162+
return name
163+
164164
@property
165165
def _scheduler(self):
166166
mod = importlib.import_module(settings.SCHEDULER_MODULE)
167167
return mod.SchedulerClient(settings.SCHEDULER_URL,
168168
settings.SCHEDULER_AUTH,
169169
settings.SCHEDULER_OPTIONS)
170170

171+
def save(self, **kwargs):
172+
if not self.id:
173+
self.id = utils.generate_app_name()
174+
while App.objects.filter(id=self.id).exists():
175+
self.id = utils.generate_app_name()
176+
177+
return super(App, self).save(**kwargs)
178+
171179
def __str__(self):
172180
return self.id
173181

@@ -1218,7 +1226,7 @@ def _etcd_purge_cert(**kwargs):
12181226

12191227

12201228
# automatically generate a new token on creation
1221-
@receiver(post_save, sender=get_user_model())
1229+
@receiver(post_save, sender=User)
12221230
def create_auth_token(sender, instance=None, created=False, **kwargs):
12231231
if created:
12241232
Token.objects.create(user=instance)
@@ -1230,7 +1238,7 @@ def create_auth_token(sender, instance=None, created=False, **kwargs):
12301238
if _etcd_client:
12311239
post_save.connect(_etcd_publish_key, sender=Key, dispatch_uid='api.models')
12321240
post_delete.connect(_etcd_purge_key, sender=Key, dispatch_uid='api.models')
1233-
post_delete.connect(_etcd_purge_user, sender=get_user_model(), dispatch_uid='api.models')
1241+
post_delete.connect(_etcd_purge_user, sender=User, dispatch_uid='api.models')
12341242
post_save.connect(_etcd_publish_app, sender=App, dispatch_uid='api.models')
12351243
post_delete.connect(_etcd_purge_app, sender=App, dispatch_uid='api.models')
12361244
post_save.connect(_etcd_publish_cert, sender=Certificate, dispatch_uid='api.models')

0 commit comments

Comments
 (0)