Fix violations of S3776: Cognitive Complexity of methods should not be too high

Author: bart-vmware

Steeltoe.Debug.ruleset

@@ -71,7 +71,7 @@
     <Rule Id="S3597" Action="None" />
     <Rule Id="S3598" Action="None" />
     <Rule Id="S3717" Action="Info" />
-    <Rule Id="S3776" Action="Info" />
+    <Rule Id="S3776" Action="Warning" />
     <Rule Id="S3872" Action="Warning" />
     <Rule Id="S3874" Action="Warning" />
     <Rule Id="S3878" Action="None" />

Steeltoe.Release.ruleset

@@ -59,6 +59,7 @@
     <Rule Id="S3597" Action="None" />
     <Rule Id="S3598" Action="None" />
     <Rule Id="S3717" Action="Warning" />
+    <Rule Id="S3776" Action="Warning" />
     <Rule Id="S3872" Action="Warning" />
     <Rule Id="S3874" Action="Warning" />
     <Rule Id="S3878" Action="None" />

src/Common/src/Common/Net/InetUtils.cs

@@ -35,33 +35,31 @@ public InetUtils(IDomainNameResolver domainNameResolver, IOptionsMonitor<InetOpt
 
     public virtual HostInfo FindFirstNonLoopbackHostInfo()
     {
-        InetOptions inetOptions = _optionsMonitor.CurrentValue;
-
-        IPAddress? address = FindFirstNonLoopbackAddress(inetOptions);
+        InetOptions options = _optionsMonitor.CurrentValue;
+        IPAddress? address = FindFirstNonLoopbackAddress(options);
 
         if (address != null)
         {
-            return ConvertAddress(address, inetOptions);
+            return ConvertAddress(address, options);
         }
 
-        return new HostInfo(inetOptions.DefaultHostname!, inetOptions.DefaultIPAddress!);
+        return new HostInfo(options.DefaultHostname!, options.DefaultIPAddress!);
     }
 
     public IPAddress? FindFirstNonLoopbackAddress()
     {
         return FindFirstNonLoopbackAddress(_optionsMonitor.CurrentValue);
     }
 
-    private IPAddress? FindFirstNonLoopbackAddress(InetOptions inetOptions)
+    private IPAddress? FindFirstNonLoopbackAddress(InetOptions options)
     {
         IPAddress? result = null;
 
         try
         {
             int lowest = int.MaxValue;
-            NetworkInterface[] networkInterfaces = NetworkInterface.GetAllNetworkInterfaces();
 
-            foreach (NetworkInterface networkInterface in networkInterfaces)
+            foreach (NetworkInterface networkInterface in NetworkInterface.GetAllNetworkInterfaces())
             {
                 if (networkInterface is { OperationalStatus: OperationalStatus.Up, IsReceiveOnly: false })
                 {
@@ -73,24 +71,7 @@ public virtual HostInfo FindFirstNonLoopbackHostInfo()
                     if (iPv4Properties.Index < lowest || result == null)
                     {
                         lowest = iPv4Properties.Index;
-                    }
-                    else
-                    {
-                        continue;
-                    }
-
-                    if (!IgnoreInterface(networkInterface.Name, inetOptions))
-                    {
-                        foreach (UnicastIPAddressInformation addressInfo in properties.UnicastAddresses)
-                        {
-                            IPAddress address = addressInfo.Address;
-
-                            if (IsInet4Address(address) && !IsLoopbackAddress(address) && IsPreferredAddress(address, inetOptions))
-                            {
-                                LogNonLoopbackInterfaceFound(networkInterface.Name);
-                                result = address;
-                            }
-                        }
+                        result = GetLastNonLoopbackInterfaceAddress(networkInterface, properties, options) ?? result;
                     }
                 }
             }
@@ -100,12 +81,28 @@ public virtual HostInfo FindFirstNonLoopbackHostInfo()
             LogCannotGetNonLoopbackAddress(exception);
         }
 
-        if (result != null)
+        return result ?? GetHostAddress();
+    }
+
+    private IPAddress? GetLastNonLoopbackInterfaceAddress(NetworkInterface networkInterface, IPInterfaceProperties properties, InetOptions options)
+    {
+        IPAddress? result = null;
+
+        if (!IgnoreInterface(networkInterface.Name, options))
         {
-            return result;
+            foreach (UnicastIPAddressInformation addressInfo in properties.UnicastAddresses)
+            {
+                IPAddress address = addressInfo.Address;
+
+                if (IsInet4Address(address) && !IsLoopbackAddress(address) && IsPreferredAddress(address, options))
+                {
+                    LogNonLoopbackInterfaceFound(networkInterface.Name);
+                    result = address;
+                }
+            }
         }
 
-        return GetHostAddress();
+        return result;
     }
 
     private static bool IsInet4Address(IPAddress address)
@@ -118,9 +115,9 @@ private static bool IsLoopbackAddress(IPAddress address)
         return IPAddress.IsLoopback(address);
     }
 
