Plugin baselines skip tables that already exist

2026-08-24 09:28:52 -04:00
parent ce3a0f4338
commit f109dd1349
12 changed files with 285 additions and 74 deletions
--- a/plugins/geenforce/migrations/versions/0001_geenforce_baseline.py
+++ b/plugins/geenforce/migrations/versions/0001_geenforce_baseline.py
@@ -8,6 +8,11 @@ tables are created parent-first. computertypeid / measuringtooltypeid /
 publishedby are SOFT references (plain columns, no FK) to optional plugins/core.
 """
 from alembic import op
+
+from shopdb.plugins.alembic_template import (
+    create_index_if_missing,
+    create_table_if_missing,
+)
 import sqlalchemy as sa


@@ -19,7 +24,7 @@ depends_on = None


 def upgrade():
-    op.create_table(
+    create_table_if_missing(
        'manifestscopes',
        sa.Column('scopeid', sa.Integer(), nullable=False),
        sa.Column('scopename', sa.String(length=64), nullable=False),
@@ -37,7 +42,7 @@ def upgrade():
        sa.PrimaryKeyConstraint('scopeid'),
        sa.UniqueConstraint('scopename', 'phase', name='uq_scope_name_phase'),
    )
-    op.create_table(
+    create_table_if_missing(
        'manifestentries',
        sa.Column('entryid', sa.Integer(), nullable=False),
        sa.Column('scopeid', sa.Integer(), nullable=False),
@@ -80,10 +85,10 @@ def upgrade():
        sa.PrimaryKeyConstraint('entryid'),
        sa.UniqueConstraint('scopeid', 'name', name='uq_entry_scope_name'),
    )
-    op.create_index('idx_entry_scope', 'manifestentries', ['scopeid'])
-    op.create_index('idx_entry_scope_order', 'manifestentries',
-                    ['scopeid', 'sortorder'])
-    op.create_table(
+    create_index_if_missing('idx_entry_scope', 'manifestentries', ['scopeid'])
+    create_index_if_missing('idx_entry_scope_order', 'manifestentries',
+                            ['scopeid', 'sortorder'])
+    create_table_if_missing(
        'manifestentrypctypes',
        sa.Column('entrypctypeid', sa.Integer(), nullable=False),
        sa.Column('entryid', sa.Integer(), nullable=False),
@@ -93,8 +98,8 @@ def upgrade():
                                ondelete='CASCADE'),
        sa.PrimaryKeyConstraint('entrypctypeid'),
    )
-    op.create_index('idx_pctype_entry', 'manifestentrypctypes', ['entryid'])
-    op.create_table(
+    create_index_if_missing('idx_pctype_entry', 'manifestentrypctypes', ['entryid'])
+    create_table_if_missing(
        'manifestentryhostnames',
        sa.Column('entryhostnameid', sa.Integer(), nullable=False),
        sa.Column('entryid', sa.Integer(), nullable=False),
@@ -104,8 +109,8 @@ def upgrade():
                                ondelete='CASCADE'),
        sa.PrimaryKeyConstraint('entryhostnameid'),
    )
-    op.create_index('idx_hostname_entry', 'manifestentryhostnames', ['entryid'])
-    op.create_table(
+    create_index_if_missing('idx_hostname_entry', 'manifestentryhostnames', ['entryid'])
+    create_table_if_missing(
        'manifestentrymachinenumbers',
        sa.Column('entrymachinenumberid', sa.Integer(), nullable=False),
        sa.Column('entryid', sa.Integer(), nullable=False),
@@ -115,9 +120,9 @@ def upgrade():
                                ondelete='CASCADE'),
        sa.PrimaryKeyConstraint('entrymachinenumberid'),
    )
-    op.create_index('idx_machinenumber_entry', 'manifestentrymachinenumbers',
-                    ['entryid'])
-    op.create_table(
+    create_index_if_missing('idx_machinenumber_entry', 'manifestentrymachinenumbers',
+                            ['entryid'])
+    create_table_if_missing(
        'manifestinusechecks',
        sa.Column('inusecheckid', sa.Integer(), nullable=False),
        sa.Column('entryid', sa.Integer(), nullable=False),
@@ -127,7 +132,7 @@ def upgrade():
        sa.PrimaryKeyConstraint('inusecheckid'),
        sa.UniqueConstraint('entryid'),
    )
-    op.create_table(
+    create_table_if_missing(
        'manifestinusecheckprocesses',
        sa.Column('inusecheckprocessid', sa.Integer(), nullable=False),
        sa.Column('inusecheckid', sa.Integer(), nullable=False),
@@ -140,9 +145,9 @@ def upgrade():
                                ondelete='CASCADE'),
        sa.PrimaryKeyConstraint('inusecheckprocessid'),
    )
-    op.create_index('idx_process_check', 'manifestinusecheckprocesses',
-                    ['inusecheckid'])
-    op.create_table(
+    create_index_if_missing('idx_process_check', 'manifestinusecheckprocesses',
+                            ['inusecheckid'])
+    create_table_if_missing(
        'manifestpublishedversions',
        sa.Column('publishedversionid', sa.Integer(), nullable=False),
        sa.Column('scopeid', sa.Integer(), nullable=False),
@@ -158,9 +163,9 @@ def upgrade():
        sa.UniqueConstraint('scopeid', 'versionnumber',
                            name='uq_published_scope_version'),
    )
-    op.create_index('idx_published_scope', 'manifestpublishedversions',
-                    ['scopeid'])
-    op.create_table(
+    create_index_if_missing('idx_published_scope', 'manifestpublishedversions',
+                            ['scopeid'])
+    create_table_if_missing(
        'manifestpayloads',
        sa.Column('payloadid', sa.Integer(), nullable=False),
        sa.Column('entryid', sa.Integer(), nullable=False),
@@ -173,8 +178,8 @@ def upgrade():
                                ondelete='CASCADE'),
        sa.PrimaryKeyConstraint('payloadid'),
    )
-    op.create_index('idx_payload_entry', 'manifestpayloads', ['entryid'])
-    op.create_table(
+    create_index_if_missing('idx_payload_entry', 'manifestpayloads', ['entryid'])
+    create_table_if_missing(
        'manifestenforcementreports',
        sa.Column('reportid', sa.Integer(), nullable=False),
        sa.Column('hostname', sa.String(length=100), nullable=False),
@@ -192,13 +197,13 @@ def upgrade():
        sa.Column('iscurrent', sa.Boolean(), nullable=False),
        sa.PrimaryKeyConstraint('reportid'),
    )
-    op.create_index('idx_report_host', 'manifestenforcementreports',
-                    ['hostname'])
-    op.create_index('idx_report_current', 'manifestenforcementreports',
-                    ['iscurrent'])
-    op.create_index('idx_report_host_scope', 'manifestenforcementreports',
-                    ['hostname', 'scopename', 'phase'])
-    op.create_table(
+    create_index_if_missing('idx_report_host', 'manifestenforcementreports',
+                            ['hostname'])
+    create_index_if_missing('idx_report_current', 'manifestenforcementreports',
+                            ['iscurrent'])
+    create_index_if_missing('idx_report_host_scope', 'manifestenforcementreports',
+                            ['hostname', 'scopename', 'phase'])
+    create_table_if_missing(
        'manifestenforcementresults',
        sa.Column('resultid', sa.Integer(), nullable=False),
        sa.Column('reportid', sa.Integer(), nullable=False),
@@ -212,9 +217,9 @@ def upgrade():
                                ondelete='CASCADE'),
        sa.PrimaryKeyConstraint('resultid'),
    )
-    op.create_index('idx_result_report', 'manifestenforcementresults',
-                    ['reportid'])
-    op.create_table(
+    create_index_if_missing('idx_result_report', 'manifestenforcementresults',
+                            ['reportid'])
+    create_table_if_missing(
        'pctypealiases',
        sa.Column('aliasid', sa.Integer(), nullable=False),
        sa.Column('aliasgroup', sa.Integer(), nullable=False),
@@ -223,7 +228,7 @@ def upgrade():
        sa.UniqueConstraint('aliasgroup', 'aliasname',
                            name='uq_alias_group_name'),
    )
-    op.create_index('idx_alias_group', 'pctypealiases', ['aliasgroup'])
+    create_index_if_missing('idx_alias_group', 'pctypealiases', ['aliasgroup'])


 def downgrade():
--- a/plugins/geenforce/migrations/versions/0002_manifest_blobs.py
+++ b/plugins/geenforce/migrations/versions/0002_manifest_blobs.py
@@ -10,6 +10,11 @@ Create Date: 2026-07-21

 """
 from alembic import op
+
+from shopdb.plugins.alembic_template import (
+    create_index_if_missing,
+    create_table_if_missing,
+)
 import sqlalchemy as sa


@@ -24,7 +29,7 @@ def upgrade():
    insp = sa.inspect(bind)
    if 'manifestblobs' in insp.get_table_names():
        return
-    op.create_table(
+    create_table_if_missing(
        'manifestblobs',
        sa.Column('sha256', sa.String(length=64), nullable=False),
        sa.Column('filename', sa.String(length=255), nullable=False),