Move "common/config" common types into cfgtypes.

logdog/server/service/service.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 service
 
 import (
         "errors"
         "flag"
         "fmt"
         "net/http"
         "os"
         "os/signal"
         "path/filepath"
         "runtime/pprof"
         "sync/atomic"
         "time"
 
         "github.com/luci/luci-go/client/authcli"
         "github.com/luci/luci-go/common/auth"
-        luciConfig "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/data/caching/proccache"
         "github.com/luci/luci-go/common/gcloud/gs"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/logging/gologger"
         "github.com/luci/luci-go/common/tsmon"
         "github.com/luci/luci-go/common/tsmon/target"
         "github.com/luci/luci-go/grpc/prpc"
         "github.com/luci/luci-go/logdog/api/config/svcconfig"
         "github.com/luci/luci-go/logdog/api/endpoints/coordinator/services/v1"
         "github.com/luci/luci-go/logdog/common/storage"
         "github.com/luci/luci-go/logdog/common/storage/bigtable"
         "github.com/luci/luci-go/logdog/server/retryServicesClient"
         "github.com/luci/luci-go/logdog/server/service/config"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
 
         "cloud.google.com/go/compute/metadata"
         "golang.org/x/net/context"
         "golang.org/x/oauth2"
         "google.golang.org/api/option"
 )
 
 var (
         // ErrInvalidConfig is an error that is returned when the supplied
         // configuration is invalid.
@@ skipping 295 matching lines @@
 }
 
 // Config returns the cached service configuration.
 func (s *Service) Config() *svcconfig.Config {
         return s.config.Config()
 }
 
 // ProjectConfig returns the cached project configuration.
 //
 // If the project configuration is not available, nil will be returned.
-func (s *Service) ProjectConfig(c context.Context, proj luciConfig.ProjectName) (*svcconfig.ProjectConfig, error) {
+func (s *Service) ProjectConfig(c context.Context, proj cfgtypes.ProjectName) (*svcconfig.ProjectConfig, error) {
         return s.config.ProjectConfig(c, proj)
 }
 
 // Coordinator returns the cached Coordinator client.
 func (s *Service) Coordinator() logdog.ServicesClient {
         return s.coord
 }
 
 // ServiceID returns the service ID.
 //
@@ skipping 108 matching lines @@
 //
 // An optional permutation function can be provided to modify those Options
 // before the Authenticator is created.
 func (s *Service) TokenSource(c context.Context, f func(o *auth.Options)) (oauth2.TokenSource, error) {
         a, err := s.Authenticator(c, f)
         if err != nil {
                 return nil, err
         }
         return a.TokenSource()
 }