Refactor strings to constants

Author: Anthony Staples

src/Microsoft.Azure.Functions.PowerShellWorker.csproj

@@ -35,8 +35,4 @@ Licensed under the MIT license. See LICENSE file in the project root for full li
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Messaging\protobuf\" />
-  </ItemGroup>
 </Project>

src/RequestProcessor.cs

@@ -32,9 +32,9 @@ internal class RequestProcessor
 
         // Holds the exception if an issue is encountered while processing the function app dependencies.
         private Exception _initTerminatingError;
-        
-        // Indicate whether the dependencies have been installed
-        private bool _areDependenciesInstalled;
+
+        // Indicate whether the FunctionApp has been initialized.
+        private bool _isFunctionAppInitialized;
 
         private Dictionary<StreamingMessage.ContentOneofCase, Func<StreamingMessage, StreamingMessage>> _requestHandlers =
             new Dictionary<StreamingMessage.ContentOneofCase, Func<StreamingMessage, StreamingMessage>>();
@@ -182,7 +182,6 @@ internal StreamingMessage ProcessFunctionLoadRequest(StreamingMessage request)
             stopwatch.Start();
 
             FunctionLoadRequest functionLoadRequest = request.FunctionLoadRequest;
-            string lrs = System.Text.Json.JsonSerializer.Serialize<FunctionLoadRequest>(functionLoadRequest);
 
             StreamingMessage response = NewStreamingMessageTemplate(
                 request.RequestId,
@@ -215,14 +214,14 @@ internal StreamingMessage ProcessFunctionLoadRequest(StreamingMessage request)
             // 'FunctionLoadRequest' comes in. Therefore, we run initialization here.
             // Also, we receive a FunctionLoadRequest when a proxy is configured. Proxies don't have the Metadata.Directory set
             // which would cause initialization issues with the PSModulePath. Since they don't have that set, we skip over them.
-            if (!_areDependenciesInstalled && !functionLoadRequest.Metadata.IsProxy)
+            if (!_isFunctionAppInitialized && !functionLoadRequest.Metadata.IsProxy)
             {
                 try
                 {
                     var rpcLogger = new RpcLogger(_msgStream);
                     rpcLogger.SetContext(request.RequestId, null);
 
-                    _areDependenciesInstalled = true;
+                    _isFunctionAppInitialized = true;
 
                     var managedDependenciesPath = _dependencyManager.Initialize(request, rpcLogger);
 
@@ -264,7 +263,6 @@ internal StreamingMessage ProcessInvocationRequest(StreamingMessage request)
         {
             try
             {
-                string ins = System.Text.Json.JsonSerializer.Serialize<InvocationRequest>(request.InvocationRequest);
                 var stopwatch = new FunctionInvocationPerformanceStopwatch();
                 stopwatch.OnStart();
 

src/WorkerIndexing/BindingInformation.cs

@@ -8,6 +8,9 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.WorkerIndexing
 {
     internal class BindingInformation
     {
+        private const string BindingNameKey = "name";
+        private const string BindingDirectionKey = "direction";
+        private const string BindingTypeKey = "type";
         public enum Directions
         {
             Unknown = -1,
@@ -25,18 +28,18 @@ internal string ConvertToRpcRawBinding(out BindingInfo bindingInfo)
         {
             string rawBinding = string.Empty;
             JObject rawBindingObject = new JObject();
-            rawBindingObject.Add("name", Name);
+            rawBindingObject.Add(BindingNameKey, Name);
             BindingInfo outInfo = new BindingInfo();
 
 
             if (Direction == Directions.Unknown)
             {
-                throw new Exception("The bindingInfo's Direction is not valid");
+                throw new Exception(PowerShellWorkerStrings.InvalidBindingInfoDirection);
             }
             outInfo.Direction = (BindingInfo.Types.Direction)Direction;
-            rawBindingObject.Add("direction", Enum.GetName(typeof(BindingInfo.Types.Direction), outInfo.Direction).ToLower());
+            rawBindingObject.Add(BindingDirectionKey, Enum.GetName(typeof(BindingInfo.Types.Direction), outInfo.Direction).ToLower());
             outInfo.Type = Type;
-            rawBindingObject.Add("type", Type);
+            rawBindingObject.Add(BindingTypeKey, Type);
 
             foreach (KeyValuePair<string, Object> pair in otherInformation)
             {

src/WorkerIndexing/FunctionInformation.cs

@@ -5,6 +5,8 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.WorkerIndexing
 {
     internal class FunctionInformation
     {
+        private const string FunctionLanguagePowerShell = "powershell";
+
         public string Directory { get; set; } = "";
         public string ScriptFile { get; set; } = "";
         public string Name { get; set; } = "";
@@ -20,7 +22,7 @@ internal RpcFunctionMetadata ConvertToRpc()
             returnMetadata.EntryPoint = EntryPoint;
             returnMetadata.Name = Name;
             returnMetadata.ScriptFile = ScriptFile;
-            returnMetadata.Language = "powershell";
+            returnMetadata.Language = FunctionLanguagePowerShell;
             foreach(BindingInformation binding in Bindings)
             {
                 string rawBinding = binding.ConvertToRpcRawBinding(out BindingInfo bindingInfo);

src/WorkerIndexing/WorkerIndexingHelper.cs

@@ -14,6 +14,7 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.WorkerIndexing
 {
     internal class WorkerIndexingHelper
     {
+        const string GetFunctionsMetadataCmdletName = "Get-FunctionsMetadata";
         internal static IEnumerable<RpcFunctionMetadata> IndexFunctions(string baseDir)
         {
             List<RpcFunctionMetadata> indexedFunctions = new List<RpcFunctionMetadata>();
@@ -24,13 +25,13 @@ internal static IEnumerable<RpcFunctionMetadata> IndexFunctions(string baseDir)
             System.Management.Automation.PowerShell ps = System.Management.Automation.PowerShell.Create();
             ps.Runspace = runspace;
 
-            ps.AddCommand("Get-FunctionsMetadata").AddArgument(baseDir);
+            ps.AddCommand(GetFunctionsMetadataCmdletName).AddArgument(baseDir);
             string outputString = string.Empty;
             foreach (PSObject rawMetadata in ps.Invoke())
             {
                 if (outputString != string.Empty)
                 {
-                    throw new Exception("Multiple results from metadata cmdlet");
+                    throw new Exception(PowerShellWorkerStrings.GetFunctionsMetadataMultipleResultsError);
                 }
                 outputString = rawMetadata.ToString();
                 //Console.WriteLine(rawMetadata.ToString());

src/resources/PowerShellWorkerStrings.resx

@@ -352,4 +352,10 @@
   <data name="DependencySnapshotDoesNotContainAcceptableModuleVersions" xml:space="preserve">
     <value>Dependency snapshot '{0}' does not contain acceptable module versions.</value>
   </data>
+  <data name="GetFunctionsMetadataMultipleResultsError" xml:space="preserve">
+    <value>Multiple results from metadata cmdlet</value>
+  </data>
+  <data name="InvalidBindingInfoDirection" xml:space="preserve">
+    <value>The bindingInfo's Direction is not valid</value>
+  </data>
 </root>