Merge pull request #1037 from Kwaizer/pgp_key

Add new parameter to platform

Author: Korulag

alws/alembic/versions/764a67b23038_adding_pgp_key_for_platform.py

@@ -0,0 +1,28 @@
+"""adding pgp_key for platform
+
+Revision ID: 764a67b23038
+Revises: 444f9f1f0ac1
+Create Date: 2024-10-25 10:24:17.422595
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '764a67b23038'
+down_revision = '444f9f1f0ac1'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('platforms', sa.Column('pgp_key', sa.Text(), nullable=True))
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column('platforms', 'pgp_key')
+    # ### end Alembic commands ###

alws/crud/platform.py

@@ -31,6 +31,7 @@ async def modify_platform(
         'type',
         'distr_type',
         'distr_version',
+        'pgp_key',
         'arch_list',
         'data',
         'modularity',

alws/models.py

@@ -244,6 +244,7 @@ class Platform(PermissionsMixin, Base):
     type: Mapped[str] = mapped_column(sqlalchemy.Text, nullable=False)
     distr_type: Mapped[str] = mapped_column(sqlalchemy.Text, nullable=False)
     distr_version: Mapped[str] = mapped_column(sqlalchemy.Text, nullable=False)
+    pgp_key: Mapped[Optional[str]] = mapped_column(sqlalchemy.Text, nullable=True)
     module_build_index: Mapped[int] = mapped_column(
         sqlalchemy.Integer, default=1
     )

alws/schemas/platform_schema.py

@@ -14,6 +14,7 @@ class PlatformModify(BaseModel):
     type: typing.Optional[typing.Literal['rpm', 'deb']] = None
     distr_type: typing.Optional[str] = None
     distr_version: typing.Optional[str] = None
+    pgp_key: typing.Optional[str] = None
     priority: typing.Optional[int] = None
     arch_list: typing.Optional[typing.List[str]] = None
     copy_priority_arches: typing.Optional[typing.List[str]] = None
@@ -32,6 +33,7 @@ class PlatformCreate(BaseModel):
     type: typing.Literal['rpm', 'deb']
     distr_type: str
     distr_version: str
+    pgp_key: typing.Optional[str] = None
     priority: typing.Optional[int] = None
     test_dist_name: typing.Optional[str] = None
     arch_list: typing.List[str]
@@ -49,7 +51,7 @@ class Platform(BaseModel):
     name: str
     distr_type: str
     distr_version: str
-
+    pgp_key: typing.Optional[str] = None
     arch_list: typing.List[str]
     modularity: typing.Optional[typing.Dict] = None
 

reference_data/platforms.yaml

@@ -2,6 +2,7 @@
 - name: AlmaLinux-8
   distr_type: rhel
   distr_version: '8'
+  pgp_key: 2AE81E8ACED7258B
   contact_mail: [email protected]
   copyright: Copyright {{ year }} AlmaLinux OS
   test_dist_name: almalinux
@@ -1711,6 +1712,7 @@
 - name: AlmaLinux-9
   distr_type: rhel
   distr_version: '9'
+  pgp_key: D36CB86CB86B3716
   contact_mail: [email protected]
   copyright: Copyright {{ year }} AlmaLinux OS
   test_dist_name: almalinux
@@ -3373,6 +3375,7 @@
 - name: AlmaLinux-10
   distr_type: rhel
   distr_version: '10'
+  pgp_key: DEE5C11CC2A1E572
   contact_mail: [email protected]
   copyright: Copyright {{ year }} AlmaLinux OS
   test_dist_name: almalinux
@@ -5303,6 +5306,7 @@
 - name: AlmaLinux-Kitten-10
   distr_type: rhel
   distr_version: '10'
+  pgp_key: DEE5C11CC2A1E572
   contact_mail: [email protected]
   copyright: Copyright {{ year }} AlmaLinux OS
   test_dist_name: almalinux