Add nullable header / query / params for HTTP

azure-functions-language-worker-protobuf/README.md

@@ -1,4 +1,4 @@
-# Azure Functions Languge Worker Protobuf
+# Azure Functions Language Worker Protobuf
 
 This repository contains the protobuf definition file which defines the gRPC service which is used between the [Azure Functions Host](https://github.com/Azure/azure-functions-host) and the Azure Functions language workers. This repo is shared across many repos in many languages (for each worker) by using git commands.
 
@@ -39,7 +39,7 @@ From within the Azure Functions language worker repo:
 ## Releasing a Language Worker Protobuf version
 
 1.	Draft a release in the GitHub UI
-    -   Be sure to inculde details of the release
+    -   Be sure to include details of the release
 2.	Create a release version, following semantic versioning guidelines ([semver.org](https://semver.org/))
 3.	Tag the version with the pattern: `v<M>.<m>.<p>-protofile` (example: `v1.1.0-protofile`)
 3.	Merge `dev` to `master`

azure-functions-language-worker-protobuf/src/proto/FunctionRpc.proto

@@ -96,6 +96,9 @@ message WorkerInitRequest {
   // inform worker of supported categories and their levels
   // i.e. Worker = Verbose, Function.MyFunc = None
   map<string, RpcLog.Level> log_categories = 3;
+
+  // Full path of worker.config.json location
+  string worker_directory = 4;
 }
 
 // Worker responds with the result of initializing itself
@@ -481,4 +484,7 @@ message RpcHttp {
   TypedData rawBody = 17;
   repeated RpcClaimsIdentity identities = 18;
   repeated RpcHttpCookie cookies = 19;
+  map<string,NullableString> nullable_headers = 20;
+  map<string,NullableString> nullable_params = 21;
+  map<string,NullableString> nullable_query = 22;
 }

src/WorkerChannel.ts

@@ -92,7 +92,8 @@ export class WorkerChannel implements IWorkerChannel {
       RpcHttpTriggerMetadataRemoved: "true",
       RpcHttpBodyOnly: "true",
       IgnoreEmptyValuedRpcHttpHeaders: "true",
-      WorkerStatus: "true"
+      WorkerStatus: "true",
+      UseNullableValueDictionaryForHttp: "true"
     };
     this._eventStream.write({
       requestId: requestId,

src/converters/RpcHttpConverters.ts

@@ -1,4 +1,7 @@
-import { AzureFunctionsRpcMessages as rpc } from '../../azure-functions-language-worker-protobuf/src/rpc';
+import { 
+    AzureFunctionsRpcMessages as rpc,
+    INullableString
+} from '../../azure-functions-language-worker-protobuf/src/rpc';
 import { HttpMethod, Cookie } from '../public/Interfaces';
 import { RequestProperties } from '../http/Request';
 import { Dict } from '../Context';
@@ -21,9 +24,9 @@ export function fromRpcHttp(rpcHttp: rpc.IRpcHttp): RequestProperties {
       method: <HttpMethod>rpcHttp.method,
       url: <string>rpcHttp.url,
       originalUrl: <string>rpcHttp.url,
-      headers: <Dict<string>>rpcHttp.headers,
-      query: <Dict<string>>rpcHttp.query,
-      params: <Dict<string>>rpcHttp.params,
+      headers: fromNullableMapping(rpcHttp.nullableHeaders, rpcHttp.headers),
+      query: fromNullableMapping(rpcHttp.nullableQuery, rpcHttp.query),
+      params: fromNullableMapping(rpcHttp.nullableParams, rpcHttp.params),
       body: fromTypedData(<rpc.ITypedData>rpcHttp.body),
       rawBody: fromRpcHttpBody(<rpc.ITypedData>rpcHttp.body),
     };
@@ -46,6 +49,18 @@ function fromRpcHttpBody(body: rpc.ITypedData) {
     }
 }
 
+function fromNullableMapping(nullableMapping: { [k: string]: INullableString } | null | undefined, originalMapping?: { [k: string]: string } | null): Dict<string> {
+    let converted = {};
+    if (nullableMapping && Object.keys(nullableMapping).length > 0) {
+        for (const key in nullableMapping) {
+            converted[key] = nullableMapping[key].value || "";
+        }
+    } else if (originalMapping && Object.keys(originalMapping).length > 0) {
+        converted = <Dict<string>>originalMapping;
+    }
+    return converted;
+}
+
 /**
  * Converts the HTTP 'Response' object to an 'ITypedData' 'http' type to be sent through the RPC layer. 
  * 'http' types are a special case from other 'ITypedData' types, which come from primitive types. 

test/WorkerChannelTests.ts

@@ -31,7 +31,8 @@ describe('WorkerChannel', () => {
               'RpcHttpBodyOnly': "true",
               'RpcHttpTriggerMetadataRemoved': "true",
               'IgnoreEmptyValuedRpcHttpHeaders': "true",
-              'WorkerStatus': "true"
+              'WorkerStatus': "true",
+              'UseNullableValueDictionaryForHttp': "true"
         },
         result: {
           status: rpc.StatusResult.Status.Success