client: centralize exported variables

client/client.go

@@ -0,0 +1,37 @@
+// Copyright 2015 CoreOS, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package client
+
+import (
+	"errors"
+	"time"
+
+	"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
+)
+
+var (
+	ErrTimeout          = context.DeadlineExceeded
+	ErrCanceled         = context.Canceled
+	ErrUnavailable      = errors.New("client: no available etcd endpoints")
+	ErrNoLeader         = errors.New("client: no leader")
+	ErrNoEndpoints      = errors.New("no endpoints available")
+	ErrTooManyRedirects = errors.New("too many redirects")
+
+	ErrKeyNoExist = errors.New("client: key does not exist")
+	ErrKeyExists  = errors.New("client: key already exists")
+
+	DefaultRequestTimeout = 5 * time.Second
+	DefaultMaxRedirects   = 10
+)

client/http.go

@@ -21,21 +21,10 @@ import (
 	"net/http"
 	"net/url"
 	"sync"
-	"time"
 
 	"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
 )
 
-var (
-	ErrTimeout          = context.DeadlineExceeded
-	ErrCanceled         = context.Canceled
-	ErrNoEndpoints      = errors.New("no endpoints available")
-	ErrTooManyRedirects = errors.New("too many redirects")
-
-	DefaultRequestTimeout = 5 * time.Second
-	DefaultMaxRedirects   = 10
-)
-
 func newHTTPClientFactory(tr CancelableTransport) httpClientFactory {
 	return func(ep url.URL) httpClient {
 		return &redirectFollowingHTTPClient{

client/keys.go

@@ -16,7 +16,6 @@ package client
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -40,13 +39,6 @@ var (
 	defaultV2KeysPrefix = "/v2/keys"
 )
 
-var (
-	ErrUnavailable = errors.New("client: no available etcd endpoints")
-	ErrNoLeader    = errors.New("client: no leader")
-	ErrKeyNoExist  = errors.New("client: key does not exist")
-	ErrKeyExists   = errors.New("client: key already exists")
-)
-
 func NewKeysAPI(c Client) KeysAPI {
 	return &httpKeysAPI{
 		client: c,