Move "common/config" common types into cfgtypes.

logdog/server/collector/collector.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 collector
 
 import (
         "bytes"
         "time"
 
         "github.com/golang/protobuf/proto"
         "github.com/luci/luci-go/common/clock"
-        "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/sync/parallel"
         "github.com/luci/luci-go/common/tsmon/distribution"
         "github.com/luci/luci-go/common/tsmon/field"
         "github.com/luci/luci-go/common/tsmon/metric"
         tsmon_types "github.com/luci/luci-go/common/tsmon/types"
         "github.com/luci/luci-go/logdog/api/logpb"
         "github.com/luci/luci-go/logdog/client/butlerproto"
         "github.com/luci/luci-go/logdog/common/storage"
         "github.com/luci/luci-go/logdog/common/types"
         "github.com/luci/luci-go/logdog/server/collector/coordinator"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
         "golang.org/x/net/context"
 )
 
 const (
         // DefaultMaxMessageWorkers is the default number of concurrent worker
         // goroutones to employ for a single message.
         DefaultMaxMessageWorkers = 4
 )
 
 var (
@@ skipping 119 matching lines @@
                         fields.Infof(ctx, "Processing log bundle entry.")
                 }
         }
 
         lw := bundleHandler{
                 msg: msg,
                 md:  pr.Metadata,
                 b:   pr.Bundle,
         }
 
-        lw.project = config.ProjectName(lw.b.Project)
+        lw.project = cfgtypes.ProjectName(lw.b.Project)
         if err := lw.project.Validate(); err != nil {
                 log.Fields{
                         log.ErrorKey: err,
                         "project":    lw.b.Project,
                 }.Errorf(ctx, "Failed to validate bundle project name.")
                 return errors.New("invalid bundle project name")
         }
 
         if err := types.StreamName(lw.b.Prefix).Validate(); err != nil {
                 log.Fields{
@@ skipping 37 matching lines @@
 // value for log processing.
 type bundleHandler struct {
         // msg is the original message bytes.
         msg []byte
         // md is the metadata associated with the overall message.
         md *logpb.ButlerMetadata
         // b is the Butler bundle.
         b *logpb.ButlerLogBundle
 
         // project is the validated project name.
-        project config.ProjectName
+        project cfgtypes.ProjectName
 }
 
 type bundleEntryHandler struct {
         *bundleHandler
 
         // be is the Bundle entry.
         be *logpb.ButlerLogBundle_Entry
         // path is the constructed path of the stream being processed.
         path types.StreamPath
 }
@@ skipping 212 matching lines @@
                 }
         })
 }
 
 func streamType(desc *logpb.LogStreamDescriptor) string {
         if desc == nil {
                 return "UNKNOWN"
         }
         return desc.StreamType.String()
 }