Update proto code generation. Access modifier and namespace changes

fabiocav · fabiocav · commit dea20fbe1fc1 · 2021-02-24T10:51:56.000-08:00
diff --git a/src/DotNetWorker/Broker/FunctionBroker.cs b/src/DotNetWorker/Broker/FunctionBroker.cs
@@ -6,11 +6,11 @@
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker.Context;
 using Microsoft.Azure.Functions.Worker.Diagnostics;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 using Microsoft.Azure.Functions.Worker.Pipeline;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Status = Microsoft.Azure.WebJobs.Script.Grpc.Messages.StatusResult.Types.Status;
+using Status = Microsoft.Azure.Functions.Worker.Grpc.Messages.StatusResult.Types.Status;
 
 namespace Microsoft.Azure.Functions.Worker
 {
diff --git a/src/DotNetWorker/Broker/IFunctionBroker.cs b/src/DotNetWorker/Broker/IFunctionBroker.cs
@@ -1,15 +1,18 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker.Context;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker
 {
-    public interface IFunctionBroker
+    internal interface IFunctionBroker
     {
+        // TODO: Interface made internal as it should be refactored
+        // to remove a dependency on proto/gRPC generated types
         void AddFunction(FunctionLoadRequest functionLoadRequest);
+
         Task<InvocationResponse> InvokeAsync(FunctionInvocation invocation);
     }
 }
diff --git a/src/DotNetWorker/Configuration/ServiceCollectionExtensions.cs b/src/DotNetWorker/Configuration/ServiceCollectionExtensions.cs
@@ -12,14 +12,14 @@
 using Microsoft.Azure.Functions.Worker.Invocation;
 using Microsoft.Azure.Functions.Worker.OutputBindings;
 using Microsoft.Azure.Functions.Worker.Pipeline;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using static Microsoft.Azure.WebJobs.Script.Grpc.Messages.FunctionRpc;
+using static Microsoft.Azure.Functions.Worker.Grpc.Messages.FunctionRpc;
 
 namespace Microsoft.Extensions.DependencyInjection
 {
diff --git a/src/DotNetWorker/Context/GrpcFunctionInvocation.cs b/src/DotNetWorker/Context/GrpcFunctionInvocation.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker.Context
 {
diff --git a/src/DotNetWorker/Context/GrpcValueProvider.cs b/src/DotNetWorker/Context/GrpcValueProvider.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Google.Protobuf.Collections;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker.Context
 {
diff --git a/src/DotNetWorker/DefaultFunctionsHostClient.cs b/src/DotNetWorker/DefaultFunctionsHostClient.cs
@@ -1,12 +1,12 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
 using System.Threading.Channels;
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker.Context;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
-using MsgType = Microsoft.Azure.WebJobs.Script.Grpc.Messages.StreamingMessage.ContentOneofCase;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
+using MsgType = Microsoft.Azure.Functions.Worker.Grpc.Messages.StreamingMessage.ContentOneofCase;
 
 
 namespace Microsoft.Azure.Functions.Worker
diff --git a/src/DotNetWorker/DefaultHostRequestHandler.cs b/src/DotNetWorker/DefaultHostRequestHandler.cs
@@ -4,8 +4,8 @@
 using System;
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker.Context;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
-using Status = Microsoft.Azure.WebJobs.Script.Grpc.Messages.StatusResult.Types.Status;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
+using Status = Microsoft.Azure.Functions.Worker.Grpc.Messages.StatusResult.Types.Status;
 
 namespace Microsoft.Azure.Functions.Worker
 {
diff --git a/src/DotNetWorker/Definition/DefaultFunctionDefinitionFactory.cs b/src/DotNetWorker/Definition/DefaultFunctionDefinitionFactory.cs
@@ -10,7 +10,7 @@
 using Microsoft.Azure.Functions.Worker.Definition;
 using Microsoft.Azure.Functions.Worker.Invocation;
 using Microsoft.Azure.Functions.Worker.OutputBindings;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker
 {
diff --git a/src/DotNetWorker/Definition/GrpcBindingMetadata.cs b/src/DotNetWorker/Definition/GrpcBindingMetadata.cs
@@ -1,16 +1,16 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker
 {
-    public class GrpcBindingMetadata : BindingMetadata
+    internal class GrpcBindingMetadata : BindingMetadata
     {
         public GrpcBindingMetadata(BindingInfo bindingInfo)
         {
diff --git a/src/DotNetWorker/Definition/GrpcFunctionMetadata.cs b/src/DotNetWorker/Definition/GrpcFunctionMetadata.cs
@@ -6,7 +6,7 @@
 using System.Collections.Immutable;
 using System.IO;
 using System.Linq;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker.Definition
 {
diff --git a/src/DotNetWorker/Definition/IFunctionDefinitionFactory.cs b/src/DotNetWorker/Definition/IFunctionDefinitionFactory.cs
@@ -1,12 +1,14 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+﻿// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker
 {
-    public interface IFunctionDefinitionFactory
+    internal interface IFunctionDefinitionFactory
     {
+        // TODO: Interface made internal as it should be refactored
+        // to remove a dependency on proto/gRPC generated types
         FunctionDefinition Create(FunctionLoadRequest request);
     }
 }
diff --git a/src/DotNetWorker/DotNetWorker.csproj b/src/DotNetWorker/DotNetWorker.csproj
@@ -27,4 +27,10 @@
   <ItemGroup>
      <Protobuf Include=".\protobuf\src\proto\**\*.proto" ProtoRoot=".\protobuf\src\proto" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Protobuf Update=".\protobuf\src\proto\FunctionRpc.proto" Access="Internal" />
+    <Protobuf Update=".\protobuf\src\proto\identity\ClaimsIdentityRpc.proto" Access="Internal" />
+    <Protobuf Update=".\protobuf\src\proto\shared\NullableTypes.proto" Access="Internal" />
+  </ItemGroup>
 </Project>
diff --git a/src/DotNetWorker/FunctionsHostOutputChannel.cs b/src/DotNetWorker/FunctionsHostOutputChannel.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Threading.Channels;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker
 {
diff --git a/src/DotNetWorker/Grpc/GrpcFunctionsHostLogger.cs b/src/DotNetWorker/Grpc/GrpcFunctionsHostLogger.cs
@@ -5,9 +5,9 @@
 using System.Collections.Generic;
 using System.Threading.Channels;
 using Microsoft.Azure.Functions.Worker.Diagnostics;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 using Microsoft.Extensions.Logging;
-using static Microsoft.Azure.WebJobs.Script.Grpc.Messages.RpcLog.Types;
+using static Microsoft.Azure.Functions.Worker.Grpc.Messages.RpcLog.Types;
 
 namespace Microsoft.Azure.Functions.Worker.Logging
 {
diff --git a/src/DotNetWorker/Grpc/GrpcFunctionsHostLoggerProvider.cs b/src/DotNetWorker/Grpc/GrpcFunctionsHostLoggerProvider.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Channels;
 using Microsoft.Azure.Functions.Worker.Logging;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Azure.Functions.Worker.Diagnostics
diff --git a/src/DotNetWorker/Grpc/GrpcHttpCookies.cs b/src/DotNetWorker/Grpc/GrpcHttpCookies.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using Google.Protobuf.Collections;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker
 {
diff --git a/src/DotNetWorker/Grpc/GrpcHttpRequestData.cs b/src/DotNetWorker/Grpc/GrpcHttpRequestData.cs
@@ -8,7 +8,7 @@
 using System.Security.Claims;
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker
 {
diff --git a/src/DotNetWorker/Grpc/GrpcHttpResponseData.cs b/src/DotNetWorker/Grpc/GrpcHttpResponseData.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using Google.Protobuf;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker
 {
diff --git a/src/DotNetWorker/Grpc/RpcHttpCookie.cs b/src/DotNetWorker/Grpc/RpcHttpCookie.cs
@@ -2,13 +2,11 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
-using System.Security.Claims;
-using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 
-namespace Microsoft.Azure.WebJobs.Script.Grpc.Messages
+namespace Microsoft.Azure.Functions.Worker.Grpc.Messages
 {
-    public sealed partial class RpcHttpCookie : IHttpCookie
+    internal sealed partial class RpcHttpCookie : IHttpCookie
     {
         string IHttpCookie.Domain => Domain.Value;
 
diff --git a/src/DotNetWorker/IFunctionsHostClient.cs b/src/DotNetWorker/IFunctionsHostClient.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System.Threading.Tasks;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker
 {
diff --git a/src/DotNetWorker/IHostRequestHandler.cs b/src/DotNetWorker/IHostRequestHandler.cs
@@ -3,7 +3,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker.Context;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker
 {
diff --git a/src/DotNetWorker/RpcExtensions.cs b/src/DotNetWorker/RpcExtensions.cs
@@ -7,7 +7,7 @@
 using Google.Protobuf;
 using Microsoft.Azure.Functions.Worker.Definition;
 using Microsoft.Azure.Functions.Worker.Http;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 
 namespace Microsoft.Azure.Functions.Worker
 {
diff --git a/src/DotNetWorker/WorkerHostedService.cs b/src/DotNetWorker/WorkerHostedService.cs
@@ -5,10 +5,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Grpc.Core;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
-using static Microsoft.Azure.WebJobs.Script.Grpc.Messages.FunctionRpc;
+using static Microsoft.Azure.Functions.Worker.Grpc.Messages.FunctionRpc;
 
 namespace Microsoft.Azure.Functions.Worker
 {
diff --git a/src/DotNetWorker/protobuf/src/proto/FunctionRpc.proto b/src/DotNetWorker/protobuf/src/proto/FunctionRpc.proto
@@ -4,7 +4,7 @@ syntax = "proto3";
 option java_multiple_files = true;
 option java_package = "com.microsoft.azure.functions.rpc.messages";
 option java_outer_classname = "FunctionProto";
-option csharp_namespace = "Microsoft.Azure.WebJobs.Script.Grpc.Messages";
+option csharp_namespace = "Microsoft.Azure.Functions.Worker.Grpc.Messages";
 option go_package ="github.com/Azure/azure-functions-go-worker/internal/rpc";
 
 package AzureFunctionsRpcMessages;
diff --git a/test/DotNetWorkerTests/DefaultInvocationPipelineBuilderTests.cs b/test/DotNetWorkerTests/DefaultInvocationPipelineBuilderTests.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Pipeline;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using System;
diff --git a/test/DotNetWorkerTests/Diagnostics/GrpcHostLoggerTests.cs b/test/DotNetWorkerTests/Diagnostics/GrpcHostLoggerTests.cs
@@ -6,10 +6,10 @@
 using System.Threading.Channels;
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker.Diagnostics;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 using Microsoft.Extensions.Logging;
 using Xunit;
-using static Microsoft.Azure.WebJobs.Script.Grpc.Messages.RpcLog.Types;
+using static Microsoft.Azure.Functions.Worker.Grpc.Messages.RpcLog.Types;
 
 namespace Microsoft.Azure.Functions.Worker.Tests.Diagnostics
 {
diff --git a/test/DotNetWorkerTests/FunctionBrokerTests.cs b/test/DotNetWorkerTests/FunctionBrokerTests.cs
@@ -4,7 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.Azure.Functions.Worker.Context;
 using Microsoft.Azure.Functions.Worker.Pipeline;
-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;
+using Microsoft.Azure.Functions.Worker.Grpc.Messages;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Logging.Abstractions;
 using Moq;

Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,18 @@`
`1`		`-// Copyright (c) .NET Foundation. All rights reserved.`
	`1`	`+// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`	`using Microsoft.Azure.Functions.Worker.Context;`
`6`		`-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;`
	`6`	`+using Microsoft.Azure.Functions.Worker.Grpc.Messages;`
`7`	`7`
`8`	`8`	`namespace Microsoft.Azure.Functions.Worker`
`9`	`9`	`{`
`10`		`- public interface IFunctionBroker`
	`10`	`+ internal interface IFunctionBroker`
`11`	`11`	`{`
	`12`	`+ // TODO: Interface made internal as it should be refactored`
	`13`	`+ // to remove a dependency on proto/gRPC generated types`
`12`	`14`	`void AddFunction(FunctionLoadRequest functionLoadRequest);`
	`15`	`+`
`13`	`16`	`Task<InvocationResponse> InvokeAsync(FunctionInvocation invocation);`
`14`	`17`	`}`
`15`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License. See License.txt in the project root for license information.`
`3`	`3`
`4`		`-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;`
	`4`	`+using Microsoft.Azure.Functions.Worker.Grpc.Messages;`
`5`	`5`
`6`	`6`	`namespace Microsoft.Azure.Functions.Worker.Context`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using Google.Protobuf.Collections;`
`8`		`-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;`
	`8`	`+using Microsoft.Azure.Functions.Worker.Grpc.Messages;`
`9`	`9`
`10`	`10`	`namespace Microsoft.Azure.Functions.Worker.Context`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`using Microsoft.Azure.Functions.Worker.Definition;`
`11`	`11`	`using Microsoft.Azure.Functions.Worker.Invocation;`
`12`	`12`	`using Microsoft.Azure.Functions.Worker.OutputBindings;`
`13`		`-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;`
	`13`	`+using Microsoft.Azure.Functions.Worker.Grpc.Messages;`
`14`	`14`
`15`	`15`	`namespace Microsoft.Azure.Functions.Worker`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,16 @@`
`1`		`-// Copyright (c) .NET Foundation. All rights reserved.`
	`1`	`+// Copyright (c) .NET Foundation. All rights reserved.`
`2`	`2`	`// Licensed under the MIT License. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System;`
`5`	`5`	`using System.Collections.Generic;`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using System.Text;`
`8`	`8`	`using System.Threading.Tasks;`
`9`		`-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;`
	`9`	`+using Microsoft.Azure.Functions.Worker.Grpc.Messages;`
`10`	`10`
`11`	`11`	`namespace Microsoft.Azure.Functions.Worker`
`12`	`12`	`{`
`13`		`- public class GrpcBindingMetadata : BindingMetadata`
	`13`	`+ internal class GrpcBindingMetadata : BindingMetadata`
`14`	`14`	`{`
`15`	`15`	`public GrpcBindingMetadata(BindingInfo bindingInfo)`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`using System.Collections.Immutable;`
`7`	`7`	`using System.IO;`
`8`	`8`	`using System.Linq;`
`9`		`-using Microsoft.Azure.WebJobs.Script.Grpc.Messages;`
	`9`	`+using Microsoft.Azure.Functions.Worker.Grpc.Messages;`
`10`	`10`
`11`	`11`	`namespace Microsoft.Azure.Functions.Worker.Definition`
`12`	`12`	`{`