mirror of
https://github.com/rclone/rclone.git
synced 2026-01-01 16:13:35 +00:00
vendor: update all dependencies to latest versions
This commit is contained in:
13
vendor/google.golang.org/api/google-api-go-generator/internal/disco/disco.go
generated
vendored
13
vendor/google.golang.org/api/google-api-go-generator/internal/disco/disco.go
generated
vendored
@@ -62,6 +62,19 @@ func (d *Document) init() error {
|
||||
// NewDocument unmarshals the bytes into a Document.
|
||||
// It also validates the document to make sure it is error-free.
|
||||
func NewDocument(bytes []byte) (*Document, error) {
|
||||
// The discovery service returns JSON with this format if there's an error, e.g.
|
||||
// the document isn't found.
|
||||
var errDoc struct {
|
||||
Error struct {
|
||||
Code int
|
||||
Message string
|
||||
Status string
|
||||
}
|
||||
}
|
||||
if err := json.Unmarshal(bytes, &errDoc); err == nil && errDoc.Error.Code != 0 {
|
||||
return nil, fmt.Errorf("bad discovery doc: %+v", errDoc.Error)
|
||||
}
|
||||
|
||||
var doc Document
|
||||
if err := json.Unmarshal(bytes, &doc); err != nil {
|
||||
return nil, err
|
||||
|
||||
13
vendor/google.golang.org/api/google-api-go-generator/internal/disco/disco_test.go
generated
vendored
13
vendor/google.golang.org/api/google-api-go-generator/internal/disco/disco_test.go
generated
vendored
@@ -7,6 +7,7 @@ package disco
|
||||
import (
|
||||
"io/ioutil"
|
||||
"reflect"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
@@ -262,3 +263,15 @@ func TestSchemaErrors(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestErrorDoc(t *testing.T) {
|
||||
bytes, err := ioutil.ReadFile("testdata/error.json")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := NewDocument(bytes); err == nil {
|
||||
t.Error("got nil, want error")
|
||||
} else if !strings.Contains(err.Error(), "404") {
|
||||
t.Errorf("got %v, want 404", err)
|
||||
}
|
||||
}
|
||||
|
||||
7
vendor/google.golang.org/api/google-api-go-generator/internal/disco/testdata/error.json
generated
vendored
Normal file
7
vendor/google.golang.org/api/google-api-go-generator/internal/disco/testdata/error.json
generated
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"error": {
|
||||
"code": 404,
|
||||
"message": "Discovery document not found for API service: container.googleapis.com format: rest version: v1alpha1",
|
||||
"status": "NOT_FOUND"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user