Move "common/config" common types into cfgtypes.

logdog/client/cmd/logdog_annotee/main.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 main
 
 import (
         "encoding/json"
         "errors"
         "flag"
         "fmt"
         "os"
         "time"
 
         "github.com/golang/protobuf/proto"
         "github.com/luci/luci-go/common/clock/clockflag"
-        "github.com/luci/luci-go/common/config"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/logging/gologger"
         "github.com/luci/luci-go/common/proto/milo"
         "github.com/luci/luci-go/common/runtime/profiling"
         "github.com/luci/luci-go/logdog/client/annotee"
         "github.com/luci/luci-go/logdog/client/annotee/executor"
         "github.com/luci/luci-go/logdog/client/bootstrapResult"
         "github.com/luci/luci-go/logdog/client/butlerlib/bootstrap"
         "github.com/luci/luci-go/logdog/client/butlerlib/streamclient"
         "github.com/luci/luci-go/logdog/client/butlerlib/streamproto"
         "github.com/luci/luci-go/logdog/common/types"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
         "golang.org/x/net/context"
 )
 
 const (
         // configErrorReturnCode is returned when there is an error with Annotee's
         // command-line configuration.
         configErrorReturnCode = 2
 
         // runtimeErrorReturnCode is returned when the execution fails due to an
         // Annotee runtime error. This is intended to help differentiate Annotee
@@ skipping 15 matching lines @@
 type application struct {
         context.Context
 
         resultPath         string
         jsonArgsPath       string
         butlerStreamServer string
         tee                teeFlag
         printSummary       bool
         testingDir         string
         annotationInterval clockflag.Duration
-        project            config.ProjectName
+        project            cfgtypes.ProjectName
         nameBase           streamproto.StreamNameFlag
         prefix             streamproto.StreamNameFlag
         logdogHost         string
 
         prof profiling.Profiler
 
         bootstrap *bootstrap.Bootstrap
 }
 
 func (a *application) addToFlagSet(fs *flag.FlagSet) {
@@ skipping 207 matching lines @@
         }
         if err := a.maybeWriteResult(&br); err != nil {
                 log.WithError(err).Warningf(a, "Failed to write bootstrap result.")
         }
         return e.ReturnCode()
 }
 
 func main() {
         os.Exit(mainImpl(os.Args[1:]))
 }