Move "common/config" common types into cfgtypes.

logdog/server/collector/collector_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"
         "fmt"
         "sync/atomic"
         "testing"
 
         "github.com/luci/luci-go/common/clock/testclock"
-        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/logdog/api/logpb"
         "github.com/luci/luci-go/logdog/client/butlerproto"
         "github.com/luci/luci-go/logdog/common/storage/memory"
         "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"
 
         . "github.com/luci/luci-go/common/testing/assertions"
         . "github.com/smartystreets/goconvey/convey"
 )
 
 // TestCollector runs through a series of end-to-end Collector workflows and
 // ensures that the Collector behaves appropriately.
 func testCollectorImpl(t *testing.T, caching bool) {
         Convey(fmt.Sprintf(`Using a test configuration with caching == %v`, caching), t, func() {
@@ skipping 164 matching lines @@
                         bb.addFullStream("foo/+/baz", 3)
 
                         err := coll.Process(c, bb.bundle())
                         So(err, ShouldErrLike, "invalid bundle project name")
                         So(errors.IsTransient(err), ShouldBeFalse)
                 })
 
                 Convey(`Will drop streams with invalid project names.`, func() {
                         b := bb.genBase()
                         b.Project = "!!!invalid name!!!"
-                        So(config.ProjectName(b.Project).Validate(), ShouldNotBeNil)
+                        So(cfgtypes.ProjectName(b.Project).Validate(), ShouldNotBeNil)
 
                         err := coll.Process(c, bb.bundle())
                         So(err, ShouldErrLike, "invalid bundle project name")
                         So(errors.IsTransient(err), ShouldBeFalse)
                 })
 
                 Convey(`Will drop streams with empty bundle prefixes.`, func() {
                         b := bb.genBase()
                         b.Prefix = ""
 
@@ skipping 100 matching lines @@
         testCollectorImpl(t, false)
 }
 
 // TestCollectorWithCaching runs through a series of end-to-end Collector
 // workflows and ensures that the Collector behaves appropriately.
 func TestCollectorWithCaching(t *testing.T) {
         t.Parallel()
 
         testCollectorImpl(t, true)
 }