Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Checkov and CFN-Lint #319

Merged
merged 5 commits into from
Oct 22, 2024
Merged

Update Checkov and CFN-Lint #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6fa66f0
update checkov and cfn-lint
g-marconet Oct 22, 2024
b3c996f
remove version pinning that was necessary due to old checkov version
g-marconet Oct 22, 2024
754a37e
Merge branch 'main' into g-marconet/checkov-3
g-marconet Oct 22, 2024
8293549
update tests for new versions
g-marconet Oct 22, 2024
d896ea2
run ruff
g-marconet Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/test_backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ jobs:
key: backend-unit-test-tools-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('backend/Makefile') }}
path: backend/.temp
- name: Install Test Dependencies
# Setuptools v74 is incompatible with our version of packaging, so we restrict it
# as well as virtualenv which bundles setuptools in new environments.
run: |
pip install --upgrade pipenv wheel 'setuptools<74' 'virtualenv==20.26.3'
pip install --upgrade pipenv wheel
- name: Run code style tests
run: make -C backend style-test ENV=example
- name: Run backend tests
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/test_orchestrator.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ jobs:
cache-dependency-path: orchestrator/Pipfile.lock
- uses: hashicorp/setup-terraform@b9cd54a3c349d3f38e8881555d616ced269862dd # hashicorp/[email protected]
- name: Install Test Dependencies
# Setuptools v74 is incompatible with our version of packaging, so we restrict it
# as well as virtualenv which bundles setuptools in new environments.
run: |
pip install --upgrade pipenv wheel 'setuptools<74' 'virtualenv==20.26.3'
pip install --upgrade pipenv wheel
- name: Run code style tests
run: make -C orchestrator style-test ENV=example
- name: Run orchestrator tests
Expand Down
6 changes: 3 additions & 3 deletions backend/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ SWIFT_PKG := ${PREFIX}/swift
SWIFT_TAG := ${SWIFT_PKG}:latest
SWIFTLINT_VER := 0.45.1

CHECKOV_VER := 2.0.1065
CHECKOV_VER := 3.2.268

FSB_VER := 1.9.0
FSB_PATCH := -fix2
Expand Down Expand Up @@ -187,10 +187,10 @@ TFLINT_VER := 0.20.2
TFLINT_SHA := 9d0c2a6da320e55018c1ae3df9d5f4e4fe0f34274a609b29f306f407db9e6a2e

# CFN Python Lint
CFN_VER = 0.53.0
CFN_VER = 1.18.1

# Python Packaging Library Version
PACKAGING_VER = 21.3
PACKAGING_VER = 23.2

# Artemis test parameters
BRANCH_NAME := $(shell git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/')
Expand Down
10 changes: 5 additions & 5 deletions backend/Pipfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ python_version = "3.9"

[packages]
awscli = "~=1.34"
boto3 = "~=1.35"
boto3-stubs = {extras = ["ec2", "lambda", "s3", "secretsmanager", "sqs"], version = "~=1.35"}
boto3 = ">=1.34"
boto3-stubs = {extras = ["ec2", "lambda", "s3", "secretsmanager", "sqs"], version = ">=1.34"}
cryptography = "~=42.0"
cwe2 = "~=3.0"
django = "~=3.2"
graphql-query = "~=1.4"
joserfc = "~=0.11.1"
packaging = "==21.3" # Must match version in Makefile.
packaging = "==23.2" # Must match version in Makefile.
psycopg2-binary = "~=2.9"
pydantic = "~=2.9"
PyGithub = "~=2.4"
Expand All @@ -27,8 +27,8 @@ sqlparse = "~=0.5"
[dev-packages]
aiohttp = "~=3.10"
autopep8 = "~=2.3"
cfn-lint = "==0.53.0" # Must match version in Makefile.
checkov = "==2.0.1065" # Must match version in Makefile.
cfn-lint = "==1.18.1" # Must match version in Makefile.
checkov = "==3.2.268" # Must match version in Makefile.
debugpy = "~=1.8.5"
flake8 = "~=7.1"
isort = "~=5.13"
Expand Down
Loading