Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(420)

Unified Diff: dm/appengine/distributor/swarming/v1/isolate.go

Issue 2347973003: Refactor distributor API so that methods always get the Quest_Desc too. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: dm/appengine/distributor/swarming/v1/isolate.go
diff --git a/dm/appengine/distributor/swarming/v1/isolate.go b/dm/appengine/distributor/swarming/v1/isolate.go
index e974c60568dc36ed955d257b2ca8afb3a0baf7b9..50b1a7363046f5fe3b1e1b0fe864a0a022bc4e25 100644
--- a/dm/appengine/distributor/swarming/v1/isolate.go
+++ b/dm/appengine/distributor/swarming/v1/isolate.go
@@ -19,7 +19,7 @@ import (
"github.com/luci/luci-go/common/isolatedclient"
"github.com/luci/luci-go/common/sync/parallel"
sv1 "github.com/luci/luci-go/dm/api/distributor/swarming/v1"
- "github.com/luci/luci-go/dm/appengine/distributor"
+ dm "github.com/luci/luci-go/dm/api/service/v1"
"golang.org/x/net/context"
)
@@ -115,14 +115,14 @@ func pushIsolate(c context.Context, isolateURL string, chunks []isoChunk) error
})
}
-func prepIsolate(c context.Context, isolateURL string, tsk *distributor.TaskDescription, params *sv1.Parameters) (*swarm.SwarmingRpcsFilesRef, error) {
+func prepIsolate(c context.Context, isolateURL string, desc *dm.Quest_Desc, auth *dm.Execution_Auth, prev *dm.JsonResult, params *sv1.Parameters) (*swarm.SwarmingRpcsFilesRef, error) {
prevData := []byte("{}")
- if tsk.PreviousResult() != nil {
- prevData = []byte(tsk.PreviousResult().Object)
+ if prev != nil {
+ prevData = []byte(prev.Object)
}
prevFile := mkFile(prevData)
- authData, authFile := mkMsgFile(tsk.ExecutionAuth())
- descData, descFile := mkMsgFile(tsk.Payload())
+ authData, authFile := mkMsgFile(auth)
+ descData, descFile := mkMsgFile(desc)
isoData, isoFile := mkIsolated(c, params, prevFile, descFile, authFile)
err := pushIsolate(c, isolateURL, []isoChunk{

Powered by Google App Engine
This is Rietveld 408576698