Add support for JAVA_OPTS (#3678)

Author: pragnagopa

src/WebJobs.Script/Rpc/Configuration/WorkerConfigFactory.cs

@@ -134,11 +134,14 @@ internal void AddProvider(string workerDir)
                 descriptionProfiles = GetWorkerDescriptionProfiles(workerConfig);
                 if (ScriptSettingsManager.Instance.IsAppServiceEnvironment)
                 {
-                    //Overwrite default Description with AppServiceEnv profile
+                    // Overwrite default Description with AppServiceEnv profile
+                    // TODO:pgopa delete after ANT78
                     workerDescription = GetWorkerDescriptionFromProfiles(LanguageWorkerConstants.WorkerDescriptionAppServiceEnvProfileName, descriptionProfiles, workerDescription);
                 }
+
                 GetDefaultExecutablePathFromAppSettings(workerDescription, languageSection);
                 AddArgumentsFromAppSettings(workerDescription, languageSection);
+
                 if (File.Exists(workerDescription.GetWorkerPath()))
                 {
                     _logger.LogDebug($"Will load worker provider for language: {workerDescription.Language}");
@@ -195,8 +198,18 @@ private static void GetDefaultExecutablePathFromAppSettings(WorkerDescription wo
             workerDescription.DefaultExecutablePath = defaultExecutablePath.Value != null ? defaultExecutablePath.Value : workerDescription.DefaultExecutablePath;
         }
 
-        private static void AddArgumentsFromAppSettings(WorkerDescription workerDescription, IConfigurationSection languageSection)
+        internal static void AddArgumentsFromAppSettings(WorkerDescription workerDescription, IConfigurationSection languageSection)
         {
+            if (workerDescription.Language.Equals(LanguageWorkerConstants.JavaLanguageWorkerName))
+            {
+                // For Java either provide arguments via JAVA_OPTS or languageWorkers:java:arguments. Both cannot be supported
+                string javaOpts = ScriptSettingsManager.Instance.GetSetting("JAVA_OPTS");
+                if (!string.IsNullOrEmpty(javaOpts))
+                {
+                    workerDescription.Arguments.Add(javaOpts);
+                    return;
+                }
+            }
             var argumentsSection = languageSection.GetSection($"{LanguageWorkerConstants.WorkerDescriptionArguments}");
             if (argumentsSection.Value != null)
             {

test/WebJobs.Script.Tests/Rpc/WorkerConfigFactoryTests.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using Microsoft.Azure.WebJobs.Script.Abstractions;
 using Microsoft.Azure.WebJobs.Script.Config;
 using Microsoft.Azure.WebJobs.Script.Rpc;
 using Microsoft.Extensions.Configuration;
@@ -146,5 +147,41 @@ public void JavaPath_JavaHome_NotSet()
                 Assert.Equal("java", javaPath);
             }
         }
+
+        [Theory]
+        [InlineData("-Djava.net.preferIPv4Stack = true", "-Djava.net.preferIPv4Stack = true")]
+        [InlineData("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005", "")]
+        public void AddArgumentsFromAppSettings_JavaOpts(string expectedArgument, string javaOpts)
+        {
+            WorkerDescription workerDescription = new WorkerDescription()
+            {
+                Arguments = new List<string>() { "-jar" },
+                DefaultExecutablePath = "java",
+                DefaultWorkerPath = "javaworker.jar",
+                Extensions = new List<string>() { ".jar" },
+                Language = "java"
+            };
+            var configBuilder = ScriptSettingsManager.CreateDefaultConfigurationBuilder()
+                  .AddInMemoryCollection(new Dictionary<string, string>
+                  {
+                      ["languageWorker"] = "test",
+                      ["languageWorkers:java:arguments"] = "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
+                  });
+            var config = configBuilder.Build();
+            var scriptSettingsManager = new ScriptSettingsManager(config);
+            var testLogger = new TestLogger("test");
+            var configFactory = new WorkerConfigFactory(config, testLogger);
+            var languageSection = config.GetSection("languageWorkers:java");
+            var testEnvVariables = new Dictionary<string, string>
+            {
+                { "JAVA_OPTS", javaOpts }
+            };
+            using (var variables = new TestScopedSettings(scriptSettingsManager, testEnvVariables))
+            {
+                WorkerConfigFactory.AddArgumentsFromAppSettings(workerDescription, languageSection);
+                Assert.Equal(2, workerDescription.Arguments.Count);
+                Assert.Equal(expectedArgument, workerDescription.Arguments[1]);
+            }
+        }
     }
 }