diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3dfb77c..6be2e55 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,10 +9,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python 3.8 + - name: Set up Python 3.10 uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: "3.10" - name: Install dependencies run: | @@ -38,10 +38,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Set up Python 3.8 + - name: Set up Python 3.10 uses: actions/setup-python@v1 with: - python-version: 3.8 + python-version: "3.10" - name: Install dependencies run: | @@ -86,17 +86,3 @@ jobs: GITHUB_PULL_BASE_SHA: ${{ github.event.pull_request.base.sha }} GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }} - - ggshield-iac: - name: Check for iac vulnerabilities with ggshield - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: GitGuardian iac scan test - uses: GitGuardian/gg-shield/actions/iac@main - with: - args: ./ - env: - GITHUB_DEFAULT_BRANCH: ${{ github.event.repository.default_branch }} - GITGUARDIAN_API_KEY: ${{ secrets.GITGUARDIAN_API_KEY }} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 271cad3..d6a6b49 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -14,7 +14,7 @@ repos: - id: check-yaml - id: check-merge-conflict - - repo: https://gitlab.com/pycqa/flake8 + - repo: https://github.com/pycqa/flake8 rev: 4.0.1 hooks: - id: flake8 @@ -27,7 +27,7 @@ repos: args: [--filter-files, --settings-path, ./lambda/setup.cfg] - repo: https://github.com/commitizen-tools/commitizen - rev: v2.20.0 + rev: v4.8.3 hooks: - id: commitizen stages: [commit-msg] @@ -38,7 +38,7 @@ repos: - id: prettier - repo: https://github.com/gitguardian/ggshield - rev: v1.15.1 + rev: v1.41.0 hooks: - id: ggshield language_version: python3 diff --git a/lambda.tf b/lambda.tf index c99f2dd..567e593 100644 --- a/lambda.tf +++ b/lambda.tf @@ -36,7 +36,7 @@ module "lambda_function" { ] function_name = local.lambda_function_name handler = "entrypoint.lambda_handler" - runtime = "python3.8" + runtime = "python3.10" timeout = 90 publish = true diff --git a/lambda/Pipfile b/lambda/Pipfile index d571596..51cbf5e 100644 --- a/lambda/Pipfile +++ b/lambda/Pipfile @@ -8,7 +8,7 @@ boto3 = "*" [dev-packages] types-boto3 = "*" -"moto[s3,iam,ses]" = "*" +"moto[s3,iam,ses]" = "<5" pytest = "*" black = "==22.3.0" flake8 = "*" @@ -20,4 +20,4 @@ isort = "==5.9.3" pipfile-requirements = "*" [requires] -python_version = "3.8" +python_version = "3" diff --git a/lambda/Pipfile.lock b/lambda/Pipfile.lock index f2e3b1d..dedc3fa 100644 --- a/lambda/Pipfile.lock +++ b/lambda/Pipfile.lock @@ -1,11 +1,11 @@ { "_meta": { "hash": { - "sha256": "b9b128325d7e061b5241cbaf05026bc5daf4dd8d428915b174cbf76da0e1b23d" + "sha256": "4681ced416039d6ee23e7bbb2f04abc207ae8fda6904e456e9a46ed93edf7c20" }, "pipfile-spec": 6, "requires": { - "python_version": "3.8" + "python_version": "3" }, "sources": [ { @@ -18,19 +18,20 @@ "default": { "boto3": { "hashes": [ - "sha256:6b8899542cff82becceb3498a2240bf77c96def0515b0a31f7f6a9d5b92e7a3d", - "sha256:748c055214c629744c34c7f94bfa888733dfac0b92e1daef9c243e1391ea4f53" + "sha256:9c8e88a32a6465e5905308708cff5b17547117f06982908bdfdb0108b4a65079", + "sha256:d1ca2b53138afd0341e1962bd52be6071ab7a63c5b4f89228c5ef8942c40c852" ], "index": "pypi", - "version": "==1.24.96" + "markers": "python_version >= '3.9'", + "version": "==1.38.46" }, "botocore": { "hashes": [ - "sha256:e41a81a18511f2f9181b2a9ab302a55c0effecccbef846c55aad0c47bfdbefb9", - "sha256:fc0a13ef6042e890e361cf408759230f8574409bb51f81740d2e5d8ad5d1fbea" + "sha256:8798e5a418c27cf93195b077153644aea44cb171fcd56edc1ecebaa1e49e226e", + "sha256:89ca782ffbf2e8769ca9c89234cfa5ca577f1987d07d913ee3c68c4776b1eb5b" ], - "markers": "python_version >= '3.7'", - "version": "==1.27.96" + "markers": "python_version >= '3.9'", + "version": "==1.38.46" }, "jmespath": { "hashes": [ @@ -42,35 +43,35 @@ }, "python-dateutil": { "hashes": [ - "sha256:0123cacc1627ae19ddf3c27a5de5bd67ee4586fbdd6440d9748f8abb483d3e86", - "sha256:961d03dc3453ebbc59dbdea9e4e11c5651520a876d0f4db161e8674aae935da9" + "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", + "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", - "version": "==2.8.2" + "version": "==2.9.0.post0" }, "s3transfer": { "hashes": [ - "sha256:06176b74f3a15f61f1b4f25a1fc29a4429040b7647133a463da8fa5bd28d5ecd", - "sha256:2ed07d3866f523cc561bf4a00fc5535827981b117dd7876f036b0c1aca42c947" + "sha256:0148ef34d6dd964d0d8cf4311b2b21c474693e57c2e069ec708ce043d2b527be", + "sha256:f5e6db74eb7776a37208001113ea7aa97695368242b364d73e91c981ac522177" ], - "markers": "python_version >= '3.7'", - "version": "==0.6.0" + "markers": "python_version >= '3.9'", + "version": "==0.13.0" }, "six": { "hashes": [ - "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", - "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" + "sha256:4721f391ed90541fddacab5acf947aa0d3dc7d27b2e1e8eda2be8970586c3274", + "sha256:ff70335d468e7eb6ec65b95b99d3a2836546063f63acc5171de367e834932a81" ], "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2'", - "version": "==1.16.0" + "version": "==1.17.0" }, "urllib3": { "hashes": [ - "sha256:3fa96cf423e6987997fc326ae8df396db2a8b7c667747d47ddd8ecba91f4a74e", - "sha256:b930dd878d5a8afb066a637fbb35144fe7901e3b209d1cd4f524bd0e9deee997" + "sha256:3fc47733c7e419d4bc3f6b3dc2b4f890bb743906a30d56ba4a5bfa4bbff92760", + "sha256:e6b01673c0fa6a13e374b50871808eb3bf7046c4b125b216f6bf1cc604cff0dc" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5' and python_version < '4'", - "version": "==1.26.12" + "markers": "python_version >= '3.9'", + "version": "==2.5.0" } }, "develop": {