Merge branch 'main' into feat/automated-metadata-generation

# Conflicts:
#	backend/dataall/base/cdkproxy/requirements.txt
#	backend/requirements.txt
#	frontend/yarn.lock

Author: dlpzx

.github/workflows/alembic-tests.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ 3.9 ]
+        python-version: [ 3.12 ]
     services:
       postgres:
         image: postgres
@@ -41,4 +41,4 @@ jobs:
       - name: Drop tables
         run: make drop-tables
       - name: Upgrade tables
-        run: make upgrade-db
+        run: make upgrade-db

.github/workflows/ash.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: [3.12]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}

.github/workflows/bandit.yml

@@ -17,7 +17,7 @@ jobs:
   bandit:
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: [3.12]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/cdk-nag.yml

@@ -21,7 +21,7 @@ jobs:
   cdk-nag:
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: [3.12]
     env:
       CDK_DEFAULT_REGION: eu-west-1
       CDK_DEFAULT_ACCOUNT: 111111111111

.github/workflows/checkov.yml

@@ -24,7 +24,7 @@ jobs:
       DATAALL_REPO_BRANCH: main
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: [3.12]
     services:
       postgres:
         image: postgres

.github/workflows/integration-tests.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [ 3.9 ]
+        python-version: [ 3.12 ]
     services:
       postgres:
         image: postgres
@@ -37,4 +37,4 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: 'pip'
       - name: coverage
-        run: make coverage
+        run: make coverage

.github/workflows/snyk.yaml

@@ -14,7 +14,7 @@ jobs:
   security:
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: [3.12]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

Makefile

@@ -52,7 +52,7 @@ check-security: upgrade-pip install-backend install-cdkproxy
 	pip install bandit
 	pip install safety
 	bandit -lll -r backend
-	safety check --ignore=51668,70612,70624
+	safety check
 
 checkov-synth: upgrade-pip install-backend install-cdkproxy install-tests
 	export PYTHONPATH=./backend:/./tests && \
@@ -79,7 +79,7 @@ coverage: upgrade-pip install-backend install-cdkproxy install-tests
 		--color=yes
 
 deploy-image:
-	docker build -f backend/docker/prod/${type}/Dockerfile -t ${image-tag}:${image-tag} . && \
+	docker build ${build-args} -f backend/docker/prod/${type}/Dockerfile -t ${image-tag}:${image-tag} . && \
 	aws ecr get-login-password --region ${region} | docker login --username AWS --password-stdin ${account}.dkr.ecr.${region}.amazonaws.com && \
 	docker tag ${image-tag}:${image-tag} ${account}.dkr.ecr.${region}.amazonaws.com/${repo}:${image-tag} && \
 	docker push ${account}.dkr.ecr.${region}.amazonaws.com/${repo}:${image-tag}

backend/dataall/base/cdkproxy/cdk_cli_wrapper.py

@@ -216,7 +216,7 @@ def describe_stack(stack, engine: Engine = None, stackid: str = None):
 
 
 def cdk_installed():
-    cmd1 = ['.', '~/.nvm/nvm.sh']
+    cmd1 = ['bash', '~/.nvm/nvm.sh']
     logger.info(f'Running command {" ".join(cmd1)}')
     subprocess.run(
         cmd1,

backend/dataall/base/cdkproxy/requirements.txt

@@ -1,12 +1,12 @@
-aws-cdk-lib==2.177.0
+aws-cdk-lib==2.208.0
 boto3==1.39.7
 boto3-stubs==1.35.26
 cdk-nag==2.7.2
 fastapi == 0.116.1
-PyYAML==6.0
-requests==2.32.2
+PyYAML==6.0.2
+requests==2.32.4
 tabulate==0.8.9
 uvicorn==0.15.0
 werkzeug==3.0.6
 git-remote-codecommit==1.16
-aws-ddk-core==1.3.0
+aws-ddk-core==1.4.1