Enforce Functions Java when running in AppServiceEnv (#3724)

pragnagopa · web-flow · commit f9d6c271296e · 2018-11-01T12:17:27.000-07:00
diff --git a/src/WebJobs.Script/Rpc/Configuration/WorkerConfigFactory.cs b/src/WebJobs.Script/Rpc/Configuration/WorkerConfigFactory.cs
@@ -224,21 +224,10 @@ internal string GetExecutablePathForJava(string defaultExecutablePath)
             {
                 return defaultExecutablePath;
             }
-            else if (IsJavaHomeValid())
-            {
-                // TODO: pgopa default to using JAVA_HOME after ANT78 rolls out
-                return Path.GetFullPath(Path.Combine(javaHome, "bin", "java"));
-            }
             else
             {
                 return Path.GetFullPath(Path.Combine(javaHome, "bin", defaultExecutablePath));
             }
         }
-
-        internal bool IsJavaHomeValid()
-        {
-            string javaHome = ScriptSettingsManager.Instance.GetSetting("JAVA_HOME");
-            return string.IsNullOrEmpty(javaHome) ? false : javaHome.Contains("8.0");
-        }
     }
 }
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.5350001-beta-fc119b98" />
-    <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.2.0-beta01-SNAPSHOT" />
+    <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.2.0-beta01-SNAPSHOT-10147" />
     <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="1.0.0-beta6" />
     <PackageReference Include="Microsoft.Azure.WebJobs" Version="3.0.2" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions" Version="3.0.1" />
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-beta6" />
     <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.2" />
-    <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.2.0-beta01-SNAPSHOT" />
+    <PackageReference Include="Microsoft.Azure.Functions.JavaWorker" Version="1.2.0-beta01-SNAPSHOT-10147" />
     <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.1.1" />
diff --git a/test/WebJobs.Script.Tests/Rpc/WorkerConfigFactoryTests.cs b/test/WebJobs.Script.Tests/Rpc/WorkerConfigFactoryTests.cs
@@ -80,7 +80,7 @@ public void JavaPath_AppServiceEnv()
         }
 
         [Fact]
-        public void JavaPath_AppServiceEnv_JavaHomeOverrides()
+        public void JavaPath_AppServiceEnv_JavaHomeSet_AppServiceEnvOverrides()
         {
             var configBuilder = ScriptSettingsManager.CreateDefaultConfigurationBuilder()
                   .AddInMemoryCollection(new Dictionary<string, string>
@@ -99,7 +99,7 @@ public void JavaPath_AppServiceEnv_JavaHomeOverrides()
             using (var variables = new TestScopedSettings(scriptSettingsManager, testEnvVariables))
             {
                 var javaPath = configFactory.GetExecutablePathForJava("../../zulu8.23.0.3-jdk8.0.144-win_x64/bin/java");
-                Assert.Equal(@"D:\Program Files\Java\zulu8.31.0.2-jre8.0.181-win_x64\bin\java", javaPath);
+                Assert.Equal(@"D:\Program Files\Java\zulu8.23.0.3-jdk8.0.144-win_x64\bin\java", javaPath);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -224,21 +224,10 @@ internal string GetExecutablePathForJava(string defaultExecutablePath)`
`224`	`224`	`{`
`225`	`225`	`return defaultExecutablePath;`
`226`	`226`	`}`
`227`		`- else if (IsJavaHomeValid())`
`228`		`- {`
`229`		`- // TODO: pgopa default to using JAVA_HOME after ANT78 rolls out`
`230`		`- return Path.GetFullPath(Path.Combine(javaHome, "bin", "java"));`
`231`		`- }`
`232`	`227`	`else`
`233`	`228`	`{`
`234`	`229`	`return Path.GetFullPath(Path.Combine(javaHome, "bin", defaultExecutablePath));`
`235`	`230`	`}`
`236`	`231`	`}`
`237`		`-`
`238`		`- internal bool IsJavaHomeValid()`
`239`		`- {`
`240`		`- string javaHome = ScriptSettingsManager.Instance.GetSetting("JAVA_HOME");`
`241`		`- return string.IsNullOrEmpty(javaHome) ? false : javaHome.Contains("8.0");`
`242`		`- }`
`243`	`232`	`}`
`244`	`233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ public void JavaPath_AppServiceEnv()`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`[Fact]`
`83`		`- public void JavaPath_AppServiceEnv_JavaHomeOverrides()`
	`83`	`+ public void JavaPath_AppServiceEnv_JavaHomeSet_AppServiceEnvOverrides()`
`84`	`84`	`{`
`85`	`85`	`var configBuilder = ScriptSettingsManager.CreateDefaultConfigurationBuilder()`
`86`	`86`	`.AddInMemoryCollection(new Dictionary<string, string>`
`@@ -99,7 +99,7 @@ public void JavaPath_AppServiceEnv_JavaHomeOverrides()`
`99`	`99`	`using (var variables = new TestScopedSettings(scriptSettingsManager, testEnvVariables))`
`100`	`100`	`{`
`101`	`101`	`var javaPath = configFactory.GetExecutablePathForJava("../../zulu8.23.0.3-jdk8.0.144-win_x64/bin/java");`
`102`		`- Assert.Equal(@"D:\Program Files\Java\zulu8.31.0.2-jre8.0.181-win_x64\bin\java", javaPath);`
	`102`	`+ Assert.Equal(@"D:\Program Files\Java\zulu8.23.0.3-jdk8.0.144-win_x64\bin\java", javaPath);`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`