aboutsummaryrefslogtreecommitdiff
path: root/vendor/cloud.google.com/go/internal
diff options
context:
space:
mode:
authorNiall Sheridan <nsheridan@gmail.com>2018-06-20 22:39:07 +0100
committerNiall Sheridan <nsheridan@gmail.com>2018-06-20 22:39:07 +0100
commitde6d2c524430287c699aaa898c1325da6afea539 (patch)
treef78eb841208d667668a7bc92a9290d693cc7103b /vendor/cloud.google.com/go/internal
parenteb99016e1629e690e55633de6fc63a14c53e7ea2 (diff)
Update dependencies
Diffstat (limited to 'vendor/cloud.google.com/go/internal')
-rw-r--r--vendor/cloud.google.com/go/internal/annotate.go54
-rw-r--r--vendor/cloud.google.com/go/internal/optional/optional.go2
-rw-r--r--vendor/cloud.google.com/go/internal/retry.go5
-rw-r--r--vendor/cloud.google.com/go/internal/trace/go18.go83
-rw-r--r--vendor/cloud.google.com/go/internal/trace/not_go18.go30
-rw-r--r--vendor/cloud.google.com/go/internal/version/version.go4
6 files changed, 172 insertions, 6 deletions
diff --git a/vendor/cloud.google.com/go/internal/annotate.go b/vendor/cloud.google.com/go/internal/annotate.go
new file mode 100644
index 0000000..6435695
--- /dev/null
+++ b/vendor/cloud.google.com/go/internal/annotate.go
@@ -0,0 +1,54 @@
+// Copyright 2017 Google LLC
+//
+// 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 internal
+
+import (
+ "fmt"
+
+ "google.golang.org/api/googleapi"
+ "google.golang.org/grpc/status"
+)
+
+// Annotate prepends msg to the error message in err, attempting
+// to preserve other information in err, like an error code.
+//
+// Annotate panics if err is nil.
+//
+// Annotate knows about these error types:
+// - "google.golang.org/grpc/status".Status
+// - "google.golang.org/api/googleapi".Error
+// If the error is not one of these types, Annotate behaves
+// like
+// fmt.Errorf("%s: %v", msg, err)
+func Annotate(err error, msg string) error {
+ if err == nil {
+ panic("Annotate called with nil")
+ }
+ if s, ok := status.FromError(err); ok {
+ p := s.Proto()
+ p.Message = msg + ": " + p.Message
+ return status.ErrorProto(p)
+ }
+ if g, ok := err.(*googleapi.Error); ok {
+ g.Message = msg + ": " + g.Message
+ return g
+ }
+ return fmt.Errorf("%s: %v", msg, err)
+}
+
+// Annotatef uses format and args to format a string, then calls Annotate.
+func Annotatef(err error, format string, args ...interface{}) error {
+ return Annotate(err, fmt.Sprintf(format, args...))
+}
diff --git a/vendor/cloud.google.com/go/internal/optional/optional.go b/vendor/cloud.google.com/go/internal/optional/optional.go
index 4c15410..72780f7 100644
--- a/vendor/cloud.google.com/go/internal/optional/optional.go
+++ b/vendor/cloud.google.com/go/internal/optional/optional.go
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
diff --git a/vendor/cloud.google.com/go/internal/retry.go b/vendor/cloud.google.com/go/internal/retry.go
index f554fbf..e5ee25a 100644
--- a/vendor/cloud.google.com/go/internal/retry.go
+++ b/vendor/cloud.google.com/go/internal/retry.go
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
package internal
import (
- "fmt"
"time"
gax "github.com/googleapis/gax-go"
@@ -48,7 +47,7 @@ func retry(ctx context.Context, bo gax.Backoff, f func() (stop bool, err error),
p := bo.Pause()
if cerr := sleep(ctx, p); cerr != nil {
if lastErr != nil {
- return fmt.Errorf("%v; last function err: %v", cerr, lastErr)
+ return Annotatef(lastErr, "retry failed with %v; last error", cerr)
}
return cerr
}
diff --git a/vendor/cloud.google.com/go/internal/trace/go18.go b/vendor/cloud.google.com/go/internal/trace/go18.go
new file mode 100644
index 0000000..b3160f6
--- /dev/null
+++ b/vendor/cloud.google.com/go/internal/trace/go18.go
@@ -0,0 +1,83 @@
+// Copyright 2018 Google LLC
+//
+// 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.
+
+// +build go1.8
+
+package trace
+
+import (
+ "go.opencensus.io/trace"
+ "golang.org/x/net/context"
+ "google.golang.org/api/googleapi"
+ "google.golang.org/genproto/googleapis/rpc/code"
+ "google.golang.org/grpc/status"
+)
+
+func StartSpan(ctx context.Context, name string) context.Context {
+ ctx, _ = trace.StartSpan(ctx, name)
+ return ctx
+}
+
+func EndSpan(ctx context.Context, err error) {
+ span := trace.FromContext(ctx)
+ if err != nil {
+ span.SetStatus(toStatus(err))
+ }
+ span.End()
+}
+
+// ToStatus interrogates an error and converts it to an appropriate
+// OpenCensus status.
+func toStatus(err error) trace.Status {
+ if err2, ok := err.(*googleapi.Error); ok {
+ return trace.Status{Code: httpStatusCodeToOCCode(err2.Code), Message: err2.Message}
+ } else if s, ok := status.FromError(err); ok {
+ return trace.Status{Code: int32(s.Code()), Message: s.Message()}
+ } else {
+ return trace.Status{Code: int32(code.Code_UNKNOWN), Message: err.Error()}
+ }
+}
+
+// TODO (deklerk): switch to using OpenCensus function when it becomes available.
+// Reference: https://github.com/googleapis/googleapis/blob/26b634d2724ac5dd30ae0b0cbfb01f07f2e4050e/google/rpc/code.proto
+func httpStatusCodeToOCCode(httpStatusCode int) int32 {
+ switch httpStatusCode {
+ case 200:
+ return int32(code.Code_OK)
+ case 499:
+ return int32(code.Code_CANCELLED)
+ case 500:
+ return int32(code.Code_UNKNOWN) // Could also be Code_INTERNAL, Code_DATA_LOSS
+ case 400:
+ return int32(code.Code_INVALID_ARGUMENT) // Could also be Code_OUT_OF_RANGE
+ case 504:
+ return int32(code.Code_DEADLINE_EXCEEDED)
+ case 404:
+ return int32(code.Code_NOT_FOUND)
+ case 409:
+ return int32(code.Code_ALREADY_EXISTS) // Could also be Code_ABORTED
+ case 403:
+ return int32(code.Code_PERMISSION_DENIED)
+ case 401:
+ return int32(code.Code_UNAUTHENTICATED)
+ case 429:
+ return int32(code.Code_RESOURCE_EXHAUSTED)
+ case 501:
+ return int32(code.Code_UNIMPLEMENTED)
+ case 503:
+ return int32(code.Code_UNAVAILABLE)
+ default:
+ return int32(code.Code_UNKNOWN)
+ }
+}
diff --git a/vendor/cloud.google.com/go/internal/trace/not_go18.go b/vendor/cloud.google.com/go/internal/trace/not_go18.go
new file mode 100644
index 0000000..c893ed5
--- /dev/null
+++ b/vendor/cloud.google.com/go/internal/trace/not_go18.go
@@ -0,0 +1,30 @@
+// Copyright 2018 Google LLC
+//
+// 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.
+
+// +build !go1.8
+
+package trace
+
+import (
+ "golang.org/x/net/context"
+)
+
+// OpenCensus only supports go 1.8 and higher.
+
+func StartSpan(ctx context.Context, _ string) context.Context {
+ return ctx
+}
+
+func EndSpan(context.Context, error) {
+}
diff --git a/vendor/cloud.google.com/go/internal/version/version.go b/vendor/cloud.google.com/go/internal/version/version.go
index 513afa4..220f02c 100644
--- a/vendor/cloud.google.com/go/internal/version/version.go
+++ b/vendor/cloud.google.com/go/internal/version/version.go
@@ -1,4 +1,4 @@
-// Copyright 2016 Google Inc. All Rights Reserved.
+// Copyright 2016 Google LLC
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import (
// Repo is the current version of the client libraries in this
// repo. It should be a date in YYYYMMDD format.
-const Repo = "20170928"
+const Repo = "20180226"
// Go returns the Go runtime version. The returned string
// has no whitespace.