Merge pull request #125 from mtruj013/new-pockets

Add new pocket options

Author: mtruj013

migrations/versions/1e0a9c001320_add_new_pockets.py

@@ -0,0 +1,53 @@
+"""empty message
+
+Revision ID: 1e0a9c001320
+Revises: 5c1128073317
+Create Date: 2023-03-28 17:09:04.546775
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '1e0a9c001320'
+down_revision = '5c1128073317'
+branch_labels = None
+depends_on = None
+
+# Enum 'type' for PostgreSQL
+enum_name = 'pockets'
+# Set temporary enum 'type' for PostgreSQL
+tmp_enum_name = 'tmp_' + enum_name
+
+# Options for Enum
+old_options = ('security', 'updates', 'esm-infra', 'esm-apps')
+new_options = ('security', 'updates', 'esm-infra', 'esm-apps', 'soss', 'fips', 'fips-updates', 'ros-esm')
+
+# Create enum fields
+old_type = sa.Enum(*old_options, name=enum_name)
+new_type = sa.Enum(*new_options, name=enum_name)
+
+
+def upgrade():
+    # Rename current enum type to tmp_
+    op.execute('ALTER TYPE ' + enum_name + ' RENAME TO ' + tmp_enum_name)
+    # Create new enum type in db
+    new_type.create(op.get_bind())
+    # Update column to use new enum type
+    op.execute('ALTER TABLE status ALTER COLUMN pocket TYPE ' + enum_name + ' USING pocket::text::' + enum_name)
+    # Drop old enum type
+    op.execute('DROP TYPE ' + tmp_enum_name)
+
+
+def downgrade():
+    # Instantiate db query
+    status = sa.sql.table('status', sa.Column('pocket', new_type, nullable=False))
+    # Rename enum type to tmp_
+    op.execute('ALTER TYPE ' + enum_name + ' RENAME TO ' + tmp_enum_name)
+    # Create enum type using old values
+    old_type.create(op.get_bind())
+    # Set enum type as type for pocket column
+    op.execute('ALTER TABLE status ALTER COLUMN pocket TYPE ' + enum_name + ' USING pocket::text::' + enum_name)
+    # Drop temp enum type
+    op.execute('DROP TYPE ' + tmp_enum_name)

tests/fixtures/models.py

@@ -41,7 +41,10 @@ def make_models():
     )
 
     status = Status(
-        status="pending", cve=cve, package=package, release=release
+        status="pending",
+        cve=cve,
+        package=package,
+        release=release,
     )
 
     notice = Notice(

tests/fixtures/payloads.py

@@ -10,6 +10,7 @@
                     "description": "",
                     "release_codename": "testrelease",
                     "status": "released",
+                    "pocket": "fips",
                 }
             ],
             "ubuntu": (

webapp/models.py

@@ -252,7 +252,17 @@ class Status(db.Model):
         Enum("main", "universe", name="components"),
     )
     pocket = Column(
-        Enum("security", "updates", "esm-infra", "esm-apps", name="pockets"),
+        Enum(
+            "security",
+            "updates",
+            "esm-infra",
+            "esm-apps",
+            "fips",
+            "fips-updates",
+            "ros-esm",
+            "soss",
+            name="pockets",
+        ),
     )
 
     cve = relationship("CVE", back_populates="statuses")

webapp/schemas.py

@@ -24,6 +24,9 @@
     "esm-infra",
     "esm-apps",
     "soss",
+    "fips",
+    "fips-updates",
+    "ros-esm",
 ]
 
 PACKAGE_TYPE_OPTIONS = [