Refactor distributor API so that methods always get the Quest_Desc too.

dm/appengine/distributor/swarming/v1/isolate.go

 // Copyright 2016 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package swarming
 
 import (
         "bytes"
         "encoding/json"
         "strings"
 
         "github.com/golang/protobuf/jsonpb"
         "github.com/golang/protobuf/proto"
         "github.com/luci/gae/service/info"
         "github.com/luci/luci-go/common/api/isolate/isolateservice/v1"
         swarm "github.com/luci/luci-go/common/api/swarming/swarming/v1"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/isolated"
         "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"
 )
 
 const prevPath = ".dm/previous_execution.json"
 const exAuthPath = ".dm/execution_auth.json"
 const descPath = ".dm/quest_description.json"
 
 func mkFile(data []byte) *isolated.File {
         mode := 0444
         size := int64(len(data))
@@ skipping 75 matching lines @@
                         if st != nil {
                                 i, st := i, st
                                 ch <- func() error {
                                         return isoClient.Push(c, st, isolatedclient.NewBytesSource(chunks[i].data))
                                 }
                         }
                 }
         })
 }
 
-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{
                 {data: prevData, file: prevFile},
                 {data: authData, file: authFile},
                 {data: descData, file: descFile},
                 {data: isoData, file: isoFile, isIso: true},
         })
         if err != nil {
                 err = errors.Annotate(err).Reason("pushing new Isolated").Err()
                 return nil, err
         }
 
         return &swarm.SwarmingRpcsFilesRef{
                 Isolated:       string(isoFile.Digest),
                 Isolatedserver: isolateURL,
                 Namespace:      isolatedclient.DefaultNamespace,
         }, nil
 }