Merge branch 'upstream' into terraform-package

aws · Jul 30, 2019 · 124f3d9 · 124f3d9
2 parents 373d2f3 + bd7fa76
commit 124f3d9
Show file tree

Hide file tree

Showing 47 changed files with 5,072 additions and 256 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,25 @@
 CHANGELOG
 =========
 
+Next Release (TBD)
+==================
+
+* Add experimental support for websockets
+  (`#1017 <https://github.com/aws/chalice/issues/1017>`__)
+
+* API Gateway Endpoint Type Configuration
+  (`#1160 https://github.com/aws/chalice/pull/1160`__)
+
+* API Gateway Resource Policy Configuration
+  (`#1160 https://github.com/aws/chalice/pull/1160`__)
+
+1.9.1
+=====
+
+* Make MultiDict mutable
+  (`#1158 <https://github.com/aws/chalice/issues/1158>`__)
+
+
 1.9.0
 =====
 

diff --git a/Makefile b/Makefile
@@ -42,8 +42,9 @@ doccheck:
 	##### DOC8 ######
 	# Correct rst formatting for documentation
 	#
+	# TODO: Remove doc8
 	##
-	doc8 docs/source --ignore-path docs/source/topics/multifile.rst
+	doc8 docs/source --ignore-path docs/source/topics/multifile.rst --ignore-path docs/source/tutorials/websockets.rst
 	#
 	#
 	# Verify we have no broken external links

diff --git a/chalice/__init__.py b/chalice/__init__.py
@@ -3,7 +3,7 @@
     ChaliceViewError, BadRequestError, UnauthorizedError, ForbiddenError,
     NotFoundError, ConflictError, TooManyRequestsError, Response, CORSConfig,
     CustomAuthorizer, CognitoUserPoolAuthorizer, IAMAuthorizer,
-    UnprocessableEntityError,
+    UnprocessableEntityError, WebsocketDisconnectedError,
     AuthResponse, AuthRoute, Cron, Rate, __version__ as chalice_version
 )
 # We're reassigning version here to keep mypy happy.

diff --git a/chalice/analyzer.py b/chalice/analyzer.py
@@ -662,7 +662,8 @@ class AppViewTransformer(ast.NodeTransformer):
     _CHALICE_DECORATORS = [
         'route', 'authorizer', 'lambda_function',
         'schedule', 'on_s3_event', 'on_sns_message',
-        'on_sqs_message',
+        'on_sqs_message', 'on_ws_connect', 'on_ws_message',
+        'on_ws_disconnect',
     ]
 
     def visit_FunctionDef(self, node):