chore: some small fixes

Author: rvazarkar

src/CommonLib/ConcurrentHashSet.cs

@@ -53,8 +53,13 @@ public IEnumerable<string> Values() {
         return _backingDictionary.Keys;
     }
 
+    public void Clear() {
+        _backingDictionary.Clear();
+    }
+
     public void Dispose() {
         _backingDictionary = null;
         GC.SuppressFinalize(this);
     }
+    
 }

src/CommonLib/ConnectionPoolManager.cs

@@ -83,11 +83,8 @@ public void ReleaseConnection(LdapConnectionWrapper connectionWrapper, bool conn
             }
 
             var resolved = ResolveIdentifier(identifier);
-            if (!_pools.TryGetValue(resolved, out var pool)) {
-                pool = new LdapConnectionPool(identifier, resolved, _ldapConfig, scanner: _portScanner);
-                pool = _pools.GetOrAdd(resolved, pool);
-            }
-
+            var pool = _pools.GetOrAdd(resolved, _ => new LdapConnectionPool(identifier, resolved, _ldapConfig, scanner: _portScanner));
+            
             return (true, pool);
         }
 

src/CommonLib/LdapConnectionPool.cs

@@ -203,7 +203,7 @@ public async IAsyncEnumerable<LdapResult<IDirectoryObject>> Query(LdapQueryParam
                         new LabelValues([nameof(LdapConnectionPool), _poolIdentifier]));
                     errorResult = LdapResult<IDirectoryObject>.Fail(
                         $"Query - Caught unrecoverable ldap exception: {le.Message} (ServerMessage: {le.ServerErrorMessage}) (ErrorCode: {le.ErrorCode})",
-                        queryParameters);
+                        queryParameters, le.ErrorCode);
                 }
                 catch (Exception e) {
                     /*
@@ -791,7 +791,6 @@ private bool CallDsGetDcName(string domainName, out NetAPIStructs.DomainControll
             if (!_globalCatalogConnection.TryTake(out var connectionWrapper)) {
                 var (success, connection, message) = await CreateNewConnection(true);
                 if (!success) {
-                    //If we didn't get a connection, immediately release the semaphore so we don't have hanging ones
                     return (false, null, message);
                 }
 

test/unit/LdapConnectionPoolTest.cs

@@ -18,6 +18,15 @@ private static void AddExclusionDomain(string identifier) {
         excludedDomains.Add(identifier);
     }
 
+    private static void ResetExclusionDomain() {
+        var excludedDomainsField = typeof(LdapConnectionPool)
+            .GetField("ExcludedDomains", BindingFlags.Static | BindingFlags.NonPublic);
+
+        var excludedDomains = (ConcurrentHashSet)excludedDomainsField.GetValue(null);
+
+        excludedDomains.Clear();
+    }
+
     private static ConcurrentBag<LdapConnectionWrapper> GetConnectionsBag(LdapConnectionPool pool) {
         var field = typeof(LdapConnectionPool)
             .GetField("_connections", BindingFlags.Instance | BindingFlags.NonPublic);
@@ -33,6 +42,7 @@ private static ConcurrentBag<LdapConnectionWrapper> GetGlobalCatalogConnectionsB
     [Fact]
     public async Task LdapConnectionPool_ExcludedDomains_ShouldExitEarly()
     {
+        ResetExclusionDomain();
         var mockLogger = new Mock<ILogger>();
         var ldapConfig = new LdapConfig();
         var connectionPool = new ConnectionPoolManager(ldapConfig, mockLogger.Object);
@@ -47,6 +57,7 @@ public async Task LdapConnectionPool_ExcludedDomains_ShouldExitEarly()
     [Fact]
     public async Task LdapConnectionPool_ExcludedDomains_NonExcludedShouldntExit()
     {
+        ResetExclusionDomain();
         var mockLogger = new Mock<ILogger>();
         var ldapConfig = new LdapConfig();
         var connectionPool = new ConnectionPoolManager(ldapConfig, mockLogger.Object);
@@ -64,6 +75,7 @@ public async Task LdapConnectionPool_ExcludedDomains_NonExcludedShouldntExit()
     [Fact]
     public async Task LdapConnectionPool_ExcludedDomains_GlobalCatalog_ShouldExitEarly()
     {
+        ResetExclusionDomain();
         var mockLogger = new Mock<ILogger>();
         var ldapConfig = new LdapConfig();
         var connectionPool = new ConnectionPoolManager(ldapConfig, mockLogger.Object);