feat: Add query params to websocket requests (#485)

nitrictech · Jul 12, 2023 · 2cb1307 · 2cb1307
2 parents f8ccb10 + 325d5d0
commit 2cb1307
Show file tree

Hide file tree

Showing 6 changed files with 184 additions and 119 deletions.
diff --git a/cloud/aws/runtime/gateway/lambda.go b/cloud/aws/runtime/gateway/lambda.go
@@ -98,14 +98,22 @@ func (s *LambdaGateway) handleWebsocketEvent(ctx context.Context, evt events.API
 		return nil, fmt.Errorf("received websocket trigger from non-nitric API gateway")
 	}
 
+	queryParams := map[string]*v1.QueryValue{}
+	for k, v := range evt.QueryStringParameters {
+		queryParams[k] = &v1.QueryValue{
+			Value: []string{v},
+		}
+	}
+
 	req := &v1.TriggerRequest{
 		Data: []byte(evt.Body),
 		Context: &v1.TriggerRequest_Websocket{
 			Websocket: &v1.WebsocketTriggerContext{
 				ConnectionId: evt.RequestContext.ConnectionID,
 				Event:        wsEvent,
 				// Get the API gateways nitric name
-				Socket: nitricName,
+				Socket:      nitricName,
+				QueryParams: queryParams,
 			},
 		},
 	}

diff --git a/cloud/aws/runtime/gateway/lambda_test.go b/cloud/aws/runtime/gateway/lambda_test.go
@@ -196,6 +196,7 @@ var _ = Describe("Lambda", func() {
 							Socket:       "test-api",
 							Event:        v1.WebsocketEvent_Connect,
 							ConnectionId: "testing",
+							QueryParams:  map[string]*v1.QueryValue{},
 						},
 					},
 				}).Return(&v1.TriggerResponse{

diff --git a/contracts/proto/faas/v1/faas.proto b/contracts/proto/faas/v1/faas.proto
@@ -244,6 +244,9 @@ message WebsocketTriggerContext {
 
   // The connection this trigger came from
   string connectionId = 3;
+
+  // The query params available in the connection request
+  map<string, QueryValue> query_params = 6;
 }
 
 // The worker has successfully processed a trigger