Move "common/config" common types into cfgtypes.

logdog/client/butler/output/logdog/output.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 logdog
 
 import (
         "fmt"
         "runtime"
         "time"
 
         "github.com/luci/luci-go/common/auth"
-        "github.com/luci/luci-go/common/config"
         "github.com/luci/luci-go/common/errors"
         ps "github.com/luci/luci-go/common/gcloud/pubsub"
         "github.com/luci/luci-go/common/lhttp"
         log "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/proto/google"
         "github.com/luci/luci-go/common/retry"
         "github.com/luci/luci-go/grpc/prpc"
         api "github.com/luci/luci-go/logdog/api/endpoints/coordinator/registration/v1"
         "github.com/luci/luci-go/logdog/client/butler/output"
         out "github.com/luci/luci-go/logdog/client/butler/output/pubsub"
         "github.com/luci/luci-go/logdog/common/types"
+        "github.com/luci/luci-go/luci_config/common/cfgtypes"
 
         "cloud.google.com/go/pubsub"
         "golang.org/x/net/context"
         "google.golang.org/api/option"
 )
 
 // Scopes returns the set of OAuth scopes required for this Output.
 func Scopes() []string {
         // E-mail scope needed for Coordinator authentication.
         scopes := []string{auth.OAuthScopeEmail}
         // Publisher scope needed to publish to Pub/Sub transport.
         scopes = append(scopes, ps.PublisherScopes...)
 
         return scopes
 }
 
 // Config is the set of configuration parameters for this Output instance.
 type Config struct {
         // Auth is the Authenticator to use for registration and publishing. It should
         // be configured to hold the scopes returned by Scopes.
         Auth *auth.Authenticator
 
         // Host is the name of the LogDog Host to connect to.
         Host string
 
         // Project is the project that this stream belongs to.
-        Project config.ProjectName
+        Project cfgtypes.ProjectName
         // Prefix is the stream prefix to register.
         Prefix types.StreamName
         // PrefixExpiration is the prefix expiration to use when registering.
         // If zero, no expiration will be expressed to the Coordinator, and it will
         // choose based on its configuration.
         PrefixExpiration time.Duration
 
         // SourceInfo, if not empty, is auxiliary source information to register
         // alongside the stream.
         SourceInfo []string
@@ skipping 155 matching lines @@
                 exists, err = t.Exists(ctx)
                 return
         }, func(err error, d time.Duration) {
                 log.Fields{
                         log.ErrorKey: err,
                         "delay":      d,
                 }.Errorf(ctx, "Failed to check if topic exists; retrying...")
         })
         return exists, err
 }