Move "common/config" common types into cfgtypes.

milo/appengine/logdog/build.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 logdog
 
 import (
         "errors"
         "fmt"
         "net/http"
         "net/url"
         "strings"
         "time"
 
-        "github.com/luci/luci-go/common/config"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/proto/google"
         miloProto "github.com/luci/luci-go/common/proto/milo"
         "github.com/luci/luci-go/grpc/grpcutil"
         "github.com/luci/luci-go/logdog/api/logpb"
         "github.com/luci/luci-go/logdog/client/coordinator"
         "github.com/luci/luci-go/logdog/common/types"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
         "github.com/luci/luci-go/milo/api/resp"
         "github.com/luci/luci-go/milo/appengine/logdog/internal"
         "github.com/luci/luci-go/milo/common/miloerror"
 
         "github.com/golang/protobuf/proto"
         mc "github.com/luci/gae/service/memcache"
         "golang.org/x/net/context"
         "google.golang.org/grpc/codes"
 )
 
 const (
         // intermediateCacheLifetime is the amount of time to cache intermediate (non-
         // terminal) annotation streams. Terminal annotation streams are cached
         // indefinitely.
         intermediateCacheLifetime = 10 * time.Second
 
         // defaultLogDogHost is the default LogDog host, if one isn't specified via
         // query string.
         defaultLogDogHost = "luci-logdog.appspot.com"
 )
 
 type annotationStreamRequest struct {
         *AnnotationStream
 
         // host is the name of the LogDog host.
         host string
 
-        project config.ProjectName
+        project cfgtypes.ProjectName
         path    types.StreamPath
 
         // logDogClient is the HTTP client to use for LogDog communication.
         logDogClient *coordinator.Client
 
         // cs is the unmarshalled annotation stream Step and associated data.
         cs internal.CachedStep
 }
 
 func (as *annotationStreamRequest) normalize() error {
@@ skipping 211 matching lines @@
                         prefix:  prefix,
                 }
         )
         AddLogDogToBuild(c, &ub, streams.MainStream.Data, &build)
         return &build
 }
 
 type logDogURLBuilder struct {
         host    string
         prefix  types.StreamName
-        project config.ProjectName
+        project cfgtypes.ProjectName
 }
 
 func (b *logDogURLBuilder) BuildLink(l *miloProto.Link) *resp.Link {
         switch t := l.Value.(type) {
         case *miloProto.Link_LogdogStream:
                 ls := t.LogdogStream
 
                 server := ls.Server
                 if server == "" {
                         server = b.host
@@ skipping 31 matching lines @@
                 if link.Label == "" {
                         link.Label = "unnamed"
                 }
                 return &link
 
         default:
                 // Don't know how to render.
                 return nil
         }
 }