Fixing issue for Incorrect use of errors.Join in aws/client.go #608 (#…

…609) * Fixing issue for Incorrect use of errors.Join in aws/client.go #608 * Made changes after review in aws/client.go #608 * Made changes after review in aws/client.go #608 --------- Co-authored-by: praveen0raj <[email protected]>
openclarity · Sep 12, 2023 · 65aa95f · 65aa95f
1 parent 9d03999
commit 65aa95f
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pkg/orchestrator/provider/aws/client.go b/pkg/orchestrator/provider/aws/client.go
@@ -457,12 +457,13 @@ func (c *Client) RunAssetScan(ctx context.Context, config *provider.ScanJobConfi
 	close(errs)
 
 	// NOTE: make sure to drain results channel
+	listOfErrors := make([]error, 0)
 	for e := range errs {
 		if e != nil {
-			// nolint:typecheck
-			err = errors.Join(err, e)
+			listOfErrors = append(listOfErrors, e)
 		}
 	}
+	err = errors.Join(listOfErrors...)
 	if err != nil {
 		return err
 	}
@@ -770,13 +771,13 @@ func (c *Client) RemoveAssetScan(ctx context.Context, config *provider.ScanJobCo
 	close(errs)
 
 	// NOTE: make sure to drain results channel
+	listOfErrors := make([]error, 0)
 	for e := range errs {
 		if e != nil {
-			// nolint:typecheck
-			err = errors.Join(err, e)
+			listOfErrors = append(listOfErrors, e)
 		}
 	}
-
+	err = errors.Join(listOfErrors...)
 	return err
 }