Merge branch 'master' into sentry-disallowed-host

DemocracyClub · Nov 13, 2024 · e11e3b9 · e11e3b9
2 parents 34f16e6 + 1427a5e
commit e11e3b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,6 +5,7 @@
 version: 2.1
 orbs:
   slack: circleci/[email protected]
+  aws-cli: circleci/[email protected]
 
 executors:
   py312:
@@ -196,7 +197,7 @@ jobs:
       - attach_workspace:
           at: ~/repo/
       - run: printenv DC_ENVIRONMENT
-      - run: pip install awscli==1.29.5
+      - aws-cli/setup
       - run:
           name: post deploy tests
           command: |

diff --git a/Makefile b/Makefile
@@ -28,7 +28,8 @@ lambda-migrate:  ## Invoke lambda to migrate the database
 	aws lambda invoke \
 	--function-name WCIVFControllerFunction \
 	--payload '{ "command": "migrate" }' \
-	/dev/stdout
+	--cli-binary-format raw-in-base64-out \
+	/dev/stdout | grep --invert-match 'FunctionError'
 
 
 lib/dc_utils:
@@ -42,4 +43,3 @@ makemessages: lib/dc_utils
 .PHONY: compilemessages
 compilemessages:
 	${VIRTUAL_ENV}/bin/python manage.py compilemessages --ignore='env*'
-