Move "common/config" common types into cfgtypes.

logdog/common/storage/bigtable/logdog_bigtable_test/main.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 main implements a simple CLI tool to load and interact with storage
 // data in Google BigTable data.
 package main
 
 import (
         "bytes"
         "flag"
         "io"
         "os"
 
         "github.com/luci/luci-go/client/authcli"
         "github.com/luci/luci-go/common/auth"
         "github.com/luci/luci-go/common/cli"
-        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/errors"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/logging/gologger"
         "github.com/luci/luci-go/logdog/common/storage"
         "github.com/luci/luci-go/logdog/common/storage/bigtable"
         "github.com/luci/luci-go/logdog/common/storage/memory"
         "github.com/luci/luci-go/logdog/common/types"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
 
         "github.com/golang/protobuf/proto"
         "github.com/maruel/subcommands"
         "golang.org/x/net/context"
         "google.golang.org/api/option"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
 // main
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 179 matching lines @@
                 renderErr(c, errors.Annotate(err).Reason("failed to create storage client").Err())
                 return 1
         }
         defer stClient.Close()
 
         for round := 0; round < cmd.rounds; round++ {
                 log.Infof(c, "Get round %d.", round+1)
 
                 var innerErr error
                 err = stClient.Get(storage.GetRequest{
-                        Project: config.ProjectName(cmd.project),
+                        Project: cfgtypes.ProjectName(cmd.project),
                         Path:    types.StreamPath(cmd.path),
                         Index:   types.MessageIndex(cmd.index),
                         Limit:   cmd.limit,
                 }, func(e *storage.Entry) bool {
                         le, err := e.GetLogEntry()
                         if err != nil {
                                 log.WithError(err).Errorf(c, "Failed to unmarshal log entry.")
                                 return false
                         }
 
@@ skipping 60 matching lines @@
 
         stClient, err := app.getBigTableClient(c)
         if err != nil {
                 renderErr(c, errors.Annotate(err).Reason("failed to create storage client").Err())
                 return 1
         }
         defer stClient.Close()
 
         for round := 0; round < cmd.rounds; round++ {
                 log.Infof(c, "Tail round %d.", round+1)
-                e, err := stClient.Tail(config.ProjectName(cmd.project), types.StreamPath(cmd.path))
+                e, err := stClient.Tail(cfgtypes.ProjectName(cmd.project), types.StreamPath(cmd.path))
                 if err != nil {
                         renderErr(c, errors.Annotate(err).Reason("failed to tail log entries").Err())
                         return 1
                 }
 
                 if e == nil {
                         log.Infof(c, "No log data to tail.")
                         continue
                 }
 
                 le, err := e.GetLogEntry()
                 if err != nil {
                         renderErr(c, errors.Annotate(err).Reason("failed to unmarshal log entry").Err())
                         return 1
                 }
 
                 log.Fields{
                         "index": le.StreamIndex,
                         "size":  len(e.D),
                 }.Debugf(c, "Dumping tail entry.")
                 if err := unmarshalAndDump(c, os.Stdout, nil, le); err != nil {
                         renderErr(c, errors.Annotate(err).Reason("failed to dump log entry").Err())
                         return 1
                 }
         }
 
         return 0
 }