keys: Add comments

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/keys.py b/src/buildservice/keys.py
index cde9145e7009a3858ff2ec1cf04ad80ea189f54e..83a559a8a7dc177e511fca6969c32adb122a2a5e 100644 (file)
--- a/src/buildservice/keys.py
+++ b/src/buildservice/keys.py
@@ -40,7 +40,7 @@ class Keys(base.Object):
                """
                return await asyncio.to_thread(self._create, *args, **kwargs)
 
-       def _create(self, user):
+       def _create(self, user, comment=None):
                # Launch a new Pakfire instance
                with self.backend.pakfire() as p:
                        # Generate the new key
@@ -60,14 +60,15 @@ class Keys(base.Object):
                                        created_by,
                                        public_key,
                                        secret_key,
-                                       key_id
+                                       key_id,
+                                       comment
                                )
                                VALUES
                                (
-                                       %s, %s, %s, %s
+                                       %s, %s, %s, %s, %s
                                )
                                RETURNING *
-                               """, user, public_key, secret_key, key.id,
+                               """, user, public_key, secret_key, key.id, comment,
                        )
 
        def get_by_id(self, id):
@@ -108,6 +109,12 @@ class Key(base.DataObject):
        def key_id(self):
                return self.key_id
 
+       # Comment
+
+       @property
+       def comment(self):
+               return self.data.comment
+
        # Created At
 
        @property

diff --git a/src/buildservice/repository.py b/src/buildservice/repository.py
index f9ae94b9c30e2c61a3d76bbfb1e40870303dfa79..c218314624a863108f86080cd5b21bb253a844bc 100644 (file)
--- a/src/buildservice/repository.py
+++ b/src/buildservice/repository.py
@@ -67,8 +67,13 @@ class Repositories(base.Object):
                # Generate a slug
                slug = self._make_slug(name, owner=owner)
 
+               # Generate a comment for the key
+               comment = "%s - %s" % (distro, name)
+               if owner:
+                       comment = "%s - %s" % (owner, comment)
+
                # Create a key for this repository
-               key = await self.backend.keys.create(owner)
+               key = await self.backend.keys.create(owner, comment=comment)
 
                repo = self._get_repository("""
                        INSERT INTO