Merge pull request #885 from alfrunes/4.5.x

fix: Delete device deployment history incorrectly triggering reindex
mendersoftware · Jul 13, 2023 · 8ab255c · 8ab255c
2 parents a166a62 + 45d358e
commit 8ab255c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/app.go b/app/app.go
@@ -1969,7 +1969,10 @@ func (d *Deployments) DeleteDeviceDeploymentsHistory(ctx context.Context, device
 		deviceDeployments[i].DeviceID = d.DeviceId
 		deviceDeployments[i].DeploymentID = d.DeploymentId
 	}
-	return d.workflowsClient.StartReindexReportingDeploymentBatch(ctx, deviceDeployments)
+	if d.reportingClient != nil {
+		err = d.workflowsClient.StartReindexReportingDeploymentBatch(ctx, deviceDeployments)
+	}
+	return err
 }
 
 // Storage settings

diff --git a/app/app_test.go b/app/app_test.go
@@ -1278,11 +1278,14 @@ func TestDeleteDeviceDeploymentsHistory(t *testing.T) {
 	for name, tc := range testCases {
 		t.Run(fmt.Sprintf("test case %s", name), func(t *testing.T) {
 
+			rc := new(reporting_mocks.Client)
+			defer rc.AssertExpectations(t)
 			defer tc.workflowsMock.AssertExpectations(t)
 			defer tc.storeMock.AssertExpectations(t)
 			ds := &Deployments{
 				db:              tc.storeMock,
 				workflowsClient: tc.workflowsMock,
+				reportingClient: rc,
 			}
 
 			err := ds.DeleteDeviceDeploymentsHistory(ctx, deviceID)