Merge pull request #2558 from bcgov/release

Release v1.0.5

Author: AlexZorkin

.github/workflows/prod-ci.yaml

@@ -259,21 +259,21 @@ jobs:
       PRE_RELEASE: ${{ needs.set-pre-release.outputs.PRE_RELEASE }}
 
     steps:
-      - name: Checkout Manifest repository
-        uses: actions/checkout@v3
-        with:
-          repository: bcgov-c/tenant-gitops-d2bd59
-          ref: main
-          ssh-key: ${{ secrets.MANIFEST_REPO_DEPLOY_KEY }}
-
       - name: Ask for approval for LCFS ${{env.IMAGE_TAG }} Prod deployment
         uses: trstringer/manual-approval@v1.6.0
         with:
           secret: ${{ github.TOKEN }}
-          approvers: AlexZorkin,kuanfandevops,hamed-valiollahi,airinggov,areyeslo,dhaselhan,Grulin
+          approvers: AlexZorkin,kuanfandevops,hamed-valiollahi,airinggov,prv-proton,Grulin
           minimum-approvals: 2
           issue-title: "LCFS ${{env.VERSION }}-${{env.PRE_RELEASE }} Prod Deployment."
 
+      - name: Checkout Manifest repository
+        uses: actions/checkout@v3
+        with:
+          repository: bcgov-c/tenant-gitops-d2bd59
+          ref: main
+          ssh-key: ${{ secrets.MANIFEST_REPO_DEPLOY_KEY }}
+
       - name: Restore oc command from Cache
         uses: actions/cache@v4.2.0
         with:

.github/workflows/test-ci.yaml

@@ -267,7 +267,7 @@ jobs:
         uses: trstringer/manual-approval@v1.6.0
         with:
           secret: ${{ github.TOKEN }}
-          approvers: AlexZorkin,kuanfandevops,hamed-valiollahi,airinggov,areyeslo,dhaselhan,Grulin,kevin-hashimoto
+          approvers: AlexZorkin,kuanfandevops,hamed-valiollahi,airinggov,prv-proton,Grulin,kevin-hashimoto
           minimum-approvals: 1
           issue-title: "LCFS ${{ env.VERSION }}-${{ env.PRE_RELEASE }} Test Deployment at ${{ steps.get-current-time.outputs.CURRENT_TIME }}"
 

backend/Dockerfile.openshift

@@ -45,4 +45,12 @@ RUN chmod +x /app/wait-for-it.sh /app/lcfs/prestart.sh /app/lcfs/start.sh
 # Set the APP_ENVIRONMENT variable to 'production'
 ENV APP_ENVIRONMENT=prod
 
-CMD ["/app/lcfs/start.sh"]
+# CMD ["/app/lcfs/start.sh"] replaced with the following to allow for config file to be sourced
+CMD ["/bin/sh", "-c", "\
+  for cfg in database redis objectstorage email rabbitmq; do \
+    if [ -f /vault/secrets/$cfg ]; then \
+      . /vault/secrets/$cfg; \
+    fi; \
+  done; \
+  /app/lcfs/start.sh\
+"]

backend/lcfs/db/dependencies.py

@@ -8,13 +8,15 @@
 
 from lcfs.db.base import current_user_var, get_current_user
 from lcfs.settings import settings
+from lcfs.utils.query_analyzer import register_query_analyzer
 
 if settings.environment == "dev":
     pass
 
 db_url = make_url(str(settings.db_url.with_path(f"/{settings.db_base}")))
 async_engine = create_async_engine(db_url, future=True)
 logger = structlog.get_logger("sqlalchemy.engine")
+register_query_analyzer(async_engine.sync_engine)
 
 
 async def set_user_context(session: AsyncSession, username: str):
@@ -26,7 +28,8 @@ async def set_user_context(session: AsyncSession, username: str):
 
     except Exception as e:
         structlog.get_logger().error(
-            f"Failed to execute SET LOCAL app.user_id = '{username}': {e}")
+            f"Failed to execute SET LOCAL app.user_id = '{username}': {e}"
+        )
         raise e
 
 

backend/lcfs/db/migrations/versions/2025-03-05-22-42_fd8ee994668c.py

@@ -13,7 +13,7 @@
 
 # revision identifiers, used by Alembic.
 revision = "6c427c10a63d"
-down_revision = "fd8ee994668c"
+down_revision = "937c793bf7b8"
 branch_labels = None
 depends_on = None
 

backend/lcfs/db/migrations/versions/2025-03-11-19-53_6c427c10a63d.py

@@ -0,0 +1,84 @@
+"""Add Quarterly Fuel Supply Columns
+
+Revision ID: ddc2db9c2def
+Revises: 0d5836cb1bf8
+Create Date: 2025-04-07 21:48:48.520665
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from alembic_postgresql_enum import TableReference
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "ddc2db9c2def"
+down_revision = "0d5836cb1bf8"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "fuel_supply",
+        sa.Column(
+            "q1_quantity",
+            sa.Integer(),
+            nullable=True,
+            comment="Quantity of fuel supplied in Q1 (early issuance only)",
+        ),
+    )
+    op.add_column(
+        "fuel_supply",
+        sa.Column(
+            "q2_quantity",
+            sa.Integer(),
+            nullable=True,
+            comment="Quantity of fuel supplied in Q2 (early issuance only)",
+        ),
+    )
+    op.add_column(
+        "fuel_supply",
+        sa.Column(
+            "q3_quantity",
+            sa.Integer(),
+            nullable=True,
+            comment="Quantity of fuel supplied in Q3 (early issuance only)",
+        ),
+    )
+    op.add_column(
+        "fuel_supply",
+        sa.Column(
+            "q4_quantity",
+            sa.Integer(),
+            nullable=True,
+            comment="Quantity of fuel supplied in Q4 (early issuance only)",
+        ),
+    )
+    op.alter_column(
+        "fuel_supply",
+        "quantity",
+        existing_type=sa.INTEGER(),
+        nullable=True,
+        comment="Quantity of fuel supplied (no early issuance)",
+        existing_comment="Quantity of fuel supplied",
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column(
+        "fuel_supply",
+        "quantity",
+        existing_type=sa.INTEGER(),
+        nullable=False,
+        comment="Quantity of fuel supplied",
+        existing_comment="Quantity of fuel supplied (no early issuance)",
+    )
+    op.drop_column("fuel_supply", "q4_quantity")
+    op.drop_column("fuel_supply", "q3_quantity")
+    op.drop_column("fuel_supply", "q2_quantity")
+    op.drop_column("fuel_supply", "q1_quantity")
+    # ### end Alembic commands ###

backend/lcfs/db/migrations/versions/2025-04-07-21-48_ddc2db9c2def.py

@@ -0,0 +1,44 @@
+"""Add early issuance summary columns
+
+Revision ID: aa79bc6d6152
+Revises: ddc2db9c2def
+Create Date: 2025-04-14 19:55:34.930877
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from alembic_postgresql_enum import TableReference
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "aa79bc6d6152"
+down_revision = "ddc2db9c2def"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column(
+        "compliance_report_summary",
+        sa.Column("early_issuance_credits_q1", sa.Integer(), nullable=True),
+    )
+    op.add_column(
+        "compliance_report_summary",
+        sa.Column("early_issuance_credits_q2", sa.Integer(), nullable=True),
+    )
+    op.add_column(
+        "compliance_report_summary",
+        sa.Column("early_issuance_credits_q3", sa.Integer(), nullable=True),
+    )
+    op.add_column(
+        "compliance_report_summary",
+        sa.Column("early_issuance_credits_q4", sa.Integer(), nullable=True),
+    )
+
+
+def downgrade() -> None:
+    op.drop_column("compliance_report_summary", "early_issuance_credits_q4")
+    op.drop_column("compliance_report_summary", "early_issuance_credits_q3")
+    op.drop_column("compliance_report_summary", "early_issuance_credits_q2")
+    op.drop_column("compliance_report_summary", "early_issuance_credits_q1")