Added github workflows on release branches and fix migration workflow issues

.github/workflows/bandit.yml

@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
     - main
+    - v2m*
 
 permissions:
   contents: read

.github/workflows/cdk-nag.yml

@@ -12,6 +12,7 @@ on:
     - "deploy/**"
     branches:
     - main
+    - v2m*
 
 permissions:
   contents: read

.github/workflows/coverage.yml

@@ -7,6 +7,7 @@ on:
     - main
     - release/*
     - main-v2
+    - v2m*
 
 jobs:
   run-tests:

.github/workflows/eslint.yml

@@ -10,6 +10,7 @@ on:
     - main
     - release/*
     - main-v2
+    - v2m*
 
 permissions:
   contents: read

.github/workflows/lint.yml

@@ -7,6 +7,7 @@ on:
       - main
       - release/*
       - main-v2
+      - v2m*
 
 jobs:
   lint:

.github/workflows/npm-audit.yml

@@ -10,6 +10,7 @@ on:
     - main
     - release/*
     - main-v2
+    - v2m*
 
 permissions:
   contents: read

.github/workflows/semgrep.yml

@@ -10,6 +10,7 @@ on:
     - main
     - release/*
     - main-v2
+    - v2m*
 
 permissions:
   contents: read

.github/workflows/static-checking.yml

@@ -7,6 +7,7 @@ on:
       - main
       - release/*
       - main-v2
+      - v2m*
 
 jobs:
   Check:

.github/workflows/validate-db-schema.yml

@@ -7,10 +7,10 @@ on:
     - main
     - release/*
     - main-v2
+    - v2m*
 
 env:
   envname: local
-  schema_name: validation
 
 jobs:
   run-tests:

backend/dataall/base/db/connection.py

@@ -105,7 +105,6 @@ def drop_schema_if_exists(engine, envname):
 
 
 def get_engine(envname=ENVNAME):
-    schema = os.getenv('schema_name', envname)
     if envname not in ['local', 'pytest', 'dkrcompose']:
         param_store = Parameter()
         credential_arn = param_store.get_parameter(env=envname, path='aurora/dbcreds')
@@ -120,7 +119,7 @@ def get_engine(envname=ENVNAME):
             'db': database,
             'user': user,
             'pwd': pwd,
-            'schema': schema,
+            'schema': envname,
         }
     else:
         hostname = 'db' if envname == 'dkrcompose' else 'localhost'
@@ -129,7 +128,7 @@ def get_engine(envname=ENVNAME):
             'db': 'dataall',
             'user': 'postgres',
             'pwd': 'docker',
-            'schema': schema,
+            'schema': envname,
         }
     return Engine(DbConfig(**db_params))
 

backend/migrations/drop_tables.py

@@ -9,8 +9,7 @@
 
 if __name__ == '__main__':
     engine = get_engine(envname=ENVNAME).engine
-    schema = os.getenv('schema_name', ENVNAME)
-    print(f'Dropping schema {schema}...')
-    drop_schema_if_exists(get_engine(envname=ENVNAME).engine, envname=schema)
-    create_schema_if_not_exists(get_engine(envname=ENVNAME).engine, envname=schema)
-    print(f'Clean schema {schema} recreated')
+    print(f'Dropping schema {ENVNAME}...')
+    drop_schema_if_exists(get_engine(envname=ENVNAME).engine, envname=ENVNAME)
+    create_schema_if_not_exists(get_engine(envname=ENVNAME).engine, envname=ENVNAME)
+    print(f'Clean schema {ENVNAME} recreated')

backend/migrations/versions/4f3c1d84a628_modify_notifications_column_types.py

@@ -24,14 +24,18 @@ def upgrade():
     Rename column " " to " " both of type String
     """
     envname = os.getenv('envname', 'local')
-    op.execute(f'ALTER TABLE {envname}.notification ALTER COLUMN "type" TYPE VARCHAR(100);')
+    op.execute(f'ALTER TABLE {envname}.notification ALTER COLUMN "type" TYPE VARCHAR(100);')  # nosemgrep
+    # semgrep finding ignored as no upstream user input is passed to the statement function
+    # Only code admins will have access to the envname parameter of the f-string
+
     op.alter_column(
         'notification',
         'username',
         new_column_name='recipient',
         nullable=False,
         existing_type=sa.String()
     )
+    print("Notification columns updated")
 
 
 def downgrade():

deploy/stacks/pipeline.py

@@ -426,7 +426,6 @@ def set_quality_gate_stage(self):
                     commands=[
                         f'aws codeartifact login --tool pip --repository {self.codeartifact.codeartifact_pip_repo_name} --domain {self.codeartifact.codeartifact_domain_name} --domain-owner {self.codeartifact.domain.attr_owner}',
                         f'export envname={self.git_branch}',
-                        f'export schema_name=validation',
                         'python -m venv env',
                         '. env/bin/activate',
                         'make drop-tables',