[cipd] stop doing weird ownership transfer

cipd/client/cli/main.go

 // Copyright 2014 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 cli
 
 import (
         "crypto/sha1"
         "encoding/hex"
         "encoding/json"
@@ skipping 1527 matching lines @@
 
 func (c *deployRun) Run(a subcommands.Application, args []string, env subcommands.Env) int {
         if !c.checkArgs(args, 1, 1) {
                 return 1
         }
         ctx := cli.GetContext(a, c, env)
         return c.done(deployInstanceFile(ctx, c.rootDir, args[0]))
 }
 
 func deployInstanceFile(ctx context.Context, root string, instanceFile string) (common.Pin, error) {
-        inst, err := local.OpenInstanceFile(ctx, instanceFile, "", local.VerifyHash)
+        inst, closer, err := local.OpenInstanceFile(ctx, instanceFile, "", local.VerifyHash)
         if err != nil {
                 return common.Pin{}, err
         }
-        defer inst.Close()
+        defer closer()
         inspectInstance(ctx, inst, false)
 
         d := local.NewDeployer(root)
         defer d.CleanupTrash(ctx)
 
         // TODO(iannucci): add subdir arg to deployRun
 
         return d.DeployInstance(ctx, "", inst)
 }
 
@@ skipping 57 matching lines @@
 
         err = client.FetchInstanceTo(ctx, pin, out)
         if err != nil {
                 return common.Pin{}, err
         }
 
         // Print information about the instance. 'FetchInstanceTo' already verified
         // the hash.
         out.Close()
         ok = true
-        inst, err := local.OpenInstanceFile(ctx, instanceFile, pin.InstanceID, local.SkipHashVerification)
+        inst, closer, err := local.OpenInstanceFile(ctx, instanceFile, pin.InstanceID, local.SkipHashVerification)
         if err != nil {
                 os.Remove(instanceFile)
                 return common.Pin{}, err
         }
-        defer inst.Close()
+        defer closer()
         inspectInstance(ctx, inst, false)
         return inst.Pin(), nil
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // 'pkg-inspect' subcommand.
 
 func cmdInspect() *subcommands.Command {
         return &subcommands.Command{
                 Advanced:  true,
@@ skipping 14 matching lines @@
 
 func (c *inspectRun) Run(a subcommands.Application, args []string, env subcommands.Env) int {
         if !c.checkArgs(args, 1, 1) {
                 return 1
         }
         ctx := cli.GetContext(a, c, env)
         return c.done(inspectInstanceFile(ctx, args[0], true))
 }
 
 func inspectInstanceFile(ctx context.Context, instanceFile string, listFiles bool) (common.Pin, error) {
-        inst, err := local.OpenInstanceFile(ctx, instanceFile, "", local.VerifyHash)
+        inst, closer, err := local.OpenInstanceFile(ctx, instanceFile, "", local.VerifyHash)
         if err != nil {
                 return common.Pin{}, err
         }
-        defer inst.Close()
+        defer closer()
         inspectInstance(ctx, inst, listFiles)
         return inst.Pin(), nil
 }
 
 func inspectInstance(ctx context.Context, inst local.PackageInstance, listFiles bool) {
         fmt.Printf("Instance: %s\n", inst.Pin())
         if listFiles {
                 fmt.Println("Package files:")
                 for _, f := range inst.Files() {
                         if f.Symlink() {
@@ skipping 60 matching lines @@
 
 func (c *registerRun) Run(a subcommands.Application, args []string, env subcommands.Env) int {
         if !c.checkArgs(args, 1, 1) {
                 return 1
         }
         ctx := cli.GetContext(a, c, env)
         return c.done(registerInstanceFile(ctx, args[0], &c.Opts))
 }
 
 func registerInstanceFile(ctx context.Context, instanceFile string, opts *registerOpts) (common.Pin, error) {
-        inst, err := local.OpenInstanceFile(ctx, instanceFile, "", local.VerifyHash)
+        inst, closer, err := local.OpenInstanceFile(ctx, instanceFile, "", local.VerifyHash)
         if err != nil {
                 return common.Pin{}, err
         }
-        defer inst.Close()
+        defer closer()
         client, err := opts.clientOptions.makeCipdClient(ctx, "")
         if err != nil {
                 return common.Pin{}, err
         }
         inspectInstance(ctx, inst, false)
         err = client.RegisterInstance(ctx, inst, opts.uploadOptions.verificationTimeout)
         if err != nil {
                 return common.Pin{}, err
         }
         err = client.AttachTagsWhenReady(ctx, inst.Pin(), opts.tagsOptions.tags)
@@ skipping 444 matching lines @@
 // subcommand invocations look more natural.
 //
 // Compare:
 //   * Default: cipd set-ref -ref=abc -version=def package/name
 //   * Improved: cipd set-ref package/name -ref=abc -version=def
 //
 // Much better.
 func Main(params Parameters, args []string) int {
         return subcommands.Run(GetApplication(params), fixFlagsPosition(args))
 }