Addressing analysis warnings

mathewc · mathewc · commit b0cf84d7e27a · 2017-11-21T13:51:59.000-08:00
diff --git a/src/WebJobs.Script.WebHost/Diagnostics/MetricsEventManager.cs b/src/WebJobs.Script.WebHost/Diagnostics/MetricsEventManager.cs
@@ -185,12 +185,8 @@ internal void HostStarted(ScriptHost scriptHost)
                 _eventGenerator.LogFunctionDetailsEvent(
                     appName,
                     GetNormalizedString(function.Name),
-                    function.Metadata != null
-                        ? SerializeBindings(function.Metadata.InputBindings)
-                        : GetNormalizedString(null),
-                    function.Metadata != null
-                        ? SerializeBindings(function.Metadata.OutputBindings)
-                        : GetNormalizedString(null),
+                    function.Metadata != null ? SerializeBindings(function.Metadata.InputBindings) : GetNormalizedString(null),
+                    function.Metadata != null ? SerializeBindings(function.Metadata.OutputBindings) : GetNormalizedString(null),
                     function.Metadata.ScriptType.ToString(),
                     function.Metadata != null ? function.Metadata.IsDisabled : false);
             }
diff --git a/src/WebJobs.Script.WebHost/Features/FunctionExecutionFeature.cs b/src/WebJobs.Script.WebHost/Features/FunctionExecutionFeature.cs
@@ -6,8 +6,8 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Azure.WebJobs.Script.Description;
 
 namespace Microsoft.Azure.WebJobs.Script.WebHost.Features
 {
diff --git a/src/WebJobs.Script.WebHost/WebHostResolver.cs b/src/WebJobs.Script.WebHost/WebHostResolver.cs
@@ -22,7 +22,6 @@ public sealed class WebHostResolver : IDisposable
         private readonly IWebJobsRouter _router;
         private readonly ILoggerFactoryBuilder _loggerFactoryBuilder;
         private readonly WebHostSettings _settings;
-        private readonly IConfiguration _configuration;
         private ScriptHostConfiguration _standbyScriptHostConfig;
         private WebScriptHostManager _standbyHostManager;
 
@@ -114,7 +113,7 @@ internal void EnsureInitialized(WebHostSettings settings)
 
                     _activeScriptHostConfig = CreateScriptHostConfiguration(settings);
                     _activeHostManager = new WebScriptHostManager(_activeScriptHostConfig, _secretManagerFactory, _eventManager,  _settingsManager, settings, _router, _loggerFactoryBuilder);
-                    // _activeReceiverManager = new WebHookReceiverManager(_activeHostManager.SecretManager);
+                    //_activeReceiverManager = new WebHookReceiverManager(_activeHostManager.SecretManager);
                     InitializeFileSystem();
 
                     if (_standbyHostManager != null)
@@ -134,17 +133,16 @@ internal void EnsureInitialized(WebHostSettings settings)
                         _standbyHostManager.Stop();
                         _standbyHostManager.Dispose();
                     }
-                    // _standbyReceiverManager?.Dispose();
+                    //_standbyReceiverManager?.Dispose();
                     _standbyScriptHostConfig = null;
                     _standbyHostManager = null;
