mirror of
https://github.com/restic/restic.git
synced 2026-09-16 09:17:57 +00:00
Update dependencies
Among others, this updates minio-go, so that the new "eu-west-3" zone for AWS is supported.
This commit is contained in:
+56
@@ -0,0 +1,56 @@
|
||||
// Copyright 2017 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// 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 protostruct supports operations on the protocol buffer Struct message.
|
||||
package protostruct
|
||||
|
||||
import (
|
||||
pb "github.com/golang/protobuf/ptypes/struct"
|
||||
)
|
||||
|
||||
// DecodeToMap converts a pb.Struct to a map from strings to Go types.
|
||||
// DecodeToMap panics if s is invalid.
|
||||
func DecodeToMap(s *pb.Struct) map[string]interface{} {
|
||||
if s == nil {
|
||||
return nil
|
||||
}
|
||||
m := map[string]interface{}{}
|
||||
for k, v := range s.Fields {
|
||||
m[k] = decodeValue(v)
|
||||
}
|
||||
return m
|
||||
}
|
||||
|
||||
func decodeValue(v *pb.Value) interface{} {
|
||||
switch k := v.Kind.(type) {
|
||||
case *pb.Value_NullValue:
|
||||
return nil
|
||||
case *pb.Value_NumberValue:
|
||||
return k.NumberValue
|
||||
case *pb.Value_StringValue:
|
||||
return k.StringValue
|
||||
case *pb.Value_BoolValue:
|
||||
return k.BoolValue
|
||||
case *pb.Value_StructValue:
|
||||
return DecodeToMap(k.StructValue)
|
||||
case *pb.Value_ListValue:
|
||||
s := make([]interface{}, len(k.ListValue.Values))
|
||||
for i, e := range k.ListValue.Values {
|
||||
s[i] = decodeValue(e)
|
||||
}
|
||||
return s
|
||||
default:
|
||||
panic("protostruct: unknown kind")
|
||||
}
|
||||
}
|
||||
+58
@@ -0,0 +1,58 @@
|
||||
// Copyright 2017 Google Inc. All Rights Reserved.
|
||||
//
|
||||
// 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 protostruct supports operations on the protocol buffer Struct message.
|
||||
package protostruct
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"cloud.google.com/go/internal/testutil"
|
||||
pb "github.com/golang/protobuf/ptypes/struct"
|
||||
)
|
||||
|
||||
func TestDecodeToMap(t *testing.T) {
|
||||
if got := DecodeToMap(nil); !testutil.Equal(got, map[string]interface{}(nil)) {
|
||||
t.Errorf("DecodeToMap(nil) = %v, want nil", got)
|
||||
}
|
||||
nullv := &pb.Value{&pb.Value_NullValue{}}
|
||||
stringv := &pb.Value{&pb.Value_StringValue{"x"}}
|
||||
boolv := &pb.Value{&pb.Value_BoolValue{true}}
|
||||
numberv := &pb.Value{&pb.Value_NumberValue{2.7}}
|
||||
in := &pb.Struct{Fields: map[string]*pb.Value{
|
||||
"n": nullv,
|
||||
"s": stringv,
|
||||
"b": boolv,
|
||||
"f": numberv,
|
||||
"l": &pb.Value{&pb.Value_ListValue{&pb.ListValue{
|
||||
[]*pb.Value{nullv, stringv, boolv, numberv},
|
||||
}}},
|
||||
"S": &pb.Value{&pb.Value_StructValue{&pb.Struct{Fields: map[string]*pb.Value{
|
||||
"n1": nullv,
|
||||
"b1": boolv,
|
||||
}}}},
|
||||
}}
|
||||
want := map[string]interface{}{
|
||||
"n": nil,
|
||||
"s": "x",
|
||||
"b": true,
|
||||
"f": 2.7,
|
||||
"l": []interface{}{nil, "x", true, 2.7},
|
||||
"S": map[string]interface{}{"n1": nil, "b1": true},
|
||||
}
|
||||
got := DecodeToMap(in)
|
||||
if diff := testutil.Diff(got, want); diff != "" {
|
||||
t.Error(diff)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user