Revert changes to examples using "cloudfront-viewer-country"

Author: ericbn

aws_lambda_powertools/event_handler/appsync.py

@@ -126,8 +126,8 @@ def handler(event, context: LambdaContext):
 
         class MyCustomModel(AppSyncResolverEvent):
             @property
-            def country_viewer(self):
-                return self.request_headers.get("cloudfront-viewer-country")
+            def country_viewer(self) -> str:
+                return self.request_headers.get("cloudfront-viewer-country", "")
 
 
         @app.resolver(field_name="listLocations")

examples/event_handler_graphql/src/custom_models.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List
 
 from aws_lambda_powertools import Logger, Tracer
 from aws_lambda_powertools.event_handler import AppSyncResolver
@@ -25,12 +25,12 @@ class Location(TypedDict, total=False):
 
 class MyCustomModel(AppSyncResolverEvent):
     @property
-    def country_viewer(self) -> Optional[str]:
-        return self.request_headers.get("cloudfront-viewer-country")
+    def country_viewer(self) -> str:
+        return self.request_headers.get("cloudfront-viewer-country", "")
 
     @property
-    def api_key(self) -> Optional[str]:
-        return self.request_headers.get("x-api-key")
+    def api_key(self) -> str:
+        return self.request_headers.get("x-api-key", "")
 
 
 @app.resolver(type_name="Query", field_name="listLocations")

tests/functional/event_handler/test_appsync.py

@@ -145,8 +145,8 @@ def test_resolve_custom_data_model():
 
     class MyCustomModel(AppSyncResolverEvent):
         @property
-        def country_viewer(self):
-            return self.request_headers.get("cloudfront-viewer-country")
+        def country_viewer(self) -> str:
+            return self.request_headers.get("cloudfront-viewer-country", "")
 
     app = AppSyncResolver()