Merge branch 'master' into 1526-regression-deploy

.github/workflows/lambda-functions.yml

@@ -91,16 +91,7 @@ jobs:
       - name: Package and deploy VA Profile opt-in/out lambda function
         if: ${{ (inputs.lambdaName == 'ProfileOptInOut') || (inputs.lambdaName == 'All') }}
         run: |
-          cd va_profile/
-          python3 -m venv venv_va_profile_opt_in_out
-          source venv_va_profile_opt_in_out/bin/activate
-          pip install PyJWT~=2.6.0
-          pip install cryptography~=37.0.4
-          deactivate
-          cd venv_va_profile_opt_in_out/lib/python3.8/site-packages
-          zip -r9 ../../../../va_profile_opt_in_out_lambda.zip .
-          cd ../../../../
-          zip -ugj va_profile_opt_in_out_lambda va_profile_opt_in_out_lambda.py
+          zip -j va_profile_opt_in_out_lambda va_profile/va_profile_opt_in_out_lambda.py
           aws lambda update-function-code --function-name project-${{ inputs.environment }}-va-profile-opt-in-out-lambda --zip-file fileb://va_profile_opt_in_out_lambda.zip
 
         # This function uses lambda layers for dependencies.
@@ -131,7 +122,7 @@ jobs:
           zip -j vetext_incoming_forwarder_lambda vetext_incoming_forwarder_lambda/vetext_incoming_forwarder_lambda.py
           aws lambda update-function-code --function-name project-${{ inputs.environment }}-vetext-incoming-forwarder-lambda --zip-file fileb://vetext_incoming_forwarder_lambda.zip
 
-        # This function does not have any dependencies.
+        # This function uses lambda layers for dependencies.
       - name: Package and deploy delivery status processing lambda
         if: ${{ (inputs.lambdaName == 'DeliveryStatusProcessor') || (inputs.lambdaName == 'All') }}
         run: |

.pre-commit-config.yaml

@@ -1,26 +1,20 @@
 repos:
     - repo: https://github.com/thoughtworks/talisman
-      rev: 'v1.27.0'
+      rev: 'v1.31.0'
       hooks:
           - id: talisman-commit
+            entry: cmd --githook pre-commit
     - repo: https://github.com/PyCQA/bandit
-      rev: '1.7.4'
+      rev: '1.7.6'
       hooks:
           - id: bandit
             args: [-c, .bandit.yml, -r, -l]
-    - repo: https://gitlab.com/pycqa/flake8
-      rev: '3.7.9'
+    - repo: https://github.com/astral-sh/ruff-pre-commit
+      # Ruff version.
+      rev: 'v0.1.11'
       hooks:
-          - id: flake8
-            args: [--config, .flake8]
-            exclude: |
-              (?x)(
-                ^venv*|
-                ^__pycache__|
-                ^node_modules|
-                ^cache|
-                ^migrations|
-                ^build|
-                ^lambda_functions
-              )
-            
+        # Run the linter.
+        - id: ruff
+          args: [ --fix ]
+        # Run the formatter.
+        - id: ruff-format

.talismanrc

@@ -1,3 +1,3 @@
 fileignoreconfig:
-  - filename: requirements.txt
-    checksum: d87d89892a2c545da7e94ecf4f6dbf891139c3cfcb254bb07a43dee582755f6a
+- filename: app/celery/letters_pdf_tasks.py
+  checksum: 3430294d1d4e37f8886c3103557355d4c89c13bf1186a97709b1cfb86b78b5a3

README.md

@@ -116,6 +116,8 @@ This repository uses [pre-commit](https://pre-commit.com/) and [talisman](https:
 
 OSX users can run `brew bundle` and then `pre-commit install` to register the git hooks.  The configuration is stored in .pre-commit-config.yaml.
 
+Ruff has been added to the pre-commit hook in place of flake8. See [documentation](https://github.com/department-of-veterans-affairs/vanotify-team/blob/master/Engineering/formatter.md) for setup.
+
 ### Building the production application container
 
 To verify that the production application container build should succeed during deployment, run: