Skip to content

Commit a6ee73d

Browse files
committed
style(rootfs/api): fix style.
remove lines, add lines, shorter lines, fix alignment
1 parent 90350d0 commit a6ee73d

5 files changed

Lines changed: 15 additions & 7 deletions

File tree

rootfs/api/models/app.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from api.models import UuidAuditedModel, AlreadyExists, DeisException, ServiceUnavailable
2323
from api.models.config import Config
2424
from api.models.domain import Domain
25-
from api.models.service import Service
2625
from api.models.release import Release
2726
from api.models.tls import TLS
2827
from api.models.appsettings import AppSettings
@@ -897,7 +896,6 @@ def maintenance_mode(self, mode):
897896
for svc in self.service_set.all():
898897
svc.maintenance_mode(mode)
899898

900-
901899
def routable(self, routable):
902900
"""
903901
Turn on/off if an application is publically routable

rootfs/api/models/service.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
from django.db import models
44
from django.conf import settings
55

6-
from api.models import AuditedModel, UuidAuditedModel, AlreadyExists, DeisException, ServiceUnavailable
6+
from api.models import AuditedModel, ServiceUnavailable
77
from scheduler import KubeException
88

99
logger = logging.getLogger(__name__)
1010

11+
1112
class Service(AuditedModel):
1213
owner = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
1314
app = models.ForeignKey('App', on_delete=models.CASCADE)
@@ -61,7 +62,8 @@ def delete(self, *args, **kwargs):
6162
except KubeException:
6263
# swallow exception
6364
# raise ServiceUnavailable('Kubernetes service could not be deleted') from e
64-
self.log('Kubernetes service cannot be deleted: {}'.format(svc_name), level=logging.ERROR)
65+
self.log('Kubernetes service cannot be deleted: {}'.format(svc_name),
66+
level=logging.ERROR)
6567

6668
# Delete from DB
6769
return super(Service, self).delete(*args, **kwargs)

rootfs/api/serializers.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ def ToACE(x): return idna.alabel(x).decode("utf-8", "strict")
454454

455455
return aceValue
456456

457+
457458
class ServiceSerializer(serializers.ModelSerializer):
458459
"""Serialize a :class:`~api.models.Service` model."""
459460

@@ -487,6 +488,7 @@ def validate_path_pattern(self, value):
487488

488489
return value
489490

491+
490492
class CertificateSerializer(serializers.ModelSerializer):
491493
"""Serialize a :class:`~api.models.Cert` model."""
492494

rootfs/api/urls.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,9 @@
5252
views.DomainViewSet.as_view({'post': 'create', 'get': 'list'})),
5353
# application services
5454
url(r"^apps/(?P<id>{})/services/?$".format(settings.APP_URL_REGEX),
55-
views.ServiceViewSet.as_view({'post': 'create_or_update', 'get': 'list', 'delete': 'delete'})),
55+
views.ServiceViewSet.as_view({'post': 'create_or_update',
56+
'get': 'list',
57+
'delete': 'delete'})),
5658
# application actions
5759
url(r"^apps/(?P<id>{})/scale/?$".format(settings.APP_URL_REGEX),
5860
views.AppViewSet.as_view({'post': 'scale'})),

rootfs/api/views.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,14 +371,15 @@ def get_object(self, **kwargs):
371371
ace_domain = domain
372372
return get_object_or_404(qs, domain=ace_domain)
373373

374+
374375
class ServiceViewSet(AppResourceViewSet):
375376
"""A viewset for interacting with Service objects."""
376377
model = models.Service
377378
serializer_class = serializers.ServiceSerializer
378379

379380
def list(self, *args, **kwargs):
380381
services = self.get_app().service_set.all()
381-
data = [ obj.as_dict() for obj in services ]
382+
data = [obj.as_dict() for obj in services]
382383
return Response({"services": data}, status=status.HTTP_200_OK)
383384

384385
def create_or_update(self, request, **kwargs):
@@ -393,7 +394,9 @@ def create_or_update(self, request, **kwargs):
393394
svc.path_pattern = pp
394395
svc.save()
395396
else:
396-
svc = models.Service.objects.create(owner=app.owner, app=app, procfile_type=pft, path_pattern=pp)
397+
svc = models.Service.objects.create(owner=app.owner, app=app,
398+
procfile_type=pft,
399+
path_pattern=pp)
397400
return Response(status=status.HTTP_201_CREATED)
398401

399402
def delete(self, request, **kwargs):
@@ -403,6 +406,7 @@ def delete(self, request, **kwargs):
403406
svc.delete()
404407
return Response(status=status.HTTP_204_NO_CONTENT)
405408

409+
406410
class CertificateViewSet(BaseDeisViewSet):
407411
"""A viewset for interacting with Certificate objects."""
408412
model = models.Certificate

0 commit comments

Comments
 (0)