-                    // _standbyReceiverManager = null;
+                    //_standbyReceiverManager = null;
                 }
             }
             else
             {
                 if (_standbyHostManager == null)
                 {
-
                     var standbySettings = CreateStandbySettings(settings);
                     _standbyScriptHostConfig = CreateScriptHostConfiguration(standbySettings, true);
                     _standbyHostManager = new WebScriptHostManager(_standbyScriptHostConfig, _secretManagerFactory, _eventManager, _settingsManager, standbySettings, _router, _loggerFactoryBuilder);
diff --git a/src/WebJobs.Script/Binding/Http/HttpBinding.cs b/src/WebJobs.Script/Binding/Http/HttpBinding.cs
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.WebJobs.Script.Binding
 {
     public class HttpBinding : FunctionBinding
     {
-        public HttpBinding(ScriptHostConfiguration config, BindingMetadata metadata, FileAccess access) 
+        public HttpBinding(ScriptHostConfiguration config, BindingMetadata metadata, FileAccess access)
             : base(config, metadata, access)
         {
         }
diff --git a/src/WebJobs.Script/Diagnostics/FileLoggerProvider.cs b/src/WebJobs.Script/Diagnostics/FileLoggerProvider.cs
@@ -2,8 +2,8 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
-using Microsoft.Extensions.Logging;
 using Microsoft.Azure.WebJobs.Logging;
+using Microsoft.Extensions.Logging;
 
 namespace Microsoft.Azure.WebJobs.Script.Diagnostics
 {
diff --git a/src/WebJobs.Script/Host/ScriptHost.cs b/src/WebJobs.Script/Host/ScriptHost.cs
@@ -27,13 +27,13 @@
 using Microsoft.Azure.WebJobs.Script.Config;
 using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.Diagnostics;
-using Microsoft.Azure.WebJobs.Script.Rpc;
 using Microsoft.Azure.WebJobs.Script.Eventing;
 using Microsoft.Azure.WebJobs.Script.Eventing.File;
 using Microsoft.Azure.WebJobs.Script.Extensibility;
 using Microsoft.Azure.WebJobs.Script.Grpc;
 using Microsoft.Azure.WebJobs.Script.IO;
 using Microsoft.Azure.WebJobs.Script.Models;
+using Microsoft.Azure.WebJobs.Script.Rpc;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -327,10 +327,10 @@ protected virtual void Initialize()
 
                 // Set up a host level TraceMonitor that will receive notification
                 // of ALL errors that occur. This allows us to inspect/log errors.
-                var traceMonitor = new TraceMonitor()
+                _traceMonitor = new TraceMonitor()
                     .Filter(p => { return true; })
                     .Subscribe(HandleHostError);
-                _hostConfig.Tracing.Tracers.Add(traceMonitor);
+                _hostConfig.Tracing.Tracers.Add(_traceMonitor);
 
                 System.Diagnostics.TraceLevel hostTraceLevel = _hostConfig.Tracing.ConsoleLevel;
                 if (ScriptConfig.FileLoggingMode != FileLoggingMode.Never)
diff --git a/src/WebJobs.Script/Rpc/Configuration/WorkerConfig.cs b/src/WebJobs.Script/Rpc/Configuration/WorkerConfig.cs
@@ -1,4 +1,7 @@
-﻿using Microsoft.Azure.WebJobs.Script.Abstractions;
+﻿// 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.Abstractions;
 
 namespace Microsoft.Azure.WebJobs.Script.Rpc
 {
diff --git a/src/WebJobs.Script/Rpc/Configuration/WorkerConfigFactory.cs b/src/WebJobs.Script/Rpc/Configuration/WorkerConfigFactory.cs
@@ -1,6 +1,9 @@
-﻿using System;
-using System.IO;
+﻿// 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.IO;
 using Microsoft.Azure.WebJobs.Script.Abstractions;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
diff --git a/src/WebJobs.Script/Rpc/ProcessManagement/IProcessRegistry.cs b/src/WebJobs.Script/Rpc/ProcessManagement/IProcessRegistry.cs
@@ -7,7 +7,7 @@ namespace Microsoft.Azure.WebJobs.Script.Rpc
 {
     internal interface IProcessRegistry
     {
-        // Registers processes to ensure that they are cleaned up on host exit.      
+        // Registers processes to ensure that they are cleaned up on host exit.
         bool Register(Process process);
     }
 }
diff --git a/src/src.ruleset b/src/src.ruleset
@@ -48,6 +48,7 @@
     <Rule Id="SA1611" Action="None" />
     <Rule Id="SA1615" Action="None" />
     <Rule Id="SA1618" Action="None" />
+    <Rule Id="SA1515" Action="None" />
   </Rules>
   <Rules AnalyzerId="xunit.analyzers" RuleNamespace="xunit.analyzers">
     <Rule Id="xUnit1004" Action="None" />
diff --git a/test/WebJobs.Script.Tests.Integration/CSharpEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/CSharpEndToEndTests.cs
@@ -253,7 +253,9 @@ public async Task HttpTriggerToBlob()
         [InlineData("application/json", "\"Name: Fabio Cavalcante, Location: Seattle\"")]
         [InlineData("application/xml", "<string xmlns=\"http://schemas.microsoft.com/2003/10/Serialization/\">Name: Fabio Cavalcante, Location: Seattle</string>")]
         [InlineData("text/plain", "Name: Fabio Cavalcante, Location: Seattle")]
+#pragma warning disable xUnit1026 // Theory methods should use all of their parameters
         public async Task HttpTrigger_GetWithAccept_NegotiatesContent(string accept, string expectedBody)
+#pragma warning restore xUnit1026 // Theory methods should use all of their parameters
         {
             var input = new JObject
             {
diff --git a/test/WebJobs.Script.Tests.Shared/HttpTestHelpers.cs b/test/WebJobs.Script.Tests.Shared/HttpTestHelpers.cs
@@ -6,7 +6,6 @@
 using System.Text;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
-using System.Threading.Tasks;
 
 namespace Microsoft.WebJobs.Script.Tests
 {
diff --git a/test/WebJobs.Script.Tests.Shared/TestHelpers.cs b/test/WebJobs.Script.Tests.Shared/TestHelpers.cs
@@ -235,7 +235,6 @@ private static async Task<string[]> ReadAllLinesSafeAsync(string logFile)
             return logs;
         }
 
-
         public static async Task<string> ReadStreamToEnd(Stream stream)
         {
             stream.Position = 0;
diff --git a/test/WebJobs.Script.Tests/Description/FunctionDescriptorProviderTests.cs b/test/WebJobs.Script.Tests/Description/FunctionDescriptorProviderTests.cs
@@ -9,8 +9,8 @@
 using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.Eventing;
 using Moq;
-using Xunit;
 using Newtonsoft.Json.Linq;
+using Xunit;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests
 {
diff --git a/test/WebJobs.Script.Tests/Description/FunctionGeneratorTests.cs b/test/WebJobs.Script.Tests/Description/FunctionGeneratorTests.cs
@@ -7,8 +7,8 @@
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Threading.Tasks;
-using Microsoft.Azure.WebJobs.Script.Description;
 using Microsoft.Azure.WebJobs.Script.Binding;
+using Microsoft.Azure.WebJobs.Script.Description;
 using Xunit;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests
diff --git a/test/WebJobs.Script.Tests/Description/Node/Compilation/ConditionalCompilationServiceTests.cs b/test/WebJobs.Script.Tests/Description/Node/Compilation/ConditionalCompilationServiceTests.cs
@@ -84,7 +84,7 @@ public async Task GetCompilationResultAsync_WithNegativePredicate_WaitsForCached
             positiveTestData.CompilationServiceMock.Verify(c => c.GetFunctionCompilationAsync(It.IsAny<FunctionMetadata>()));
         }
 
-        public(Mock<ICompilationService<IJavaScriptCompilation>> CompilationServiceMock, ConditionalJavaScriptCompilationService Service) CreateTestData(Func<bool> predicate)
+        public (Mock<ICompilationService<IJavaScriptCompilation>> CompilationServiceMock, ConditionalJavaScriptCompilationService Service) CreateTestData(Func<bool> predicate)
         {
             var settingsManager = new ScriptSettingsManager();
             var innerCompilationServiceMock = new Mock<ICompilationService<IJavaScriptCompilation>>();
diff --git a/test/WebJobs.Script.Tests/ScriptHostTests.cs b/test/WebJobs.Script.Tests/ScriptHostTests.cs
@@ -1607,7 +1607,6 @@ public void Dispose()
             }
         }
 
-
         private class TestLoggerFactory : ILoggerFactory
         {
             public TestLoggerFactory()
diff --git a/test/WebJobs.Script.Tests/Security/SecretManagerTests.cs b/test/WebJobs.Script.Tests/Security/SecretManagerTests.cs
@@ -430,8 +430,6 @@ public async Task SetMasterKey_WithoutProvidedKey_GeneratesKeyAndPersistsFile()
         {
             using (var directory = new TempDirectory())
             {
-                string expectedTraceMessage = "Master key Created";
-
                 Mock<IKeyValueConverterFactory> mockValueConverterFactory = GetConverterFactoryMock(false);
 
                 KeyOperationResult result;
diff --git a/test/WebJobs.Script.Tests/WebHostResolverTests.cs b/test/WebJobs.Script.Tests/WebHostResolverTests.cs
@@ -1,15 +1,14 @@
 ﻿// 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.IO;
 using Microsoft.Azure.WebJobs.Extensions.Http;
 using Microsoft.Azure.WebJobs.Script.Config;
 using Microsoft.Azure.WebJobs.Script.Eventing;
 using Microsoft.Azure.WebJobs.Script.WebHost;
 using Moq;
 using Xunit;
-using System.IO;
 
 namespace Microsoft.Azure.WebJobs.Script.Tests
 {

Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`	`using System.Linq;`
`7`	`7`	`using System.Threading;`
`8`	`8`	`using System.Threading.Tasks;`
`9`		`-using Microsoft.Azure.WebJobs.Script.Description;`
`10`	`9`	`using Microsoft.AspNetCore.Http;`
	`10`	`+using Microsoft.Azure.WebJobs.Script.Description;`
`11`	`11`
`12`	`12`	`namespace Microsoft.Azure.WebJobs.Script.WebHost.Features`
`13`	`13`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ namespace Microsoft.Azure.WebJobs.Script.Binding`
`21`	`21`	`{`
`22`	`22`	`public class HttpBinding : FunctionBinding`
`23`	`23`	`{`
`24`		`- public HttpBinding(ScriptHostConfiguration config, BindingMetadata metadata, FileAccess access)`
	`24`	`+ public HttpBinding(ScriptHostConfiguration config, BindingMetadata metadata, FileAccess access)`
`25`	`25`	`: base(config, metadata, access)`
`26`	`26`	`{`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`// Licensed under the MIT License. See License.txt in the project root for license information.`
`3`	`3`
`4`	`4`	`using System;`
`5`		`-using Microsoft.Extensions.Logging;`
`6`	`5`	`using Microsoft.Azure.WebJobs.Logging;`
	`6`	`+using Microsoft.Extensions.Logging;`
`7`	`7`
`8`	`8`	`namespace Microsoft.Azure.WebJobs.Script.Diagnostics`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,7 @@`
`1`		`-using Microsoft.Azure.WebJobs.Script.Abstractions;`
	`1`	`+// Copyright (c) .NET Foundation. All rights reserved.`
	`2`	`+// Licensed under the MIT License. See License.txt in the project root for license information.`
	`3`	`+`
	`4`	`+using Microsoft.Azure.WebJobs.Script.Abstractions;`
`2`	`5`
`3`	`6`	`namespace Microsoft.Azure.WebJobs.Script.Rpc`
`4`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Microsoft.Azure.WebJobs.Script.Rpc`
`7`	`7`	`{`
`8`	`8`	`internal interface IProcessRegistry`
`9`	`9`	`{`
`10`		`- // Registers processes to ensure that they are cleaned up on host exit.`
	`10`	`+ // Registers processes to ensure that they are cleaned up on host exit.`
`11`	`11`	`bool Register(Process process);`
`12`	`12`	`}`
`13`	`13`	`}`