Move "common/config" common types into cfgtypes.

logdog/server/collector/utils_test.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"
         "crypto/sha256"
         "encoding/hex"
         "errors"
         "fmt"
         "sort"
         "strings"
         "sync"
 
         "github.com/luci/luci-go/common/clock"
-        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/proto/google"
         "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"
         cc "github.com/luci/luci-go/logdog/server/collector/coordinator"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
 
         "golang.org/x/net/context"
 )
 
 var testSecret = bytes.Repeat([]byte{0x55}, types.PrefixSecretLength)
 
 type streamKey struct {
         project string
         id      string
 }
@@ skipping 253 matching lines @@
 // followed by a a series of records to assert. This can either be a specific
 // integer index or an intexRange marking a closed range of indices.
 func shouldHaveStoredStream(actual interface{}, expected ...interface{}) string {
         st := actual.(storage.Storage)
         project := expected[0].(string)
         name := expected[1].(string)
         expected = expected[2:]
 
         // Load all entries for this stream.
         req := storage.GetRequest{
-                Project: config.ProjectName(project),
+                Project: cfgtypes.ProjectName(project),
                 Path:    types.StreamPath(name),
         }
 
         entries := make(map[int]*logpb.LogEntry)
         var ierr error
         err := st.Get(req, func(e *storage.Entry) bool {
                 var le *logpb.LogEntry
                 if le, ierr = e.GetLogEntry(); ierr != nil {
                         return false
                 }
@@ skipping 62 matching lines @@
         if len(failed) > 0 {
                 return strings.Join(failed, ", ")
         }
         return ""
 }
 
 func idFromPath(path string) string {
         hash := sha256.Sum256([]byte(path))
         return hex.EncodeToString(hash[:])
 }