Move "common/config" common types into cfgtypes.

logdog/client/cmd/logdog_butler/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 (
         "bytes"
         "flag"
         "fmt"
         "net/http"
         "os"
         "os/signal"
         "sort"
         "strings"
         "time"
 
         "github.com/maruel/subcommands"
         "golang.org/x/net/context"
 
         "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/clock/clockflag"
-        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/flag/multiflag"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/logging/gologger"
         "github.com/luci/luci-go/common/runtime/paniccatcher"
         "github.com/luci/luci-go/common/runtime/profiling"
         grpcLogging "github.com/luci/luci-go/grpc/logging"
         "github.com/luci/luci-go/logdog/client/butler"
         "github.com/luci/luci-go/logdog/client/butler/output"
         "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"
 )
 
 const (
         // flagErrorReturnCode is returned when there is an error with the Butler's
         // command-line configuration.
         configErrorReturnCode = 2
 
         // runtimeErrorReturnCode is returned when the execution fails due to a Butler
         // error. This is intended to help differentiate Butler errors from
         // passthrough bootstrapped subprocess errors.
         //
         // This will only be returned for runtime errors. If there is a flag error
         // or a configuration error, standard Butler return codes (likely to overlap
         // with standard process return codes) will be used.
         runtimeErrorReturnCode = 250
 )
 
 // application is the Butler application instance and its runtime configuration
 // and state.
 type application struct {
         cli.Application
         context.Context
 
-        project             config.ProjectName
+        project             cfgtypes.ProjectName
         prefix              types.StreamName
         coordinatorHost     string
         outputWorkers       int
         outputConfig        outputConfigFlag
         ioKeepAliveInterval clockflag.Duration
 
         authFlags authcli.Flags
 
         globalTags   streamproto.TagMap
         maxBufferAge clockflag.Duration
@@ skipping 278 matching lines @@
 
         paniccatcher.Do(func() {
                 rc = mainImpl(ctx, os.Args[1:])
         }, func(p *paniccatcher.Panic) {
                 log.Fields{
                         "panic.error": p.Reason,
                 }.Errorf(ctx, "Panic caught in main:\n%s", p.Stack)
                 rc = runtimeErrorReturnCode
         })
 }