Initialize Java language worker in placeholder mode (#3936)

pragnagopa · web-flow · commit 2fc6590888f6 · 2019-01-16T14:21:18.000-08:00
* InitializeChannelsAsync in Placeholdermode
* Update Java worker - PicoHelper
* Update E2E test to read environment variable
* Add more tests
diff --git a/sample/Java/HttpTrigger/Function.java b/sample/Java/HttpTrigger/Function.java
@@ -13,21 +13,24 @@
  * Accept defaults for rest of the identifiers
  * Run mvn clean package
  */
-public class Function {
+public class Function {   
     @FunctionName("HttpTrigger")
-    public HttpResponseMessage HttpTrigger(
-            @HttpTrigger(name = "req", methods = {HttpMethod.GET, HttpMethod.POST}, authLevel = AuthorizationLevel.ANONYMOUS) HttpRequestMessage<Optional<String>> request,
+    public HttpResponseMessage run(
+            @HttpTrigger(name = "req", methods = {HttpMethod.GET, HttpMethod.POST}, authLevel = AuthorizationLevel.FUNCTION) HttpRequestMessage<Optional<String>> request,
             final ExecutionContext context) {
         context.getLogger().info("Java HTTP trigger processed a request.");
 
         // Parse query parameter
         String query = request.getQueryParameters().get("name");
         String name = request.getBody().orElse(query);
+		String readEnv = System.getenv("AzureWebJobsStorage");
 
         if (name == null) {
             return request.createResponseBuilder(HttpStatus.BAD_REQUEST).body("Please pass a name on the query string or in the request body").build();
-        } else {
-            return request.createResponseBuilder(HttpStatus.OK).body("Hello, " + name).build();
         }
+		if (readEnv == null ) {
+            return request.createResponseBuilder(HttpStatus.INTERNAL_SERVER_ERROR).body("AzureWebJobsStorage is empty").build();
+        }
+        return request.createResponseBuilder(HttpStatus.OK).body("Hello, " + name).build();
     }
 }
diff --git a/sample/Java/HttpTrigger/HttpTrigger-1.0-SNAPSHOT.jar b/sample/Java/HttpTrigger/HttpTrigger-1.0-SNAPSHOT.jar
diff --git a/sample/Java/HttpTrigger/function.json b/sample/Java/HttpTrigger/function.json
@@ -1,16 +1,14 @@
 {
   "scriptFile" : "HttpTrigger-1.0-SNAPSHOT.jar",
-  "entryPoint" : "Microsoft.Azure.WebJobs.Script.Tests.EndToEnd.Function.HttpTrigger",
+  "entryPoint" : "Microsoft.Azure.WebJobs.Script.Tests.EndToEnd.Function.run",
   "bindings" : [ {
     "type" : "httpTrigger",
-    "name" : "req",
     "direction" : "in",
-    "webHookType" : "NONE",
-    "authLevel" : "anonymous",
-    "methods" : [ "GET", "POST" ]
+    "methods" : [ "GET", "POST" ],
+    "name" : "req"
   }, {
     "type" : "http",
-    "name" : "$return",
-    "direction" : "out"
+    "direction" : "out",
+    "name" : "$return"
   } ]
 }
diff --git a/src/WebJobs.Script.WebHost/Standby/StandbyManager.cs b/src/WebJobs.Script.WebHost/Standby/StandbyManager.cs
@@ -2,12 +2,10 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Azure.WebJobs.Script.Eventing;
 using Microsoft.Azure.WebJobs.Script.Rpc;
 using Microsoft.Azure.WebJobs.Script.WebHost.Properties;
 using Microsoft.Extensions.Configuration;
diff --git a/src/WebJobs.Script/Properties/Resources.Designer.cs b/src/WebJobs.Script/Properties/Resources.Designer.cs
diff --git a/src/WebJobs.Script/Properties/Resources.resx b/src/WebJobs.Script/Properties/Resources.resx
@@ -120,4 +120,7 @@
   <data name="DotNetFunctionEntryPointRulesMessage" xml:space="preserve">
     <value>Your function must contain a single public method, a public method named 'Run', or a public method matching the name specified in the 'entryPoint' metadata property.</value>
   </data>
+  <data name="LanguageWorkerChannelSpecializationTrace" xml:space="preserve">
+    <value>Starting language worker channel specialization</value>
+  </data>
 </root>
diff --git a/src/WebJobs.Script/Rpc/LanguageWorkerChannelManager.cs b/src/WebJobs.Script/Rpc/LanguageWorkerChannelManager.cs
@@ -9,6 +9,7 @@
 using Microsoft.Azure.WebJobs.Script.Abstractions;
 using Microsoft.Azure.WebJobs.Script.Diagnostics;
 using Microsoft.Azure.WebJobs.Script.Eventing;
+using Microsoft.Azure.WebJobs.Script.Properties;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -117,7 +118,7 @@ public ILanguageWorkerChannel GetChannel(string language)
 
         public async Task SpecializeAsync()
         {
-            _logger.LogInformation($"Starting language worker channels specialization");
+            _logger.LogInformation(Resources.LanguageWorkerChannelSpecializationTrace);
             _workerRuntime = _environment.GetEnvironmentVariable(LanguageWorkerConstants.FunctionWorkerRuntimeSettingName);
             ILanguageWorkerChannel languageWorkerChannel = GetChannel(_workerRuntime);
             if (_workerRuntime != null && languageWorkerChannel != null)
diff --git a/src/WebJobs.Script/Rpc/RpcInitializationService.cs b/src/WebJobs.Script/Rpc/RpcInitializationService.cs
@@ -43,8 +43,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
             }
             _logger.LogInformation("Starting Rpc Initialization Service.");
             await InitializeRpcServerAsync();
-            // TODO: pgopa Uncomment following after addressing issue https://github.com/Azure/azure-functions-host/issues/3872
-            // await InitializeChannelsAsync();
+            await InitializeChannelsAsync();
         }
 
         public async Task StopAsync(CancellationToken cancellationToken)
diff --git a/src/WebJobs.Script/WebJobs.Script.csproj b/src/WebJobs.Script/WebJobs.Script.csproj
@@ -35,7 +35,7 @@
       <NoWarn>NU1701</NoWarn>
     </PackageReference>
     <PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.0.6830001-df202c6c" />
-    <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.2.3" />
+    <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.2.4" />
     <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.0-beta7" />
     <PackageReference Include="Microsoft.Azure.Functions.PowerShellWorker" Version="0.1.52-alpha" />
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.4" />
@@ -68,4 +68,19 @@
     <ProjectReference Include="..\WebJobs.Script.Grpc\WebJobs.Script.Grpc.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Update="Properties\Resources.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
+
 </Project>
diff --git a/test/WebJobs.Script.Tests.Integration/Host/StandbyManagerTests.cs b/test/WebJobs.Script.Tests.Integration/Host/StandbyManagerTests.cs
@@ -82,6 +82,7 @@ await TestHelpers.Await(() =>
             Assert.Equal(2, logLines.Count(p => p.Contains("Host is in standby mode")));
             Assert.Equal(2, logLines.Count(p => p.Contains("Executed 'Functions.WarmUp' (Succeeded")));
             Assert.Equal(1, logLines.Count(p => p.Contains("Starting host specialization")));
+            Assert.Equal(1, logLines.Count(p => p.Contains("Starting language worker channel specialization")));
             Assert.Equal(3, logLines.Count(p => p.Contains($"Starting Host (HostId={_expectedHostId}")));
             Assert.Equal(3, logLines.Count(p => p.Contains($"Loading functions metadata")));
             Assert.Equal(2, logLines.Count(p => p.Contains($"1 functions loaded")));
diff --git a/test/WebJobs.Script.Tests.Integration/Rpc/LanguageWorkerChannelManagerEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/Rpc/LanguageWorkerChannelManagerEndToEndTests.cs
@@ -19,7 +19,7 @@ public LanguageWorkerChannelManagerEndToEndTests(TestFixture fixture)
 
         public TestFixture Fixture { get; set; }
 
-        [Fact(Skip = "https://github.com/Azure/azure-functions-host/issues/3872")]
+        [Fact]
         public void InitializeAsync_DoNotInitialize_JavaWorker_ProxiesOnly()
         {
             var javaChannel = _languageWorkerChannelManager.GetChannel(LanguageWorkerConstants.JavaLanguageWorkerName);
diff --git a/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/NodeContentTests.cs b/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/NodeContentTests.cs
@@ -132,7 +132,7 @@ public async Task ObjectXml()
             Assert.Equal(str, content);
         }
 
-        [Fact(Skip = "https://github.com/Azure/azure-functions-host/issues/3872")]
+        [Fact]
         public void InitializeAsync_WorkerRuntime_Node_DoNotInitialize_JavaWorker()
         {
             var javaChannel = _languageWorkerChannelManager.GetChannel(LanguageWorkerConstants.JavaLanguageWorkerName);
diff --git a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
@@ -39,7 +39,7 @@
     <PackageReference Include="Microsoft.Azure.EventHubs" Version="2.1.0" />
     <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.0-beta7" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.3" />
-    <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.2.3" />
+    <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.2.4" />
     <PackageReference Include="Microsoft.Azure.Mobile.Client" Version="4.0.2" />
     <PackageReference Include="Microsoft.Azure.ServiceBus" Version="3.1.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
diff --git a/test/WebJobs.Script.Tests.Shared/TestHelpers.cs b/test/WebJobs.Script.Tests.Shared/TestHelpers.cs
@@ -261,7 +261,7 @@ public static IList<WorkerConfig> GetTestWorkerConfigs()
             };
         }
 
-        public static string CreateOfflineFile(string rootPath)
+        public static string CreateOfflineFile()
         {
             // create a test offline file
             var offlineFilePath = Path.Combine(Path.GetTempPath(), ScriptConstants.AppOfflineFileName);
@@ -270,6 +270,21 @@ public static string CreateOfflineFile(string rootPath)
             return offlineFilePath;
         }
 
+        public static void DeleteTestFile(string testFile)
+        {
+            if (File.Exists(testFile))
+            {
+                try
+                {
+                    File.Delete(testFile);
+                }
+                catch
+                {
+                    // best effort cleanup
+                }
+            }
+        }
+
         public static WorkerDescription GetTestWorkerDescription(string language, string extension)
         {
             return new WorkerDescription()
diff --git a/test/WebJobs.Script.Tests/Extensions/HttpContextExtensionsTests.cs b/test/WebJobs.Script.Tests/Extensions/HttpContextExtensionsTests.cs
@@ -21,40 +21,46 @@ public class HttpContextExtensionsTests
         [Fact]
         public async Task SetOfflineResponseAsync_ReturnsCorrectResponse()
         {
-            // create a test offline file
-            var rootPath = Path.GetTempPath();
-            var offlineFilePath = Path.Combine(Path.GetTempPath(), ScriptConstants.AppOfflineFileName);
-            string content = FileUtility.ReadResourceString($"{ScriptConstants.ResourcePath}.{ScriptConstants.AppOfflineFileName}", typeof(HttpException).Assembly);
-            File.WriteAllText(offlineFilePath, content);
+            string offlineFilePath = null;
+            try
+            {
+                // create a test offline file
+                var rootPath = Path.GetTempPath();
+                offlineFilePath = TestHelpers.CreateOfflineFile();
 
-            var sendFileFeatureMock = new Mock<IHttpSendFileFeature>();
-            sendFileFeatureMock.Setup(s => s.SendFileAsync(offlineFilePath, 0, null, CancellationToken.None)).Returns(Task.FromResult<int>(0));
+                var sendFileFeatureMock = new Mock<IHttpSendFileFeature>();
+                sendFileFeatureMock.Setup(s => s.SendFileAsync(offlineFilePath, 0, null, CancellationToken.None)).Returns(Task.FromResult<int>(0));
 
-            // simulate an App Service request
-            var vars = new Dictionary<string, string>
+                // simulate an App Service request
+                var vars = new Dictionary<string, string>
             {
                 { EnvironmentSettingNames.AzureWebsiteInstanceId, "123" }
             };
-            using (var env = new TestScopedEnvironmentVariable(vars))
-            {
-                // without header (thus an internal request)
-                var context = new DefaultHttpContext();
-                context.Features.Set(sendFileFeatureMock.Object);
-                Assert.True(context.Request.IsAppServiceInternalRequest());
-                await context.SetOfflineResponseAsync(rootPath);
-                Assert.Equal(StatusCodes.Status503ServiceUnavailable, context.Response.StatusCode);
-                Assert.Equal(0, context.Response.Body.Length);
-                sendFileFeatureMock.Verify(p => p.SendFileAsync(offlineFilePath, 0, null, CancellationToken.None), Times.Never);
+                using (var env = new TestScopedEnvironmentVariable(vars))
+                {
+                    // without header (thus an internal request)
+                    var context = new DefaultHttpContext();
+                    context.Features.Set(sendFileFeatureMock.Object);
+                    Assert.True(context.Request.IsAppServiceInternalRequest());
+                    await context.SetOfflineResponseAsync(rootPath);
+                    Assert.Equal(StatusCodes.Status503ServiceUnavailable, context.Response.StatusCode);
+                    Assert.Equal(0, context.Response.Body.Length);
+                    sendFileFeatureMock.Verify(p => p.SendFileAsync(offlineFilePath, 0, null, CancellationToken.None), Times.Never);
 
-                // with header (thus an external request)
-                context = new DefaultHttpContext();
-                context.Features.Set(sendFileFeatureMock.Object);
-                context.Request.Headers.Add(ScriptConstants.AntaresLogIdHeaderName, new StringValues("456"));
-                Assert.False(context.Request.IsAppServiceInternalRequest());
-                await context.SetOfflineResponseAsync(rootPath);
-                Assert.Equal(StatusCodes.Status503ServiceUnavailable, context.Response.StatusCode);
-                Assert.Equal("text/html", context.Response.Headers["Content-Type"]);
-                sendFileFeatureMock.Verify(p => p.SendFileAsync(offlineFilePath, 0, null, CancellationToken.None), Times.Once);
+                    // with header (thus an external request)
+                    context = new DefaultHttpContext();
+                    context.Features.Set(sendFileFeatureMock.Object);
+                    context.Request.Headers.Add(ScriptConstants.AntaresLogIdHeaderName, new StringValues("456"));
+                    Assert.False(context.Request.IsAppServiceInternalRequest());
+                    await context.SetOfflineResponseAsync(rootPath);
+                    Assert.Equal(StatusCodes.Status503ServiceUnavailable, context.Response.StatusCode);
+                    Assert.Equal("text/html", context.Response.Headers["Content-Type"]);
+                    sendFileFeatureMock.Verify(p => p.SendFileAsync(offlineFilePath, 0, null, CancellationToken.None), Times.Once);
+                }
+            }
+            finally
+            {
+                TestHelpers.DeleteTestFile(offlineFilePath);
             }
         }
     }
diff --git a/test/WebJobs.Script.Tests/Rpc/RpcInitializationServiceTests.cs b/test/WebJobs.Script.Tests/Rpc/RpcInitializationServiceTests.cs
diff --git a/test/WebJobs.Script.Tests/Rpc/TestRpcServer.cs b/test/WebJobs.Script.Tests/Rpc/TestRpcServer.cs

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,7 @@ public async Task StartAsync(CancellationToken cancellationToken)`
`43`	`43`	`}`
`44`	`44`	`_logger.LogInformation("Starting Rpc Initialization Service.");`
`45`	`45`	`await InitializeRpcServerAsync();`
`46`		`- // TODO: pgopa Uncomment following after addressing issue https://github.com/Azure/azure-functions-host/issues/3872`
`47`		`- // await InitializeChannelsAsync();`
	`46`	`+ await InitializeChannelsAsync();`
`48`	`47`	`}`
`49`	`48`
`50`	`49`	`public async Task StopAsync(CancellationToken cancellationToken)`