Skip to content

Commit d42b9fc

Browse files
petrkalospetrkalos
committed
Merge remote-tracking branch 'origin/main' into feat/worksheet-nlq-beta
# Conflicts: # backend/dataall/modules/s3_datasets/services/dataset_service.py # backend/dataall/modules/worksheets/api/resolvers.py # backend/dataall/modules/worksheets/services/worksheet_service.py # deploy/stacks/lambda_api.py # frontend/src/modules/Worksheets/views/WorksheetView.js
2 parents 9a837d2 + 1094f14 commit d42b9fc

596 files changed

Lines changed: 13292 additions & 11230 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.checkov.baseline‎

Lines changed: 46 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,13 @@
192192
"CKV_AWS_115"
193193
]
194194
},
195+
{
196+
"resource": "AWS::Lambda::Function.CustomAuthorizerFunctiondevB38B5CCB",
197+
"check_ids": [
198+
"CKV_AWS_115",
199+
"CKV_AWS_116"
200+
]
201+
},
195202
{
196203
"resource": "AWS::Lambda::Function.ElasticSearchProxyHandlerDBDE7574",
197204
"check_ids": [
@@ -210,6 +217,12 @@
210217
"CKV_AWS_158"
211218
]
212219
},
220+
{
221+
"resource": "AWS::Logs::LogGroup.customauthorizerloggroup8F3B5B9D",
222+
"check_ids": [
223+
"CKV_AWS_158"
224+
]
225+
},
213226
{
214227
"resource": "AWS::Logs::LogGroup.dataalldevapigateway2625FE76",
215228
"check_ids": [
@@ -363,19 +376,7 @@
363376
]
364377
},
365378
{
366-
"resource": "AWS::S3::Bucket.dataalldevfrontend64065639",
367-
"check_ids": [
368-
"CKV_AWS_18"
369-
]
370-
},
371-
{
372-
"resource": "AWS::S3::Bucket.dataalldevlogging0F6723EE",
373-
"check_ids": [
374-
"CKV_AWS_18"
375-
]
376-
},
377-
{
378-
"resource": "AWS::S3::Bucket.dataalldevuserguide5964DC13",
379+
"resource": "AWS::S3::Bucket.dataalldevcloudfrontaccesslogsCAF85B96",
379380
"check_ids": [
380381
"CKV_AWS_18"
381382
]
@@ -404,7 +405,7 @@
404405
]
405406
},
406407
{
407-
"file": "/cdk.out/asset.3045cb6b4340be1e173df6dcf6248d565aa849ceda3e2cf2c2f221ccee4bc1d6/pivotRole.yaml",
408+
"file": "/cdk.out/asset.05d71d8b69cd4483d3c9db9120b556b718c72f349debbb79d461c74c4964b350/pivotRole.yaml",
408409
"findings": [
409410
{
410411
"resource": "AWS::IAM::ManagedPolicy.PivotRolePolicy0",
@@ -439,13 +440,7 @@
439440
]
440441
},
441442
{
442-
"resource": "AWS::S3::Bucket.pipelineartifactsbucketE44F7DE9",
443-
"check_ids": [
444-
"CKV_AWS_18"
445-
]
446-
},
447-
{
448-
"resource": "AWS::S3::Bucket.sourcecodebucket464EEFA3",
443+
"resource": "AWS::S3::Bucket.dataallaccesslogsEDA9BC4F",
449444
"check_ids": [
450445
"CKV_AWS_18"
451446
]
@@ -477,12 +472,6 @@
477472
{
478473
"file": "/checkov_environment_synth.json",
479474
"findings": [
480-
{
481-
"resource": "AWS::IAM::ManagedPolicy.dataallanothergroup111111servicespolicy19AC37181",
482-
"check_ids": [
483-
"CKV_AWS_111"
484-
]
485-
},
486475
{
487476
"resource": "AWS::IAM::ManagedPolicy.dataallanothergroup111111servicespolicy2E85AF510",
488477
"check_ids": [
@@ -495,24 +484,6 @@
495484
"CKV_AWS_111"
496485
]
497486
},
498-
{
499-
"resource": "AWS::IAM::ManagedPolicy.dataallanothergroup111111servicespolicy5A19E75CA",
500-
"check_ids": [
501-
"CKV_AWS_109"
502-
]
503-
},
504-
{
505-
"resource": "AWS::IAM::ManagedPolicy.dataallanothergroup111111servicespolicyCC720210",
506-
"check_ids": [
507-
"CKV_AWS_109"
508-
]
509-
},
510-
{
511-
"resource": "AWS::IAM::ManagedPolicy.dataalltestadmins111111servicespolicy1A0C96958",
512-
"check_ids": [
513-
"CKV_AWS_111"
514-
]
515-
},
516487
{
517488
"resource": "AWS::IAM::ManagedPolicy.dataalltestadmins111111servicespolicy2B12D381A",
518489
"check_ids": [
@@ -525,18 +496,6 @@
525496
"CKV_AWS_111"
526497
]
527498
},
528-
{
529-
"resource": "AWS::IAM::ManagedPolicy.dataalltestadmins111111servicespolicy3E3CBA9E",
530-
"check_ids": [
531-
"CKV_AWS_109"
532-
]
533-
},
534-
{
535-
"resource": "AWS::IAM::ManagedPolicy.dataalltestadmins111111servicespolicy56D7DC525",
536-
"check_ids": [
537-
"CKV_AWS_109"
538-
]
539-
},
540499
{
541500
"resource": "AWS::Lambda::Function.CustomCDKBucketDeployment8693BB64968944B69AAFB0CC9EB8756C81C01536",
542501
"check_ids": [
@@ -550,38 +509,40 @@
550509
"resource": "AWS::Lambda::Function.GlueDatabaseLFCustomResourceHandler7FAF0F82",
551510
"check_ids": [
552511
"CKV_AWS_115",
553-
"CKV_AWS_117",
554-
"CKV_AWS_173"
512+
"CKV_AWS_117"
555513
]
556514
},
557515
{
558516
"resource": "AWS::Lambda::Function.LakeformationDefaultSettingsHandler2CBEDB06",
559517
"check_ids": [
560518
"CKV_AWS_115",
561-
"CKV_AWS_117",
562-
"CKV_AWS_173"
519+
"CKV_AWS_117"
563520
]
564521
},
565522
{
566523
"resource": "AWS::Lambda::Function.dataallGlueDbCustomResourceProviderframeworkonEventF8347BA7",
567524
"check_ids": [
568525
"CKV_AWS_115",
569526
"CKV_AWS_116",
570-
"CKV_AWS_117",
571-
"CKV_AWS_173"
527+
"CKV_AWS_117"
572528
]
573529
},
574530
{
575531
"resource": "AWS::Lambda::Function.dataallLakeformationDefaultSettingsProviderframeworkonEventBB660E32",
576532
"check_ids": [
577533
"CKV_AWS_115",
578534
"CKV_AWS_116",
579-
"CKV_AWS_117",
580-
"CKV_AWS_173"
535+
"CKV_AWS_117"
581536
]
582537
},
583538
{
584-
"resource": "AWS::S3::Bucket.EnvironmentDefaultBucket78C3A8B0",
539+
"resource": "AWS::CloudTrail::Trail.S3CloudTrail9B4C955D",
540+
"check_ids": [
541+
"CKV_AWS_35"
542+
]
543+
},
544+
{
545+
"resource": "AWS::S3::Bucket.EnvironmentDefaultLogBucket7F0EFAB3",
585546
"check_ids": [
586547
"CKV_AWS_18"
587548
]
@@ -640,6 +601,25 @@
640601
}
641602
]
642603
},
604+
{
605+
"file": "/checkov_pipeline_synth.json",
606+
"findings": [
607+
{
608+
"resource": "AWS::IAM::Role.PipelineRoleDCFDBB91",
609+
"check_ids": [
610+
"CKV_AWS_107",
611+
"CKV_AWS_108",
612+
"CKV_AWS_111"
613+
]
614+
},
615+
{
616+
"resource": "AWS::S3::Bucket.thistableartifactsbucketDB1C8C64",
617+
"check_ids": [
618+
"CKV_AWS_18"
619+
]
620+
}
621+
]
622+
},
643623
{
644624
"file": "/frontend/docker/prod/Dockerfile",
645625
"findings": [

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.pdf filter=lfs diff=lfs merge=lfs -text

‎.github/workflows/alembic-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
matrix:
19-
python-version: [ 3.9 ]
19+
python-version: [ 3.12 ]
2020
services:
2121
postgres:
2222
image: postgres
@@ -34,11 +34,11 @@ jobs:
3434
steps:
3535
- uses: actions/checkout@v4
3636
- name: Set up Python ${{ matrix.python-version }}
37-
uses: actions/setup-python@v3
37+
uses: actions/setup-python@v5
3838
with:
3939
python-version: ${{ matrix.python-version }}
4040
cache: 'pip'
4141
- name: Drop tables
4242
run: make drop-tables
4343
- name: Upgrade tables
44-
run: make upgrade-db
44+
run: make upgrade-db

‎.github/workflows/ash.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
runs-on: ubuntu-latest
1212
strategy:
1313
matrix:
14-
python-version: [3.9]
14+
python-version: [3.12]
1515
steps:
1616
- uses: actions/checkout@v4
1717
- name: Set up Python ${{ matrix.python-version }}
18-
uses: actions/setup-python@v4
18+
uses: actions/setup-python@v5
1919
with:
2020
python-version: ${{ matrix.python-version }}
2121
- name: Install

‎.github/workflows/bandit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ jobs:
1717
bandit:
1818
strategy:
1919
matrix:
20-
python-version: [3.9]
20+
python-version: [3.12]
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@v4
2424
- name: Set up Python ${{ matrix.python-version }}
25-
uses: actions/setup-python@v4
25+
uses: actions/setup-python@v5
2626
with:
2727
python-version: ${{ matrix.python-version }}
2828
- name: Install

‎.github/workflows/cdk-nag.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
cdk-nag:
2222
strategy:
2323
matrix:
24-
python-version: [3.9]
24+
python-version: [3.12]
2525
env:
2626
CDK_DEFAULT_REGION: eu-west-1
2727
CDK_DEFAULT_ACCOUNT: 111111111111
@@ -31,13 +31,13 @@ jobs:
3131
- name: Git clone
3232
uses: actions/checkout@v4
3333
- name: Set up Node.js
34-
uses: actions/setup-node@v3
34+
uses: actions/setup-node@v4
3535
- name: Install CDK
3636
run: |
3737
npm install -g aws-cdk cdk-nag
3838
cdk --version
3939
- name: Set up Python ${{ matrix.python-version }}
40-
uses: actions/setup-python@v4
40+
uses: actions/setup-python@v5
4141
with:
4242
python-version: ${{ matrix.python-version }}
4343
- name: Upgrade Pip

‎.github/workflows/checkov.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
DATAALL_REPO_BRANCH: main
2525
strategy:
2626
matrix:
27-
python-version: [3.9]
27+
python-version: [3.12]
2828
services:
2929
postgres:
3030
image: postgres
@@ -44,13 +44,13 @@ jobs:
4444
- name: Git clone
4545
uses: actions/checkout@v4
4646
- name: Set up Node.js
47-
uses: actions/setup-node@v3
47+
uses: actions/setup-node@v4
4848
- name: Install CDK
4949
run: |
5050
npm install -g aws-cdk cdk-nag
5151
cdk --version
5252
- name: Set up Python ${{ matrix.python-version }}
53-
uses: actions/setup-python@v4
53+
uses: actions/setup-python@v5
5454
with:
5555
python-version: ${{ matrix.python-version }}
5656
- name: Upgrade Pip

‎.github/workflows/eslint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- uses: actions/checkout@v4
2828
- name: Use Node.js ${{ matrix.node-version }}
29-
uses: actions/setup-node@v3
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: ${{ matrix.node-version }}
3232
cache-dependency-path: |

‎.github/workflows/integration-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
strategy:
1616
matrix:
17-
python-version: [ 3.9 ]
17+
python-version: [ 3.12 ]
1818
services:
1919
postgres:
2020
image: postgres
@@ -32,9 +32,9 @@ jobs:
3232
steps:
3333
- uses: actions/checkout@v4
3434
- name: Set up Python ${{ matrix.python-version }}
35-
uses: actions/setup-python@v3
35+
uses: actions/setup-python@v5
3636
with:
3737
python-version: ${{ matrix.python-version }}
3838
cache: 'pip'
3939
- name: coverage
40-
run: make coverage
40+
run: make coverage

‎.github/workflows/npm-audit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
steps:
2727
- uses: actions/checkout@v4
2828
- name: Use Node.js ${{ matrix.node-version }}
29-
uses: actions/setup-node@v3
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: ${{ matrix.node-version }}
3232
cache-dependency-path: |

0 commit comments

Comments
 (0)