Move "common/config" common types into cfgtypes.

logdog/appengine/coordinator/context_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 coordinator
 
 import (
         "errors"
         "fmt"
         "testing"
 
         "github.com/luci/gae/impl/memory"
         luciConfig "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/logdog/api/config/svcconfig"
         "github.com/luci/luci-go/logdog/appengine/coordinator/config"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
         "github.com/luci/luci-go/server/auth"
         "github.com/luci/luci-go/server/auth/authtest"
         "github.com/luci/luci-go/server/auth/identity"
 
         "golang.org/x/net/context"
 
         . "github.com/luci/luci-go/common/testing/assertions"
         . "github.com/smartystreets/goconvey/convey"
 )
 
 type testServices struct {
         Services
 
         configErr error
-        configs   map[luciConfig.ProjectName]*svcconfig.ProjectConfig
+        configs   map[cfgtypes.ProjectName]*svcconfig.ProjectConfig
 }
 
-func (s *testServices) ProjectConfig(c context.Context, project luciConfig.ProjectName) (*svcconfig.ProjectConfig, error) {
+func (s *testServices) ProjectConfig(c context.Context, project cfgtypes.ProjectName) (*svcconfig.ProjectConfig, error) {
         if err := s.configErr; err != nil {
                 return nil, err
         }
 
         cfg, ok := s.configs[project]
         switch {
         case !ok:
                 return nil, luciConfig.ErrNoConfig
 
         case cfg == nil:
@@ skipping 12 matching lines @@
                 c = memory.Use(c)
 
                 // Fake authentication state.
                 as := authtest.FakeState{
                         IdentityGroups: []string{"all"},
                 }
                 c = auth.WithState(c, &as)
 
                 // Fake service with fake project configs.
                 svc := testServices{
-                        configs: map[luciConfig.ProjectName]*svcconfig.ProjectConfig{
+                        configs: map[cfgtypes.ProjectName]*svcconfig.ProjectConfig{
                                 "all-access": {
                                         ReaderAuthGroups: []string{"all"},
                                         WriterAuthGroups: []string{"all"},
                                 },
                                 "exclusive-access": {
                                         ReaderAuthGroups: []string{"auth"},
                                         WriterAuthGroups: []string{"auth"},
                                 },
                         },
                 }
@@ skipping 76 matching lines @@
                                         So(WithProjectNamespace(&c, "exclusive-access", tc.access), ShouldBeRPCUnauthenticated)
                                 })
 
                                 Convey(`Will fail to access non-existent project with Unauthenticated.`, func() {
                                         So(WithProjectNamespace(&c, "does-not-exist", tc.access), ShouldBeRPCUnauthenticated)
                                 })
 
                                 Convey(`When config service returns an unexpected error`, func() {
                                         svc.configErr = errors.New("misc")
 
-                                        for _, proj := range []luciConfig.ProjectName{"all-access", "exclusive-access", "does-not-exist"} {
+                                        for _, proj := range []cfgtypes.ProjectName{"all-access", "exclusive-access", "does-not-exist"} {
                                                 Convey(fmt.Sprintf(`Will fail to access %q with Internal.`, proj), func() {
                                                         So(WithProjectNamespace(&c, "all-access", tc.access), ShouldBeRPCInternal)
                                                 })
                                         }
                                 })
                         })
                 }
         })
 }