Move "common/config" common types into cfgtypes.

logdog/server/service/config/config.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 config
 
 import (
         "errors"
         "fmt"
         "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/data/caching/proccache"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/logdog/api/config/svcconfig"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
+
+        "github.com/golang/protobuf/proto"
         "golang.org/x/net/context"
 )
 
 // Options is the set of options used to set up a Manager.
 //
 // The configuration is loaded from a svcconfig.Config protobuf.
 type Options struct {
         // Config is the configuration service to load from.
         Config config.Interface
 
@@ skipping 114 matching lines @@
 
         return &m, nil
 }
 
 // Config returns the service configuration instance.
 func (m *Manager) Config() *svcconfig.Config {
         return &m.cfg
 }
 
 // ProjectConfig returns the project configuration.
-func (m *Manager) ProjectConfig(c context.Context, project config.ProjectName) (*svcconfig.ProjectConfig, error) {
+func (m *Manager) ProjectConfig(c context.Context, project cfgtypes.ProjectName) (*svcconfig.ProjectConfig, error) {
         serviceID := m.o.ServiceID
         if serviceID == "" {
                 return nil, errors.New("no service ID specified")
         }
 
         v, err := proccache.GetOrMake(c, project, func() (interface{}, time.Duration, error) {
                 configSet := fmt.Sprintf("projects/%s", project)
                 configPath := fmt.Sprintf("%s.cfg", serviceID)
                 cfg, err := m.o.Config.GetConfig(c, configSet, configPath, false)
                 if err != nil {
@@ skipping 53 matching lines @@
         if err := proto.UnmarshalText(cfg.Content, &m.cfg); err != nil {
                 log.Fields{
                         log.ErrorKey: err,
                         "hash":       cfg.ContentHash,
                 }.Errorf(c, "Failed to unmarshal configuration.")
                 return err
         }
         m.cfgHash = cfg.ContentHash
         return nil
 }