Return JobHistoryId on failures

Author: RexWheeler

IISWithBindings/Jobs/Inventory.cs

@@ -55,6 +55,7 @@ private JobResult PerformInventory(InventoryJobConfiguration config, SubmitInven
                             return new JobResult
                             {
                                 Result = OrchestratorJobStatusJobResult.Failure,
+                                JobHistoryId = config.JobHistoryId,
                                 FailureMessage =
                                     $"Site {config.CertificateStoreDetails.StorePath} on server {config.CertificateStoreDetails.ClientMachine}:  failed."
                             };
@@ -66,6 +67,7 @@ private JobResult PerformInventory(InventoryJobConfiguration config, SubmitInven
                             return new JobResult
                             {
                                 Result = OrchestratorJobStatusJobResult.Warning,
+                                JobHistoryId = config.JobHistoryId,
                                 FailureMessage =
                                     $"Inventory on server {config.CertificateStoreDetails.ClientMachine} did not find any bindings."
                             };
@@ -113,6 +115,7 @@ private JobResult PerformInventory(InventoryJobConfiguration config, SubmitInven
                 return new JobResult
                 {
                     Result = OrchestratorJobStatusJobResult.Failure,
+                    JobHistoryId = config.JobHistoryId,
                     FailureMessage =
                         $"Unable to open remote certificate store: {psEx.Message}"
                 };
@@ -123,6 +126,7 @@ private JobResult PerformInventory(InventoryJobConfiguration config, SubmitInven
                 return new JobResult
                 {
                     Result = OrchestratorJobStatusJobResult.Failure,
+                    JobHistoryId = config.JobHistoryId,
                     FailureMessage =
                         $"Site {config.CertificateStoreDetails.StorePath} on server {config.CertificateStoreDetails.ClientMachine}: {ex.Message}"
                 };

IISWithBindings/Jobs/Management.cs

@@ -99,7 +99,8 @@ private JobResult PerformRemoval(ManagementJobConfiguration config)
                     if (foundBindings.Count == 0)
                         return new JobResult
                         {
-                            Result = OrchestratorJobStatusJobResult.Failure,
+                            Result = OrchestratorJobStatusJobResult.Failure,
+                            JobHistoryId = config.JobHistoryId,
                             FailureMessage =
                                 $"Site {protocol} binding for Site {siteName} on server {config.CertificateStoreDetails.ClientMachine} not found."
                         };
@@ -119,7 +120,8 @@ private JobResult PerformRemoval(ManagementJobConfiguration config)
                         if (ps.HadErrors)
                             return new JobResult
                             {
-                                Result = OrchestratorJobStatusJobResult.Failure,
+                                Result = OrchestratorJobStatusJobResult.Failure,
+                                JobHistoryId = config.JobHistoryId,
                                 FailureMessage =
                                     $"Failed to remove {protocol} binding for Site {siteName} on server {config.CertificateStoreDetails.ClientMachine} not found."
                             };
@@ -141,7 +143,8 @@ private JobResult PerformRemoval(ManagementJobConfiguration config)
                 _logger.LogTrace(ex.Message);
                 return new JobResult
                 {
-                    Result = OrchestratorJobStatusJobResult.Failure,
+                    Result = OrchestratorJobStatusJobResult.Failure,
+                    JobHistoryId = config.JobHistoryId,
                     FailureMessage =
                         $"Site {config.CertificateStoreDetails.StorePath} on server {config.CertificateStoreDetails.ClientMachine}: {ex.Message}"
                 };
@@ -207,7 +210,8 @@ function InstallPfxToMachineStore([byte[]]$bytes, [string]$password, [string]$st
                     if (ps.HadErrors)
                         return new JobResult
                         {
-                            Result = OrchestratorJobStatusJobResult.Failure,
+                            Result = OrchestratorJobStatusJobResult.Failure,
+                            JobHistoryId = config.JobHistoryId,
                             FailureMessage =
                                 $"Site {config.CertificateStoreDetails.StorePath} on server {config.CertificateStoreDetails.ClientMachine}: {ps.Streams.Error.ReadAll().First().ErrorDetails.Message}"
                         };
@@ -296,7 +300,8 @@ function InstallPfxToMachineStore([byte[]]$bytes, [string]$password, [string]$st
                     if (ps.HadErrors)
                         return new JobResult
                         {
-                            Result = OrchestratorJobStatusJobResult.Failure,
+                            Result = OrchestratorJobStatusJobResult.Failure,
+                            JobHistoryId = config.JobHistoryId,
                             FailureMessage =
                                 $"Site {config.CertificateStoreDetails.StorePath} on server {config.CertificateStoreDetails.ClientMachine}: {ps.Streams.Error.ReadAll().First().ErrorDetails.Message}"
                         };
@@ -317,6 +322,7 @@ function InstallPfxToMachineStore([byte[]]$bytes, [string]$password, [string]$st
                 return new JobResult
                 {
                     Result = OrchestratorJobStatusJobResult.Failure,
+                    JobHistoryId = config.JobHistoryId,
                     FailureMessage =
                         $"Site {config.CertificateStoreDetails.StorePath} on server {config.CertificateStoreDetails.ClientMachine}: {ex.Message}"
                 };