keep the order of error (#614)

yuyang0 · web-flow · commit 9d7defb24463 · 2023-09-29T12:37:47.000+08:00
diff --git a/resource/cobalt/call.go b/resource/cobalt/call.go
@@ -29,14 +29,14 @@ func call[T any](ctx context.Context, ps []plugins.Plugin, f func(plugins.Plugin
 	}
 	wg.Wait()
 	ans := make(map[plugins.Plugin]T)
-	results.Range(func(key, value any) bool {
+	for _, p := range ps {
+		value, _ := results.Load(p)
 		switch vt := value.(type) {
 		case error:
 			combinedErr = errors.CombineErrors(combinedErr, vt)
 		case T:
-			ans[key.(plugins.Plugin)] = vt
+			ans[p] = vt
 		}
-		return true
-	})
+	}
 	return ans, combinedErr
 }

Original file line number	Diff line number	Diff line change
`@@ -29,14 +29,14 @@ func call[T any](ctx context.Context, ps []plugins.Plugin, f func(plugins.Plugin`
`29`	`29`	`}`
`30`	`30`	`wg.Wait()`
`31`	`31`	`ans := make(map[plugins.Plugin]T)`
`32`		`- results.Range(func(key, value any) bool {`
	`32`	`+ for _, p := range ps {`
	`33`	`+ value, _ := results.Load(p)`
`33`	`34`	`switch vt := value.(type) {`
`34`	`35`	`case error:`
`35`	`36`	`combinedErr = errors.CombineErrors(combinedErr, vt)`
`36`	`37`	`case T:`
`37`		`- ans[key.(plugins.Plugin)] = vt`
	`38`	`+ ans[p] = vt`
`38`	`39`	`}`
`39`		`- return true`
`40`		`- })`
	`40`	`+ }`
`41`	`41`	`return ans, combinedErr`
`42`	`42`	`}`