Skip to content

Commit b09b511

Browse files
committed
Merge pull request #3707 from mboersma/urls-cleanup
ref(controller): add urls.py docstring and remove unused arg
2 parents 4287fc0 + 6510545 commit b09b511

1 file changed

Lines changed: 26 additions & 23 deletions

File tree

controller/api/urls.py

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
"""
2+
URL routing patterns for the Deis REST API.
3+
"""
4+
15
from __future__ import unicode_literals
26

37
from django.conf import settings
@@ -13,59 +17,58 @@
1317
'',
1418
url(r'^', include(router.urls)),
1519
# application release components
16-
url(r'^apps/(?P<id>{})/config/?'.format(settings.APP_URL_REGEX),
20+
url(r"^apps/(?P<id>{})/config/?".format(settings.APP_URL_REGEX),
1721
views.ConfigViewSet.as_view({'get': 'retrieve', 'post': 'create'})),
18-
url(r'^apps/(?P<id>{})/builds/(?P<uuid>[-_\w]+)/?'.format(settings.APP_URL_REGEX),
22+
url(r"^apps/(?P<id>{})/builds/(?P<uuid>[-_\w]+)/?".format(settings.APP_URL_REGEX),
1923
views.BuildViewSet.as_view({'get': 'retrieve'})),
20-
url(r'^apps/(?P<id>{})/builds/?'.format(settings.APP_URL_REGEX),
24+
url(r"^apps/(?P<id>{})/builds/?".format(settings.APP_URL_REGEX),
2125
views.BuildViewSet.as_view({'get': 'list', 'post': 'create'})),
22-
url(r'^apps/(?P<id>{})/releases/v(?P<version>[0-9]+)/?'.format(settings.APP_URL_REGEX),
26+
url(r"^apps/(?P<id>{})/releases/v(?P<version>[0-9]+)/?".format(settings.APP_URL_REGEX),
2327
views.ReleaseViewSet.as_view({'get': 'retrieve'})),
24-
url(r'^apps/(?P<id>{})/releases/rollback/?'.format(settings.APP_URL_REGEX),
28+
url(r"^apps/(?P<id>{})/releases/rollback/?".format(settings.APP_URL_REGEX),
2529
views.ReleaseViewSet.as_view({'post': 'rollback'})),
26-
url(r'^apps/(?P<id>{})/releases/?'.format(settings.APP_URL_REGEX),
30+
url(r"^apps/(?P<id>{})/releases/?".format(settings.APP_URL_REGEX),
2731
views.ReleaseViewSet.as_view({'get': 'list'})),
2832
# application infrastructure
29-
url(r'^apps/(?P<id>{})/containers/restart/?'.format(settings.APP_URL_REGEX),
33+
url(r"^apps/(?P<id>{})/containers/restart/?".format(settings.APP_URL_REGEX),
3034
views.ContainerViewSet.as_view({'post': 'restart'})),
31-
url(r'^apps/(?P<id>{})/containers/(?P<type>[-_\w.]+)/restart/?'.format(settings.APP_URL_REGEX),
35+
url(r"^apps/(?P<id>{})/containers/(?P<type>[-_\w.]+)/restart/?".format(settings.APP_URL_REGEX),
3236
views.ContainerViewSet.as_view({'post': 'restart'})),
33-
url(r'^apps/(?P<id>{})/containers/(?P<type>[-_\w]+)/(?P<num>[-_\w]+)/restart/?'.format(
37+
url(r"^apps/(?P<id>{})/containers/(?P<type>[-_\w]+)/(?P<num>[-_\w]+)/restart/?".format(
3438
settings.APP_URL_REGEX),
3539
views.ContainerViewSet.as_view({'post': 'restart'})),
36-
url(r'^apps/(?P<id>{})/containers/(?P<type>[-_\w]+)/(?P<num>[-_\w]+)/?'.format(
40+
url(r"^apps/(?P<id>{})/containers/(?P<type>[-_\w]+)/(?P<num>[-_\w]+)/?".format(
3741
settings.APP_URL_REGEX),
3842
views.ContainerViewSet.as_view({'get': 'retrieve'})),
39-
url(r'^apps/(?P<id>{})/containers/(?P<type>[-_\w.]+)/?'.format(settings.APP_URL_REGEX),
43+
url(r"^apps/(?P<id>{})/containers/(?P<type>[-_\w.]+)/?".format(settings.APP_URL_REGEX),
4044
views.ContainerViewSet.as_view({'get': 'list'})),
41-
url(r'^apps/(?P<id>{})/containers/?'.format(settings.APP_URL_REGEX),
45+
url(r"^apps/(?P<id>{})/containers/?".format(settings.APP_URL_REGEX),
4246
views.ContainerViewSet.as_view({'get': 'list'})),
4347
# application domains
44-
url(r'^apps/(?P<id>{})/domains/(?P<domain>[-\._\w]+)/?'.format(settings.APP_URL_REGEX),
48+
url(r"^apps/(?P<id>{})/domains/(?P<domain>[-\._\w]+)/?".format(settings.APP_URL_REGEX),
4549
views.DomainViewSet.as_view({'delete': 'destroy'})),
46-
url(r'^apps/(?P<id>{})/domains/?'.format(settings.APP_URL_REGEX),
50+
url(r"^apps/(?P<id>{})/domains/?".format(settings.APP_URL_REGEX),
4751
views.DomainViewSet.as_view({'post': 'create', 'get': 'list'})),
4852
# application actions
49-
url(r'^apps/(?P<id>{})/scale/?'.format(settings.APP_URL_REGEX),
53+
url(r"^apps/(?P<id>{})/scale/?".format(settings.APP_URL_REGEX),
5054
views.AppViewSet.as_view({'post': 'scale'})),
51-
url(r'^apps/(?P<id>{})/logs/?'.format(settings.APP_URL_REGEX),
55+
url(r"^apps/(?P<id>{})/logs/?".format(settings.APP_URL_REGEX),
5256
views.AppViewSet.as_view({'get': 'logs'})),
53-
url(r'^apps/(?P<id>{})/run/?'.format(settings.APP_URL_REGEX),
57+
url(r"^apps/(?P<id>{})/run/?".format(settings.APP_URL_REGEX),
5458
views.AppViewSet.as_view({'post': 'run'})),
5559
# apps sharing
56-
url(r'^apps/(?P<id>{})/perms/(?P<username>[-_\w]+)/?'.format(settings.APP_URL_REGEX),
60+
url(r"^apps/(?P<id>{})/perms/(?P<username>[-_\w]+)/?".format(settings.APP_URL_REGEX),
5761
views.AppPermsViewSet.as_view({'delete': 'destroy'})),
58-
url(r'^apps/(?P<id>{})/perms/?'.format(settings.APP_URL_REGEX),
62+
url(r"^apps/(?P<id>{})/perms/?".format(settings.APP_URL_REGEX),
5963
views.AppPermsViewSet.as_view({'get': 'list', 'post': 'create'})),
6064
# apps base endpoint
61-
url(r'^apps/(?P<id>{})/?'.format(settings.APP_URL_REGEX),
65+
url(r"^apps/(?P<id>{})/?".format(settings.APP_URL_REGEX),
6266
views.AppViewSet.as_view({'get': 'retrieve', 'delete': 'destroy'})),
6367
url(r'^apps/?',
6468
views.AppViewSet.as_view({'get': 'list', 'post': 'create'})),
6569
# key
6670
url(r'^keys/(?P<id>.+)/?',
67-
views.KeyViewSet.as_view({
68-
'get': 'retrieve', 'delete': 'destroy'})),
71+
views.KeyViewSet.as_view({'get': 'retrieve', 'delete': 'destroy'})),
6972
url(r'^keys/?',
7073
views.KeyViewSet.as_view({'get': 'list', 'post': 'create'})),
7174
# hooks
@@ -89,7 +92,7 @@
8992
views.AdminPermsViewSet.as_view({'delete': 'destroy'})),
9093
url(r'^admin/perms/?',
9194
views.AdminPermsViewSet.as_view({'get': 'list', 'post': 'create'})),
92-
url(r'^certs/(?P<common_name>[-_*.\w]+)/?'.format(settings.APP_URL_REGEX),
95+
url(r'^certs/(?P<common_name>[-_*.\w]+)/?',
9396
views.CertificateViewSet.as_view({'get': 'retrieve', 'delete': 'destroy'})),
9497
url(r'^certs/?',
9598
views.CertificateViewSet.as_view({'get': 'list', 'post': 'create'})),

0 commit comments

Comments
 (0)