From abb6ec839a49e6d864ec6807360026c41d927374 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Mon, 26 Sep 2022 12:44:48 -0600 Subject: [PATCH] chore(firestore): enable Go 1.13 error wrapping (#6727) --- firestore/client.go | 2 +- firestore/collgroupref.go | 2 +- firestore/from_value.go | 2 +- firestore/to_value.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firestore/client.go b/firestore/client.go index 3da59ede72d..28b4035ae58 100644 --- a/firestore/client.go +++ b/firestore/client.go @@ -104,7 +104,7 @@ func NewClient(ctx context.Context, projectID string, opts ...option.ClientOptio func detectProjectID(ctx context.Context, opts ...option.ClientOption) (string, error) { creds, err := transport.Creds(ctx, opts...) if err != nil { - return "", fmt.Errorf("fetching creds: %v", err) + return "", fmt.Errorf("fetching creds: %w", err) } if creds.ProjectID == "" { return "", errors.New("firestore: see the docs on DetectProjectID") diff --git a/firestore/collgroupref.go b/firestore/collgroupref.go index 8d278bab053..abb36ec19b4 100644 --- a/firestore/collgroupref.go +++ b/firestore/collgroupref.go @@ -109,7 +109,7 @@ func (cgr CollectionGroupRef) getPartitions(ctx context.Context, partitionCount break } if err != nil { - return nil, fmt.Errorf("GetPartitions: %v", err) + return nil, fmt.Errorf("GetPartitions: %w", err) } cursorReferences = append(cursorReferences, cursor.GetValues()...) } diff --git a/firestore/from_value.go b/firestore/from_value.go index d8d223f6531..16b1125e166 100644 --- a/firestore/from_value.go +++ b/firestore/from_value.go @@ -340,7 +340,7 @@ func populateStruct(vs reflect.Value, pm map[string]*pb.Value, c *Client) error vproto := v.vproto if err := setReflectFromProtoValue(vs.FieldByIndex(f.Index), vproto, c); err != nil { - return fmt.Errorf("%s.%s: %v", vs.Type(), f.Name, err) + return fmt.Errorf("%s.%s: %w", vs.Type(), f.Name, err) } } return nil diff --git a/firestore/to_value.go b/firestore/to_value.go index 458c2af6bb9..7ca8e7d186e 100644 --- a/firestore/to_value.go +++ b/firestore/to_value.go @@ -258,7 +258,7 @@ type tagOptions struct { func parseTag(t reflect.StructTag) (name string, keep bool, other interface{}, err error) { name, keep, opts, err := fields.ParseStandardTag("firestore", t) if err != nil { - return "", false, nil, fmt.Errorf("firestore: %v", err) + return "", false, nil, fmt.Errorf("firestore: %w", err) } tagOpts := tagOptions{} for _, opt := range opts {