LogDog: CLI can use stream URLs, fix auth.

logdog/client/cli/subcommandQuery.go

 // Copyright 2015 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 (
         "bufio"
         "encoding/json"
         "io"
         "os"
 
         "github.com/luci/luci-go/common/clock/clockflag"
+        "github.com/luci/luci-go/common/errors"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/logdog/api/logpb"
         "github.com/luci/luci-go/logdog/client/butlerlib/streamproto"
         "github.com/luci/luci-go/logdog/client/coordinator"
 
         "github.com/maruel/subcommands"
         "golang.org/x/net/context"
 )
 
 const (
@@ skipping 43 matching lines @@
 func (cmd *queryCommandRun) Run(scApp subcommands.Application, args []string, _ subcommands.Env) int {
         a := scApp.(*application)
 
         // User-friendly: trim any leading or trailing slashes from the path.
         project, path, unified, err := a.splitPath(cmd.path)
         if err != nil {
                 log.WithError(err).Errorf(a, "Invalid path specifier.")
                 return 1
         }
 
+        coord, err := a.coordinatorClient("")
+        if err != nil {
+                errors.Log(a, errors.Annotate(err).Reason("could not create Coordinator client").Err())
+                return 1
+        }
+
         // Open our output file, if necessary.
         w := io.Writer(nil)
         switch cmd.out {
         case "-":
                 w = os.Stdout
         default:
                 f, err := os.OpenFile(cmd.out, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0643)
                 if err != nil {
                         log.Fields{
                                 log.ErrorKey: err,
@@ skipping 25 matching lines @@
                 State:       cmd.json,
                 Before:      cmd.before.Time(),
                 After:       cmd.after.Time(),
                 Purged:      cmd.purged.Trinary(),
         }
         count := 0
         log.Debugf(a, "Issuing query...")
 
         tctx, _ := a.timeoutCtx(a)
         ierr := error(nil)
-        err = a.coord.Query(tctx, project, path, qo, func(s *coordinator.LogStream) bool {
+        err = coord.Query(tctx, project, path, qo, func(s *coordinator.LogStream) bool {
                 if err := o.emit(s); err != nil {
                         ierr = err
                         return false
                 }
 
                 count++
                 return !(cmd.results > 0 && count >= cmd.results)
         })
         if err == nil {
                 // Propagate internal error.
@@ skipping 124 matching lines @@
 }
 
 func (p *jsonQueryOutput) end() error {
         if err := p.ensureStart(); err != nil {
                 return err
         }
 
         _, err := p.WriteRune(']')
         return err
 }