FEAT: Forward sortation areas with OpenSearch

Author: bo-lu

docs/cloudformation/geolocator-web-presence.yml

@@ -22,11 +22,11 @@ Parameters:
     Type: String
     Description: ARN of the Lambda@Edge function for injecting security headers to CloudFront
   OSEndpoint:
-    Type: String
+    Type: AWS::SSM::Parameter::Value<String>
     Default: /OpenSearch/Endpoint
     Description: OpenSearch endpoint
   OSSecretID:
-    Type: String
+    Type: AWS::SSM::Parameter::Value<String>
     Default: /OpenSearch/SSM
     Description: SSM parameter name for OpenSearch user name and password
 
@@ -41,7 +41,7 @@ Resources:
       Role: !GetAtt LambdaExecutionRole.Arn
       CodeUri:
         Bucket: !Ref DeploymentBucket
-        Key: cloudformation-templates/lambda/geolocator/geolocator-commit-15b0de5722c2362d49cdfdbdfd2cb9f97c94059e.zip
+        Key: cloudformation-templates/lambda/geolocator/geolocator-20250618-1200-43817b1.zip
       MemorySize: 3009
       Handler: index.handler
       Timeout: 900
@@ -65,7 +65,7 @@ Resources:
         Bucket: !Ref DeploymentBucket
         Key: cloudformation-templates/lambda/geolocator/forward-sortation-area-20250615-1200.zip
       MemorySize: 3009
-      Handler: index.handler
+      Handler: app.lambda_handler
       Timeout: 30
       Environment:
         Variables:
@@ -116,7 +116,7 @@ Resources:
               - Effect: Allow
                 Action:
                   - secretsmanager:GetSecretValue
-                Resource: arn:aws:secretsmanager:ca-central-1:${AWS::AccountId}:secret:OpenSearchSecret-geocore-semantic-search-with-opensearch-stage*
+                Resource: !Sub "arn:aws:secretsmanager:ca-central-1:${AWS::AccountId}:secret:OpenSearchSecret-geocore-semantic-search-with-opensearch-stage*"
               - Effect: Allow
                 Action:
                   - es:ESHttpGet
@@ -127,7 +127,7 @@ Resources:
                   - es:ListDomainNames
                   - es:ESHttpHead
                   - es:ESHttpPatch
-                Resource: !Sub arn:aws:es:ca-central-1:${AWS::AccountId}:domain/*/*
+                Resource: !Sub "arn:aws:es:ca-central-1:${AWS::AccountId}:domain/*/*"
 
   VerificationHeaderSecret: 
     Type: AWS::SecretsManager::Secret
@@ -246,24 +246,7 @@ Resources:
       Name: geolocator
       AccessLogSetting:
         DestinationArn: !GetAtt LogGroup.Arn
-        Format: >-
-          {
-            "requestId": "$context.requestId",
-            "ip": "$context.identity.sourceIp",
-            "caller": "$context.identity.caller",
-            "user": "$context.identity.user",
-            "requestTime": "$context.requestTime",
-            "httpMethod": "$context.httpMethod",
-            "resourcePath": "$context.resourcePath",
-            "status": "$context.status",
-            "protocol": "$context.protocol",
-            "responseLength": "$context.responseLength",
-            "errorMessage": "$context.error.message",
-            "integrationLatency": "$context.integrationLatency",
-            "apiId": "$context.apiId",
-            "stage": "$context.stage",
-            "latency": "$context.latency"
-          }
+        Format: '{"requestId":"$context.requestId","ip":"$context.identity.sourceIp","caller":"$context.identity.caller","user":"$context.identity.user","requestTime":"$context.requestTime","httpMethod":"$context.httpMethod","resourcePath":"$context.resourcePath","status":"$context.status","protocol":"$context.protocol","responseLength":"$context.responseLength","errorMessage":"$context.error.message","integrationLatency":"$context.integrationLatency","apiId":"$context.apiId","stage":"$context.stage","latency":"$context.latency"}'
       EndpointConfiguration:
         Type: REGIONAL
       OpenApiVersion: '2.0'
@@ -277,18 +260,72 @@ Resources:
         paths:
           /:
             get:
-              x-amazon-apigateway-integration:
-                type: aws_proxy
+              consumes:
+              - "application/json"
+              produces:
+              - "application/json"
+              responses: #Method response:https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-method-methodresponse.html
+                "200":
+                  description: "200 response"
+                  # schema:
+                  #   $ref: "#/definitions/Empty"
+                  headers:
+                    Access-Control-Allow-Origin:
+                      type: "string"
+              x-amazon-apigateway-integration: #Integration response:https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-specification-api-gateway-extensions.html
+                type: aws
                 httpMethod: POST
                 uri: !Sub 'arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${Geolocator.Arn}/invocations'
-              responses: {}
+                responses: 
+                  default:
+                    statusCode: "200"
+                    responseParameters:
+                      method.response.header.Access-Control-Allow-Origin: "'*'" 
+                requestTemplates:
+                  application/json: |
+                    {
+                      "q": "$input.params('q')",
+                      "key": "$input.params('key')",
+                      "keys": "$input.params('keys')",
+                      "lang": "$input.params('lang')",
+                      "table": "$input.params('table')",
+                      "ip_address": "$context.identity.sourceIp",
+                      "timestamp": "$context.requestTimeEpoch",
+                      "user_agent": "$context.identity.userAgent",
+                      "http_method": "$context.httpMethod"
+                    }
           /fsa:
             get:
-              x-amazon-apigateway-integration:
-                type: aws_proxy
+              consumes:
+              - "application/json"
+              produces:
+              - "application/json"
+              responses: #Method response:https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-method-methodresponse.html
+                "200":
+                  description: "200 response"
+                  # schema:
+                  #   $ref: "#/definitions/Empty"
+                  headers:
+                    Access-Control-Allow-Origin:
+                      type: "string"
+              x-amazon-apigateway-integration: #Integration response:https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-specification-api-gateway-extensions.html
+                type: aws
                 httpMethod: POST
                 uri: !Sub 'arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${ForwardSortationLambda.Arn}/invocations'
-              responses: {}
+                responses: 
+                  default:
+                    statusCode: "200"
+                    responseParameters:
+                      method.response.header.Access-Control-Allow-Origin: "'*'" 
+                requestTemplates:
+                  application/json: |
+                    {
+                      "q": "$input.params('q')",
+                      "ip_address": "$context.identity.sourceIp",
+                      "timestamp": "$context.requestTimeEpoch",
+                      "user_agent": "$context.identity.userAgent",
+                      "http_method": "$context.httpMethod"
+                    }
   geolocatorS3Bucket:
     Type: AWS::S3::Bucket
     Properties: