Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
feudalBackend
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
16
Issues
16
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
feudal
feudalBackend
Commits
c0173efa
Commit
c0173efa
authored
Jun 04, 2018
by
Lukas Burgey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change the API a little bit
parent
2991bcf8
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
79 additions
and
11 deletions
+79
-11
django_backend/backend/clientapi/serializers.py
django_backend/backend/clientapi/serializers.py
+3
-1
django_backend/backend/clientapi/urls.py
django_backend/backend/clientapi/urls.py
+3
-3
django_backend/backend/frontend/serializers.py
django_backend/backend/frontend/serializers.py
+34
-3
django_backend/backend/models.py
django_backend/backend/models.py
+33
-4
django_backend/backend/serializers.py
django_backend/backend/serializers.py
+6
-0
No files found.
django_backend/backend/clientapi/serializers.py
View file @
c0173efa
# we don't need to deserialize, so we do not implement the abstract methods
# pylint: disable=abstract-method
from
django_mysql.models
import
JSONField
from
rest_framework
import
serializers
from
..
import
models
,
serializers
as
backend_serializers
...
...
@@ -13,10 +14,11 @@ class ServiceSerializer(serializers.ModelSerializer):
class
UserSerializer
(
serializers
.
ModelSerializer
):
groups
=
backend_serializers
.
GroupSerializer
(
many
=
True
)
userinfo
=
JSONField
()
class
Meta
:
model
=
models
.
User
fields
=
[
'
sub'
,
'email'
,
'groups
'
]
fields
=
[
'
email'
,
'groups'
,
'userinfo
'
]
class
DeploymentSerializer
(
serializers
.
ModelSerializer
):
...
...
django_backend/backend/clientapi/urls.py
View file @
c0173efa
...
...
@@ -2,7 +2,7 @@ from django.conf.urls import url
from
.
import
views
URLPATTERNS
=
[
url
(
r
'^deployments
/
'
,
views
.
DeploymentsView
.
as_view
()),
url
(
r
'^config
/
'
,
views
.
ConfigurationView
.
as_view
()),
url
(
r
'^ack/(?P<task_id>\d+)
/
'
,
views
.
AckView
.
as_view
()),
url
(
r
'^deployments'
,
views
.
DeploymentsView
.
as_view
()),
url
(
r
'^config'
,
views
.
ConfigurationView
.
as_view
()),
url
(
r
'^ack/(?P<task_id>\d+)'
,
views
.
AckView
.
as_view
()),
]
django_backend/backend/frontend/serializers.py
View file @
c0173efa
...
...
@@ -20,10 +20,31 @@ class ServiceSerializer(serializers.ModelSerializer):
exclude
=
[]
class
DeploymentTaskItemSerializer
(
serializers
.
ModelSerializer
):
service
=
ServiceSerializer
()
key
=
backend_serializers
.
SSHPublicKeySerializerB
()
site
=
SiteSerializer
()
class
Meta
:
model
=
models
.
DeploymentTaskItem
fields
=
[
'action'
,
'key'
,
'service'
,
'site'
,
]
class
DeploymentTaskSerializer
(
serializers
.
ModelSerializer
):
key
=
backend_serializers
.
SSHPublicKeySerializerB
()
service
=
ServiceSerializer
()
class
Meta
:
model
=
models
.
DeploymentTask
fields
=
[
'action'
,
'key'
]
fields
=
[
'action'
,
'key'
,
'service'
,
]
class
DeploymentSerializer
(
serializers
.
Serializer
):
...
...
@@ -51,11 +72,21 @@ class UserSerializer(serializers.ModelSerializer):
deployments
=
DeploymentSerializer
(
many
=
True
)
auth_groups
=
backend_serializers
.
AuthGroupSerializer
(
many
=
True
)
deployment_tasks
=
DeploymentTaskSerializer
(
many
=
True
)
deployment_task_items
=
DeploymentTaskItemSerializer
(
many
=
True
)
class
Meta
:
model
=
models
.
User
fields
=
[
'id'
,
'email'
,
'userinfo'
,
'ssh_keys'
,
'groups'
,
'deployments'
,
'auth_groups'
,
'deployment_tasks'
]
fields
=
[
'id'
,
'email'
,
'userinfo'
,
'ssh_keys'
,
'groups'
,
'deployments'
,
'auth_groups'
,
'deployment_tasks'
,
'deployment_task_items'
,
]
class
ClientSerializer
(
serializers
.
HyperlinkedModelSerializer
):
...
...
django_backend/backend/models.py
View file @
c0173efa
...
...
@@ -4,6 +4,7 @@
import
json
import
logging
import
pika
from
pika.exceptions
import
ConnectionClosed
from
requests.auth
import
HTTPBasicAuth
from
django.contrib.auth.models
import
AbstractUser
,
Group
from
django.core.cache
import
cache
...
...
@@ -127,9 +128,14 @@ class RabbitMQInstance(SingletonModel):
@
property
def
_channel
(
self
):
channel
=
self
.
_connection
.
channel
()
channel
.
confirm_delivery
()
return
channel
try
:
channel
=
self
.
_connection
.
channel
()
channel
.
confirm_delivery
()
return
channel
except
ConnectionClosed
as
exception
:
LOGGER
.
error
(
self
.
msg
(
'ConnectionClosed: '
+
str
(
exception
)))
self
.
_init_connection
()
return
self
.
_channel
def
_publish
(
self
,
exchange
,
routing_key
,
body
):
channel
=
self
.
_channel
...
...
@@ -647,6 +653,7 @@ class DeploymentTask(models.Model):
deploy
=
DeploymentTaskItem
(
task
=
task
,
site
=
site
,
user
=
deployment
.
user
)
deploy
.
save
()
LOGGER
.
debug
(
deploy
.
msg
(
'generated'
))
...
...
@@ -674,6 +681,7 @@ class DeploymentTask(models.Model):
deploy
=
DeploymentTaskItem
(
task
=
task
,
site
=
site
,
user
=
deployment
.
user
)
deploy
.
save
()
LOGGER
.
debug
(
deploy
.
msg
(
'generated'
))
...
...
@@ -736,7 +744,11 @@ class DeploymentTask(models.Model):
if
self
.
action
==
'withdraw'
:
self
.
key
.
try_final_deletion
()
message
=
'Completed: '
+
str
(
self
.
action
)
+
' '
+
str
(
self
.
key
)
+
' '
+
str
(
self
.
site
)
message
=
'Completed: {} {} @ {}'
.
format
(
self
.
action
,
self
.
key
,
self
.
service
,
)
from
.frontend.views
import
user_state_dict
content
=
{
...
...
@@ -760,6 +772,23 @@ class DeploymentTaskItem(models.Model):
related_name
=
'task_items'
,
on_delete
=
models
.
CASCADE
,
)
user
=
models
.
ForeignKey
(
User
,
related_name
=
'deployment_task_items'
,
on_delete
=
models
.
CASCADE
,
)
@
property
def
service
(
self
):
return
self
.
task
.
service
@
property
def
key
(
self
):
return
self
.
task
.
key
@
property
def
action
(
self
):
return
self
.
deployment
.
key
def
__str__
(
self
):
return
"{}@{}#{}"
.
format
(
...
...
django_backend/backend/serializers.py
View file @
c0173efa
...
...
@@ -22,3 +22,9 @@ class SSHPublicKeySerializer(serializers.ModelSerializer):
class
Meta
:
model
=
SSHPublicKey
fields
=
[
'id'
,
'name'
,
'key'
]
class
SSHPublicKeySerializerB
(
serializers
.
ModelSerializer
):
class
Meta
:
model
=
SSHPublicKey
fields
=
[
'id'
,
'name'
]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment