Skip to content

Commit

Permalink
chore: merge main
Browse files Browse the repository at this point in the history
  • Loading branch information
devops-chris committed Oct 10, 2024
2 parents c6a0631 + ed4974e commit 6fcaf5e
Show file tree
Hide file tree
Showing 182 changed files with 7,205 additions and 1,941 deletions.
318 changes: 167 additions & 151 deletions .github/actions/bump-and-tag/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/actions/setup-python/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ runs:
using: composite
steps:
- name: Set up Python
uses: actions/setup-python@70dcb22d269dc9546a5d97f4b11548f130526421 # tag: v4.3.0
uses: actions/setup-python@19dfb7b659fa9e60c2f89c33335ab5f6f1792b6e # tag: v4.3.0
with:
python-version: '3.12'
cache: pipenv
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_data_tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4

# https://github.com/docker/login-action
- name: Log in to the Container registry
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Trufflehog Secret Scanning
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
with:
fetch-depth: 0
- name: TruffleHog OSS
Expand Down Expand Up @@ -65,7 +65,7 @@ jobs:
name: Linting
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
- uses: ./.github/actions/setup-python

- name: Lint backend
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
concurrency: ${{ inputs.environment }}

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
- uses: ./.github/actions/setup-python
- uses: ./.github/actions/setup-javascript
- uses: ./.github/actions/setup-cloudfoundry
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/e2e_test_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
steps:
# Checkout the code
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4

# Install and cache NPM dependencies
- uses: ./.github/actions/setup-javascript
Expand All @@ -48,6 +48,7 @@ jobs:
uses: ./.github/actions/run-full-stack
env:
JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}

# Install Cypress globally
- name: Install Cypress globally
Expand All @@ -69,7 +70,7 @@ jobs:
# Upload Cypress screenshots as artifact if a test fails
- name: Upload screenshots if failure
if: failure() # This step will run only if the previous step fails
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
with:
path: frontend/cypress/${{ steps.get-filename.outputs.TEST_FILE }}/screenshots # Update this path based on your project structure
name: cypress-screenshots
Expand All @@ -84,7 +85,7 @@ jobs:
# Upload logs as artifact
- name: Upload logs as artifact
if: always() # Ensure this runs, even if E2E fails
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
uses: actions/upload-artifact@604373da6381bf24206979c74d06a550515601b9 # v4
with:
# Set the path to the log file
path: full-stack-logs-${{ steps.get-filename.outputs.TEST_FILE }}.log
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly_scans.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
security-events: write

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4

- name: Run OWASP Zap Scan on staging
uses: zaproxy/action-full-scan@d2a07475d467566c9a3e3c700f31f47724aa1060 # v0.10.0
Expand All @@ -34,6 +34,6 @@ jobs:
uses: SvanBoxel/zaproxy-to-ghas@cfc77481d74a17a4c3d6b753aa9d7abef453d501 # v1.0.2

- name: Upload SARIF file
uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3
uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/prod_be_build_and_deploy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Staging Backend Build and Deploy
name: Production Backend Build and Deploy

on:
workflow_dispatch:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prod_fe_build_and_deploy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Staging Frontend Build and Deploy
name: Production Frontend Build and Deploy

on:
workflow_dispatch:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/security_codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@294a9d92911152fe08befb9ec03e240add280cb3 # v3
uses: github/codeql-action/init@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3
with:
languages: javascript, python
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -33,4 +33,4 @@ jobs:
queries: +security-extended

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@294a9d92911152fe08befb9ec03e240add280cb3 # v3
uses: github/codeql-action/analyze@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3
4 changes: 2 additions & 2 deletions .github/workflows/security_semgrep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
image: returntocorp/semgrep@sha256:4cc2a2d7482901c6cdec930d46ab54c4de189ce48348e0fce80bd9f639c94a7e # 1.47.0
steps:
- name: Checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4

# We've changed the behavior a little, instead of forcing a fail on `semgrep scan` step
# we force the upload, and manage any results in the sencondary CodeQL Analysis of the
Expand All @@ -25,7 +25,7 @@ jobs:
SEMGREP_RULES: "p/default"

- name: Upload SARIF file for GitHub Advanced Security Dashboard
uses: github/codeql-action/upload-sarif@294a9d92911152fe08befb9ec03e240add280cb3 # v3
uses: github/codeql-action/upload-sarif@c36620d31ac7c881962c3d9dd939c40ec9434f2b # v3
with:
sarif_file: ${{ env.SEMGREP_TO_UPLOAD }}
if: always()
7 changes: 4 additions & 3 deletions .github/workflows/unit_test_reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ jobs:
runs-on: ubuntu-latest
env:
JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
JWT_PUBLIC_KEY: ${{ secrets.JWT_PUBLIC_KEY }}
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
- uses: ./.github/actions/setup-python
# Stand up the system stack, to have something to poke
- name: Run backend unit tests
Expand All @@ -21,7 +22,7 @@ jobs:
env:
JWT_PRIVATE_KEY: "__blank__"
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
- uses: ./.github/actions/setup-python
- name: Run backend unit tests
working-directory: ./backend/data_tools/
Expand All @@ -31,7 +32,7 @@ jobs:
name: Frontend Unit Tests
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
- uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
- uses: ./.github/actions/setup-javascript
# Stand up the system stack, to have something to poke
- name: Run frontend unit tests
Expand Down
9 changes: 4 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,6 @@ yarn-error.log*
# MacOS stuff
.DS_Store

# IDE
.vscode/*
# allow vscode launch/tasks to be shared
!.vscode/launch.json
!.vscode/tasks.json
.idea

# HTTP-Client
Expand Down Expand Up @@ -243,3 +238,7 @@ override.tf.json
# Ignore CLI configuration files
.terraformrc
terraform.rc

# Keys
*.pub
*.pem
8 changes: 8 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"python.testing.pytestArgs": [
"tests"
],
"python.testing.cwd": "./backend/ops_api",
"python.testing.unittestEnabled": false,
"python.testing.pytestEnabled": true
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
"""remove Projects from CANs
Revision ID: c03680353aa3
Revises: eb4261420779
Create Date: 2024-09-10 18:55:28.262603+00:00
"""
from typing import Sequence, Union

import sqlalchemy as sa
from alembic import op
from sqlalchemy.dialects import postgresql

# revision identifiers, used by Alembic.
revision: str = 'c03680353aa3'
down_revision: Union[str, None] = 'eb4261420779'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None


def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_index('ix_project_cans_version_end_transaction_id', table_name='project_cans_version')
op.drop_index('ix_project_cans_version_operation_type', table_name='project_cans_version')
op.drop_index('ix_project_cans_version_transaction_id', table_name='project_cans_version')
op.drop_table('project_cans_version')
op.drop_table('project_cans')
# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('project_cans',
sa.Column('project_id', sa.INTEGER(), autoincrement=False, nullable=False),
sa.Column('can_id', sa.INTEGER(), autoincrement=False, nullable=False),
sa.Column('created_by', sa.INTEGER(), autoincrement=False, nullable=True),
sa.Column('updated_by', sa.INTEGER(), autoincrement=False, nullable=True),
sa.Column('created_on', postgresql.TIMESTAMP(), autoincrement=False, nullable=True),
sa.Column('updated_on', postgresql.TIMESTAMP(), autoincrement=False, nullable=True),
sa.ForeignKeyConstraint(['can_id'], ['can.id'], name='project_cans_can_id_fkey'),
sa.ForeignKeyConstraint(['created_by'], ['ops_user.id'], name='project_cans_created_by_fkey'),
sa.ForeignKeyConstraint(['project_id'], ['project.id'], name='project_cans_project_id_fkey'),
sa.ForeignKeyConstraint(['updated_by'], ['ops_user.id'], name='project_cans_updated_by_fkey'),
sa.PrimaryKeyConstraint('project_id', 'can_id', name='project_cans_pkey')
)
op.create_table('project_cans_version',
sa.Column('project_id', sa.INTEGER(), autoincrement=False, nullable=False),
sa.Column('can_id', sa.INTEGER(), autoincrement=False, nullable=False),
sa.Column('created_by', sa.INTEGER(), autoincrement=False, nullable=True),
sa.Column('updated_by', sa.INTEGER(), autoincrement=False, nullable=True),
sa.Column('created_on', postgresql.TIMESTAMP(), autoincrement=False, nullable=True),
sa.Column('updated_on', postgresql.TIMESTAMP(), autoincrement=False, nullable=True),
sa.Column('transaction_id', sa.BIGINT(), autoincrement=False, nullable=False),
sa.Column('end_transaction_id', sa.BIGINT(), autoincrement=False, nullable=True),
sa.Column('operation_type', sa.SMALLINT(), autoincrement=False, nullable=False),
sa.PrimaryKeyConstraint('project_id', 'can_id', 'transaction_id', name='project_cans_version_pkey')
)
op.create_index('ix_project_cans_version_transaction_id', 'project_cans_version', ['transaction_id'], unique=False)
op.create_index('ix_project_cans_version_operation_type', 'project_cans_version', ['operation_type'], unique=False)
op.create_index('ix_project_cans_version_end_transaction_id', 'project_cans_version', ['end_transaction_id'], unique=False)
# ### end Alembic commands ###
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""Adding create, update, and delete events for CANs
Revision ID: cbbaf27a11ee
Revises: eb4261420779
Create Date: 2024-09-19 18:35:25.734075+00:00
"""
from typing import Sequence, Union

import sqlalchemy as sa
from alembic import op
from alembic_postgresql_enum import TableReference

# revision identifiers, used by Alembic.
revision: str = 'cbbaf27a11ee'
down_revision: Union[str, None] = 'c03680353aa3'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None


def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.sync_enum_values('ops', 'opseventtype', ['CREATE_BLI', 'UPDATE_BLI', 'DELETE_BLI', 'SEND_BLI_FOR_APPROVAL', 'CREATE_PROJECT', 'CREATE_NEW_AGREEMENT', 'UPDATE_AGREEMENT', 'DELETE_AGREEMENT', 'CREATE_NEW_CAN', 'UPDATE_CAN', 'DELETE_CAN', 'ACKNOWLEDGE_NOTIFICATION', 'CREATE_BLI_PACKAGE', 'UPDATE_BLI_PACKAGE', 'CREATE_SERVICES_COMPONENT', 'UPDATE_SERVICES_COMPONENT', 'DELETE_SERVICES_COMPONENT', 'CREATE_PROCUREMENT_ACQUISITION_PLANNING', 'UPDATE_PROCUREMENT_ACQUISITION_PLANNING', 'DELETE_PROCUREMENT_ACQUISITION_PLANNING', 'CREATE_DOCUMENT', 'UPDATE_DOCUMENT', 'LOGIN_ATTEMPT', 'LOGOUT', 'GET_USER_DETAILS', 'CREATE_USER', 'UPDATE_USER', 'DEACTIVATE_USER'],
[TableReference(table_schema='ops', table_name='ops_event', column_name='event_type'), TableReference(table_schema='ops', table_name='ops_event_version', column_name='event_type')],
enum_values_to_rename=[])
# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.sync_enum_values('ops', 'opseventtype', ['CREATE_BLI', 'UPDATE_BLI', 'DELETE_BLI', 'SEND_BLI_FOR_APPROVAL', 'CREATE_PROJECT', 'CREATE_NEW_AGREEMENT', 'UPDATE_AGREEMENT', 'DELETE_AGREEMENT', 'ACKNOWLEDGE_NOTIFICATION', 'CREATE_BLI_PACKAGE', 'UPDATE_BLI_PACKAGE', 'CREATE_SERVICES_COMPONENT', 'UPDATE_SERVICES_COMPONENT', 'DELETE_SERVICES_COMPONENT', 'CREATE_PROCUREMENT_ACQUISITION_PLANNING', 'UPDATE_PROCUREMENT_ACQUISITION_PLANNING', 'DELETE_PROCUREMENT_ACQUISITION_PLANNING', 'CREATE_DOCUMENT', 'UPDATE_DOCUMENT', 'LOGIN_ATTEMPT', 'LOGOUT', 'GET_USER_DETAILS', 'CREATE_USER', 'UPDATE_USER', 'DEACTIVATE_USER'],
[TableReference(table_schema='ops', table_name='ops_event', column_name='event_type'), TableReference(table_schema='ops', table_name='ops_event_version', column_name='event_type')],
enum_values_to_rename=[])
# ### end Alembic commands ###
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""Adding CANFundingBudget meta events
Revision ID: d5610e0988b0
Revises: cbbaf27a11ee
Create Date: 2024-09-25 20:46:07.501389+00:00
"""
from typing import Sequence, Union

import sqlalchemy as sa
from alembic import op
from alembic_postgresql_enum import TableReference

# revision identifiers, used by Alembic.
revision: str = 'd5610e0988b0'
down_revision: Union[str, None] = 'cbbaf27a11ee'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None


def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.sync_enum_values('ops', 'opseventtype', ['CREATE_BLI', 'UPDATE_BLI', 'DELETE_BLI', 'SEND_BLI_FOR_APPROVAL', 'CREATE_PROJECT', 'CREATE_NEW_AGREEMENT', 'UPDATE_AGREEMENT', 'DELETE_AGREEMENT', 'CREATE_NEW_CAN', 'UPDATE_CAN', 'DELETE_CAN', 'CREATE_CAN_FUNDING_BUDGET', 'UPDATE_CAN_FUNDING_BUDGET', 'DELETE_CAN_FUNDING_BUDGET', 'ACKNOWLEDGE_NOTIFICATION', 'CREATE_BLI_PACKAGE', 'UPDATE_BLI_PACKAGE', 'CREATE_SERVICES_COMPONENT', 'UPDATE_SERVICES_COMPONENT', 'DELETE_SERVICES_COMPONENT', 'CREATE_PROCUREMENT_ACQUISITION_PLANNING', 'UPDATE_PROCUREMENT_ACQUISITION_PLANNING', 'DELETE_PROCUREMENT_ACQUISITION_PLANNING', 'CREATE_DOCUMENT', 'UPDATE_DOCUMENT', 'LOGIN_ATTEMPT', 'LOGOUT', 'GET_USER_DETAILS', 'CREATE_USER', 'UPDATE_USER', 'DEACTIVATE_USER'],
[TableReference(table_schema='ops', table_name='ops_event', column_name='event_type'), TableReference(table_schema='ops', table_name='ops_event_version', column_name='event_type')],
enum_values_to_rename=[])
# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.sync_enum_values('ops', 'opseventtype', ['CREATE_BLI', 'UPDATE_BLI', 'DELETE_BLI', 'SEND_BLI_FOR_APPROVAL', 'CREATE_PROJECT', 'CREATE_NEW_AGREEMENT', 'UPDATE_AGREEMENT', 'DELETE_AGREEMENT', 'CREATE_NEW_CAN', 'UPDATE_CAN', 'DELETE_CAN', 'ACKNOWLEDGE_NOTIFICATION', 'CREATE_BLI_PACKAGE', 'UPDATE_BLI_PACKAGE', 'CREATE_SERVICES_COMPONENT', 'UPDATE_SERVICES_COMPONENT', 'DELETE_SERVICES_COMPONENT', 'CREATE_PROCUREMENT_ACQUISITION_PLANNING', 'UPDATE_PROCUREMENT_ACQUISITION_PLANNING', 'DELETE_PROCUREMENT_ACQUISITION_PLANNING', 'CREATE_DOCUMENT', 'UPDATE_DOCUMENT', 'LOGIN_ATTEMPT', 'LOGOUT', 'GET_USER_DETAILS', 'CREATE_USER', 'UPDATE_USER', 'DEACTIVATE_USER'],
[TableReference(table_schema='ops', table_name='ops_event', column_name='event_type'), TableReference(table_schema='ops', table_name='ops_event_version', column_name='event_type')],
enum_values_to_rename=[])
# ### end Alembic commands ###
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""adding events for can funding received
Revision ID: acfeadc7868c
Revises: d5610e0988b0
Create Date: 2024-10-01 20:48:34.638703+00:00
"""
from typing import Sequence, Union

import sqlalchemy as sa
from alembic import op
from alembic_postgresql_enum import TableReference

# revision identifiers, used by Alembic.
revision: str = 'acfeadc7868c'
down_revision: Union[str, None] = 'd5610e0988b0'
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None


def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.sync_enum_values('ops', 'opseventtype', ['CREATE_BLI', 'UPDATE_BLI', 'DELETE_BLI', 'SEND_BLI_FOR_APPROVAL', 'CREATE_PROJECT', 'CREATE_NEW_AGREEMENT', 'UPDATE_AGREEMENT', 'DELETE_AGREEMENT', 'CREATE_NEW_CAN', 'UPDATE_CAN', 'DELETE_CAN', 'CREATE_CAN_FUNDING_RECEIVED', 'UPDATE_CAN_FUNDING_RECEIVED', 'DELETE_CAN_FUNDING_RECEIVED', 'CREATE_CAN_FUNDING_BUDGET', 'UPDATE_CAN_FUNDING_BUDGET', 'DELETE_CAN_FUNDING_BUDGET', 'ACKNOWLEDGE_NOTIFICATION', 'CREATE_BLI_PACKAGE', 'UPDATE_BLI_PACKAGE', 'CREATE_SERVICES_COMPONENT', 'UPDATE_SERVICES_COMPONENT', 'DELETE_SERVICES_COMPONENT', 'CREATE_PROCUREMENT_ACQUISITION_PLANNING', 'UPDATE_PROCUREMENT_ACQUISITION_PLANNING', 'DELETE_PROCUREMENT_ACQUISITION_PLANNING', 'CREATE_DOCUMENT', 'UPDATE_DOCUMENT', 'LOGIN_ATTEMPT', 'LOGOUT', 'GET_USER_DETAILS', 'CREATE_USER', 'UPDATE_USER', 'DEACTIVATE_USER'],
[TableReference(table_schema='ops', table_name='ops_event', column_name='event_type'), TableReference(table_schema='ops', table_name='ops_event_version', column_name='event_type')],
enum_values_to_rename=[])
# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.sync_enum_values('ops', 'opseventtype', ['CREATE_BLI', 'UPDATE_BLI', 'DELETE_BLI', 'SEND_BLI_FOR_APPROVAL', 'CREATE_PROJECT', 'CREATE_NEW_AGREEMENT', 'UPDATE_AGREEMENT', 'DELETE_AGREEMENT', 'CREATE_NEW_CAN', 'UPDATE_CAN', 'DELETE_CAN', 'CREATE_CAN_FUNDING_BUDGET', 'UPDATE_CAN_FUNDING_BUDGET', 'DELETE_CAN_FUNDING_BUDGET', 'ACKNOWLEDGE_NOTIFICATION', 'CREATE_BLI_PACKAGE', 'UPDATE_BLI_PACKAGE', 'CREATE_SERVICES_COMPONENT', 'UPDATE_SERVICES_COMPONENT', 'DELETE_SERVICES_COMPONENT', 'CREATE_PROCUREMENT_ACQUISITION_PLANNING', 'UPDATE_PROCUREMENT_ACQUISITION_PLANNING', 'DELETE_PROCUREMENT_ACQUISITION_PLANNING', 'CREATE_DOCUMENT', 'UPDATE_DOCUMENT', 'LOGIN_ATTEMPT', 'LOGOUT', 'GET_USER_DETAILS', 'CREATE_USER', 'UPDATE_USER', 'DEACTIVATE_USER'],
[TableReference(table_schema='ops', table_name='ops_event', column_name='event_type'), TableReference(table_schema='ops', table_name='ops_event_version', column_name='event_type')],
enum_values_to_rename=[])
# ### end Alembic commands ###
8 changes: 6 additions & 2 deletions backend/data_tools/Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ name = "pypi"

[packages]
SQLAlchemy = "==2.0.35"
pandas = "==2.2.2"
pandas = "==2.2.3"
json5 = "==0.9.25"
psycopg2-binary = "==2.9.9"
cfenv = "==0.5.3"
Expand All @@ -14,8 +14,12 @@ desert = "2022.9.22"
sqlalchemy-continuum = "==1.4.2"
marshmallow-sqlalchemy = "==1.0.0"
marshmallow-enum = "==1.5.1"
alembic = "==1.13.2"
alembic = "==1.13.3"
alembic-postgresql-enum = "==1.3.0"
azure-storage-blob = "==12.22.0"
azure-identity = "==1.17.1"
azure-keyvault-secrets = "==4.8.0"
loguru = "==0.7.2"

[dev-packages]
nox = "==2024.4.15"
Expand Down
Loading

0 comments on commit 6fcaf5e

Please sign in to comment.