Skip to content

Commit 61ca84b

Browse files
committed
Update to lambda and API integration
1 parent 1a4fbd0 commit 61ca84b

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

docs/cloudformation/geocore-semantic-search-with-opensearch.yml

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Parameters:
2424
#Todo: change SagemakerEndpoint to a resource that can be referenced
2525
SagemakerEndpoint:
2626
Type: String
27-
Default: semantic-search-model-1709665975
27+
Default: Copy-endpoint-name-from-SageMaker-AI-Dashboard-via-AWS-Console
2828
Description: sagamaker endpoint for the pretrained/finetuned models
2929
OSDomainName:
3030
Type: String
@@ -48,7 +48,7 @@ Parameters:
4848
#Todo: change OSEndpoint to a resource that can be referenced
4949
OSEndpoint:
5050
Type: String
51-
Default: search-semantic-search-dfcizxxxuj62dusl5skmeu3czu.ca-central-1.es.amazonaws.com
51+
Default: Copy-domain-endpoint-from-OpenSearch-Domains-via-AWS-console
5252
Description: OpenSearch endpoint
5353
OSSecretID:
5454
Type: String
@@ -427,7 +427,7 @@ Resources:
427427
Access-Control-Allow-Origin:
428428
type: "string"
429429
x-amazon-apigateway-integration: #Integration response:https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-specification-api-gateway-extensions.html
430-
type: aws_proxy
430+
type: aws
431431
httpMethod: POST
432432
uri: !Sub 'arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${InvokeSagemakerEndpointPretrain.Arn}/invocations'
433433
responses:
@@ -436,10 +436,27 @@ Resources:
436436
responseParameters:
437437
method.response.header.Access-Control-Allow-Origin: "'*'"
438438
requestTemplates:
439-
application/json: "{\r\n \"method\" : \"$input.params('method')\",\r\n\
440-
\ \"searchString\" : \"$input.params('searchString')\"}"
441-
#passthroughBehavior: "when_no_templates"
442-
#contentHandling: "CONVERT_TO_TEXT"
439+
application/json: |
440+
{
441+
"method": "$input.params('method')",
442+
"q": "$input.params('q')",
443+
"bbox": "$input.params('bbox')",
444+
"relation": "$input.params('relation')",
445+
"begin": "$input.params('begin')",
446+
"end": "$input.params('end')",
447+
"org": "$input.params('org')",
448+
"type": "$input.params('type')",
449+
"theme": "$input.params('theme')",
450+
"foundational": "$input.params('foundational')",
451+
"source_system": "$input.params('source_system')",
452+
"eo_collection": "$input.params('eo_collection')",
453+
"polarization": "$input.params('polarization')",
454+
"orbit_direction": "$input.params('orbit_direction')",
455+
"lang": "$input.params('lang')",
456+
"sort": "$input.params('sort')",
457+
"size": "$input.params('size')",
458+
"from": "$input.params('from')"
459+
}
443460
options:
444461
consumes:
445462
- "application/json"
Binary file not shown.

0 commit comments

Comments
 (0)