isolate: move creation of isolate into UploadTracker

client/cmd/isolate/exp_archive.go

 // Copyright 2015 The LUCI Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //      http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 194 matching lines @@
         if err != nil {
                 return fmt.Errorf("partitioning deps: %v", err)
         }
 
         numFiles := len(parts.filesToArchive.items) + len(parts.indivFiles.items)
         filesSize := uint64(parts.filesToArchive.totalSize + parts.indivFiles.totalSize)
         log.Printf("Isolate expanded to %d files (total size %s) and %d symlinks", numFiles, humanize.Bytes(filesSize), len(parts.links.items))
         log.Printf("\t%d files (%s) to be isolated individually", len(parts.indivFiles.items), humanize.Bytes(uint64(parts.indivFiles.totalSize)))
         log.Printf("\t%d files (%s) to be isolated in archives", len(parts.filesToArchive.items), humanize.Bytes(uint64(parts.filesToArchive.totalSize)))
 
-        tracker := NewUploadTracker(checker, uploader)
+        tracker := NewUploadTracker(checker, uploader, isol)
         if err := tracker.UploadDeps(parts); err != nil {
                 return err
         }
 
-        isol.Files = tracker.Files()
-
-        // Marshal the isolated file into JSON, and create an Item to describe it.
-        var isolJSON []byte
-        isolJSON, err = json.Marshal(isol)
+        isolItem, isolJSON, err := tracker.Finalize(archiveOpts.Isolated)
         if err != nil {
                 return err
         }
-        isolItem := &Item{
-                Path:    archiveOpts.Isolated,
-                RelPath: filepath.Base(archiveOpts.Isolated),
-                Digest:  isolated.HashBytes(isolJSON),
-                Size:    int64(len(isolJSON)),
-        }
-
-        // Check and upload isolate JSON.
-        checker.AddItem(isolItem, true, func(item *Item, ps *isolatedclient.PushState) {
-                if ps == nil {
-                        return
-                }
-                log.Printf("QUEUED %q for upload", item.RelPath)
-                uploader.UploadBytes(item.RelPath, isolJSON, ps, func() {
-                        log.Printf("UPLOADED %q", item.RelPath)
-                })
-        })
 
         // Make sure that all pending items have been checked.
         if err := checker.Close(); err != nil {
                 return err
         }
 
         // Make sure that all the uploads have completed successfully.
         if err := uploader.Close(); err != nil {
                 return err
         }
@@ skipping 72 matching lines @@
 }
 
 func hashFile(path string) (isolated.HexDigest, error) {
         f, err := os.Open(path)
         if err != nil {
                 return "", err
         }
         defer f.Close()
         return isolated.Hash(f)
 }