-    internal bool IsPreferredAddress(IPAddress address, InetOptions inetOptions)
+    internal bool IsPreferredAddress(IPAddress address, InetOptions options)
     {
-        if (inetOptions.UseOnlySiteLocalInterfaces)
+        if (options.UseOnlySiteLocalInterfaces)
         {
             bool siteLocalAddress = IsSiteLocalAddress(address);
 
@@ -132,7 +129,7 @@ internal bool IsPreferredAddress(IPAddress address, InetOptions inetOptions)
             return siteLocalAddress;
         }
 
-        string[] preferredNetworks = inetOptions.GetPreferredNetworks().ToArray();
+        string[] preferredNetworks = options.GetPreferredNetworks().ToArray();
 
         if (preferredNetworks.Length == 0)
         {
@@ -154,32 +151,30 @@ internal bool IsPreferredAddress(IPAddress address, InetOptions inetOptions)
         return false;
     }
 
-    internal bool IgnoreInterface(string interfaceName, InetOptions inetOptions)
+    internal bool IgnoreInterface(string interfaceName, InetOptions options)
     {
-        if (string.IsNullOrEmpty(interfaceName))
-        {
-            return false;
-        }
-
-        foreach (string regex in inetOptions.GetIgnoredInterfaces())
+        if (!string.IsNullOrEmpty(interfaceName))
         {
-            var matcher = new Regex(regex, InetRegexOptions, RegexMatchTimeout);
-
-            if (matcher.IsMatch(interfaceName))
+            foreach (string regex in options.GetIgnoredInterfaces())
             {
-                LogIgnoringInterface(interfaceName);
-                return true;
+                var matcher = new Regex(regex, InetRegexOptions, RegexMatchTimeout);
+
+                if (matcher.IsMatch(interfaceName))
+                {
+                    LogIgnoringInterface(interfaceName);
+                    return true;
+                }
             }
         }
 
         return false;
     }
 
-    internal HostInfo ConvertAddress(IPAddress address, InetOptions inetOptions)
+    internal HostInfo ConvertAddress(IPAddress address, InetOptions options)
     {
         string hostname;
 
-        if (!inetOptions.SkipReverseDnsLookup)
+        if (!options.SkipReverseDnsLookup)
         {
             try
             {
@@ -195,29 +190,21 @@ internal HostInfo ConvertAddress(IPAddress address, InetOptions inetOptions)
         }
         else
         {
-            hostname = inetOptions.DefaultHostname!;
+            hostname = options.DefaultHostname!;
         }
 
         return new HostInfo(hostname, address.ToString());
     }
 
     private IPAddress? ResolveHostAddress(string hostName)
     {
-        IPAddress? result = null;
-
         try
         {
-            IPAddress[] results = Dns.GetHostAddresses(hostName);
-
-            if (results.Length > 0)
+            foreach (IPAddress address in Dns.GetHostAddresses(hostName))
             {
-                foreach (IPAddress address in results)
+                if (address.AddressFamily == AddressFamily.InterNetwork)
                 {
-                    if (address.AddressFamily == AddressFamily.InterNetwork)
-                    {
-                        result = address;
-                        break;
-                    }
+                    return address;
                 }
             }
         }
@@ -226,7 +213,7 @@ internal HostInfo ConvertAddress(IPAddress address, InetOptions inetOptions)
             LogUnableToResolveHostAddress(exception);
         }
 
-        return result;
+        return null;
     }
 
     private string? ResolveHostName()

src/Configuration/src/CloudFoundry/ServiceBindings/PostProcessors/CredHubCloudFoundryPostProcessor.cs

@@ -31,21 +31,19 @@ public override void PostProcessConfiguration(PostProcessorConfigurationProvider
 
             foreach ((string fullKey, string? value) in configurationData.ToArray())
             {
-                if (!fullKey.StartsWith(credentialsPrefix, StringComparison.OrdinalIgnoreCase))
+                if (fullKey.StartsWith(credentialsPrefix, StringComparison.OrdinalIgnoreCase))
                 {
-                    continue;
-                }
+                    // Dots in a credential key are converted to colons so secrets can be shared between Spring and .NET apps.
+                    string keyWithoutPrefix = fullKey[credentialsPrefix.Length..];
+                    string normalizedKey = keyWithoutPrefix.Replace(".", ConfigurationPath.KeyDelimiter, StringComparison.Ordinal);
 
-                // Dots in a credential key are converted to colons so secrets can be shared between Spring and .NET apps.
-                string keyWithoutPrefix = fullKey[credentialsPrefix.Length..];
-                string normalizedKey = keyWithoutPrefix.Replace(".", ConfigurationPath.KeyDelimiter, StringComparison.Ordinal);
+                    if (configurationData.TryGetValue(normalizedKey, out string? existingValue) && existingValue != value)
+                    {
+                        LogOverwritingConfigurationKey(normalizedKey, bindingName);
+                    }
 
-                if (configurationData.TryGetValue(normalizedKey, out string? existingValue) && existingValue != value)
-                {
-                    LogOverwritingConfigurationKey(normalizedKey, bindingName);
+                    configurationData[normalizedKey] = value;
                 }
-
-                configurationData[normalizedKey] = value;
             }
         }
     }