Move "common/config" common types into cfgtypes.

logdog/server/archivist/archivist_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 archivist
 
 import (
         "fmt"
         "strings"
         "sync"
         "testing"
         "time"
 
         "github.com/golang/protobuf/proto"
         "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/common/gcloud/gs"
         "github.com/luci/luci-go/common/proto/google"
         "github.com/luci/luci-go/logdog/api/endpoints/coordinator/services/v1"
         "github.com/luci/luci-go/logdog/api/logpb"
         "github.com/luci/luci-go/logdog/common/storage"
         "github.com/luci/luci-go/logdog/common/storage/memory"
         "github.com/luci/luci-go/logdog/common/types"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
         "golang.org/x/net/context"
         "google.golang.org/grpc"
 
         . "github.com/luci/luci-go/common/testing/assertions"
         . "github.com/smartystreets/goconvey/convey"
 )
 
 // testTask is an instrumentable Task implementation.
 type testTask struct {
         task           *logdog.ArchiveTask
@@ skipping 194 matching lines @@
                                                 },
                                         }},
                                 }
 
                                 d, err := proto.Marshal(&le)
                                 if err != nil {
                                         panic(err)
                                 }
 
                                 err = st.Put(storage.PutRequest{
-                                        Project: config.ProjectName(p),
+                                        Project: cfgtypes.ProjectName(p),
                                         Path:    desc.Path(),
                                         Index:   types.MessageIndex(v),
                                         Values:  [][]byte{d},
                                 })
                                 if err != nil {
                                         panic(err)
                                 }
 
                                 // Advance the time for each log entry.
                                 tc.Add(time.Second)
@@ skipping 52 matching lines @@
                                 return archiveStreamErr
                         },
                 }
 
                 stBase := Settings{
                         AlwaysRender: true,
                 }
 
                 ar := Archivist{
                         Service: &sc,
-                        SettingsLoader: func(c context.Context, proj config.ProjectName) (*Settings, error) {
+                        SettingsLoader: func(c context.Context, proj cfgtypes.ProjectName) (*Settings, error) {
                                 // Extra slashes to test concatenation,.
                                 st := stBase
                                 st.GSBase = gs.Path(fmt.Sprintf("gs://archival/%s/path/to/archive/", proj))
                                 st.GSStagingBase = gs.Path(fmt.Sprintf("gs://archival-staging/%s/path/to/archive/", proj))
                                 return &st, nil
                         },
                         Storage:  &st,
                         GSClient: &gsc,
                 }
 
@@ skipping 403 matching lines @@
 
                                                 So(ar.archiveTaskImpl(c, task), ShouldErrLike, "test error")
                                                 So(task.consumed, ShouldBeFalse)
                                                 So(archiveRequest, ShouldBeNil)
                                         })
                                 }
                         }
                 })
         })
 }