Merge eaa9cb9 into 453312d

Author: joevanwanzeeleKF

CHANGELOG.md

@@ -1,5 +1,5 @@
-- 1.0.1
-* Added PAM support for the Server Username and Server Password fields
+- 1.0.2
+* Added/fixed PAM support for the Server Username and Server Password fields
 
 - 1.0.0
 * Initial release

VmwareVcenterOrchestrator/Jobs/VmwareVcenterJob.cs

@@ -39,14 +39,14 @@ protected void Initialize(InventoryJobConfiguration config)
             _logger.LogDebug("Initializing VmwareVsphereClient");
 
             VcenterProperties properties = JsonConvert.DeserializeObject<VcenterProperties>(config.CertificateStoreDetails?.Properties);
-
-            _logger.LogTrace($"server username: {properties.ServerUsername}");
-            _logger.LogTrace($"server password: {properties.ServerPassword}");
+            
+            _logger.LogTrace($"server username: {config.ServerUsername}");
+            _logger.LogTrace($"server password: {config.ServerPassword}");
             _logger.LogTrace($"PamSecretResolver is {(PamSecretResolver == null ? "" : "not")} null");
 
             string ClientMachine = config.CertificateStoreDetails?.ClientMachine;
-            string Username = PamUtilities.ResolvePAMField(PamSecretResolver, _logger, "Server Username", properties.ServerUsername);
-            string Password = PamUtilities.ResolvePAMField(PamSecretResolver, _logger, "Server Password", properties.ServerPassword);
+            string Username = PamUtilities.ResolvePAMField(PamSecretResolver, _logger, "Server Username", config.ServerUsername);
+            string Password = PamUtilities.ResolvePAMField(PamSecretResolver, _logger, "Server Password", config.ServerPassword);
 
             VcenterClient = new VmwareVcenterClient(ClientMachine, Username, Password);
         }
@@ -61,10 +61,10 @@ protected void Initialize(ManagementJobConfiguration config)
             VcenterProperties properties = JsonConvert.DeserializeObject<VcenterProperties>(config.CertificateStoreDetails?.Properties);
 
             string ClientMachine = config.CertificateStoreDetails?.ClientMachine;
-            _logger.LogTrace($"server username: {properties.ServerUsername}");
-            _logger.LogTrace($"server password: {properties.ServerPassword}");
-            string Username = PamUtilities.ResolvePAMField(PamSecretResolver, _logger, "Server Username", properties.ServerUsername);
-            string Password = PamUtilities.ResolvePAMField(PamSecretResolver, _logger, "Server Password", properties.ServerPassword);
+            _logger.LogTrace($"server username: {config.ServerUsername}");
+            _logger.LogTrace($"server password: {config.ServerPassword}");
+            string Username = PamUtilities.ResolvePAMField(PamSecretResolver, _logger, "Server Username", config.ServerUsername);
+            string Password = PamUtilities.ResolvePAMField(PamSecretResolver, _logger, "Server Password", config.ServerPassword);
 
             VcenterClient = new VmwareVcenterClient(ClientMachine, Username, Password);
         }