fix(orchestrator): skip mark terminated if asset found but patch failed

pkg/orchestrator/discovery/discoverer.go

@@ -74,6 +74,7 @@ func (d *Discoverer) DiscoverAndCreateAssets(ctx context.Context) error {
 	}
 
 	errs := []error{}
+	failedPatchAssets := make(map[string]struct{})
 	for _, assetType := range assetTypes {
 		assetData := models.Asset{
 			AssetInfo: utils.PointerTo(assetType),
@@ -94,7 +95,7 @@ func (d *Discoverer) DiscoverAndCreateAssets(ctx context.Context) error {
 			// because discovering the assets is a heavy operation,
 			// so we want to give the best chance to create all the
 			// assets in the DB before failing.
-			errs = append(errs, fmt.Errorf("failed to post asset: %v", err))
+			errs = append(errs, fmt.Errorf("failed to post asset: %w", err))
 			continue
 		}
 
@@ -104,7 +105,8 @@ func (d *Discoverer) DiscoverAndCreateAssets(ctx context.Context) error {
 		assetData.FirstSeen = nil
 		err = d.backendClient.PatchAsset(ctx, assetData, *conflictError.ConflictingAsset.Id)
 		if err != nil {
-			errs = append(errs, fmt.Errorf("failed to patch asset: %v", err))
+			failedPatchAssets[*conflictError.ConflictingAsset.Id] = struct{}{}
+			errs = append(errs, fmt.Errorf("failed to patch asset: %w", err))
 		}
 	}
 
@@ -127,13 +129,18 @@ func (d *Discoverer) DiscoverAndCreateAssets(ctx context.Context) error {
 	// Patch all assets which were not found by this discovery as
 	// terminated by setting terminatedOn.
 	for _, asset := range *assetResp.Items {
+		// Skip mark terminated if asset found but patch failed.
+		if _, ok := failedPatchAssets[*asset.Id]; ok {
+			continue
+		}
+
 		assetData := models.Asset{
 			TerminatedOn: &discoveryTime,
 		}
 
 		err := d.backendClient.PatchAsset(ctx, assetData, *asset.Id)
 		if err != nil {
-			errs = append(errs, fmt.Errorf("failed to patch asset: %v", err))
+			errs = append(errs, fmt.Errorf("failed to patch asset: %w", err))
 		}
 	}