Move "common/config" common types into cfgtypes.

logdog/server/cmd/logdog_archivist/main.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 main
 
 import (
         "time"
 
         "github.com/luci/luci-go/common/auth"
         "github.com/luci/luci-go/common/clock"
-        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/gcloud/gs"
         gcps "github.com/luci/luci-go/common/gcloud/pubsub"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/sync/parallel"
         "github.com/luci/luci-go/common/tsmon/distribution"
         "github.com/luci/luci-go/common/tsmon/field"
         "github.com/luci/luci-go/common/tsmon/metric"
         "github.com/luci/luci-go/common/tsmon/types"
         "github.com/luci/luci-go/logdog/api/config/svcconfig"
         "github.com/luci/luci-go/logdog/server/archivist"
         "github.com/luci/luci-go/logdog/server/service"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
 
         "cloud.google.com/go/pubsub"
         "golang.org/x/net/context"
         "google.golang.org/api/iterator"
         "google.golang.org/api/option"
 )
 
 var (
         errInvalidConfig = errors.New("invalid configuration")
 
@@ skipping 177 matching lines @@
         return nil
 }
 
 // GetSettingsLoader is an archivist.SettingsLoader implementation that merges
 // global and project-specific settings.
 //
 // The resulting settings object will be verified by the Archivist.
 func (a *application) GetSettingsLoader(acfg *svcconfig.Archivist) archivist.SettingsLoader {
         serviceID := a.ServiceID()
 
-        return func(c context.Context, proj config.ProjectName) (*archivist.Settings, error) {
+        return func(c context.Context, proj cfgtypes.ProjectName) (*archivist.Settings, error) {
                 // Fold in our project-specific configuration, if valid.
                 pcfg, err := a.ProjectConfig(c, proj)
                 if err != nil {
                         log.Fields{
                                 log.ErrorKey: err,
                                 "project":    proj,
                         }.Errorf(c, "Failed to fetch project configuration.")
                         return nil, err
                 }
 
@@ skipping 35 matching lines @@
 
 // Entry point.
 func main() {
         a := application{
                 Service: service.Service{
                         Name: "archivist",
                 },
         }
         a.Run(context.Background(), a.runArchivist)
 }