12483: Add comments.

[arvados.git] / sdk / go / arvados / collection.go

diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go
index 157ce1678873af7f709c16752e590fb79b2ea822..999b4e9d483454ace177cad829e90f85ddccc44c 100644 (file)
--- a/sdk/go/arvados/collection.go
+++ b/sdk/go/arvados/collection.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package arvados
 
 import (
@@ -6,7 +10,7 @@ import (
        "strings"
        "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/manifest"
+       "git.curoverse.com/arvados.git/sdk/go/blockdigest"
 )
 
 // Collection is an arvados#collection resource.
@@ -15,6 +19,7 @@ type Collection struct {
        TrashAt                *time.Time `json:"trash_at,omitempty"`
        ManifestText           string     `json:"manifest_text,omitempty"`
        UnsignedManifestText   string     `json:"unsigned_manifest_text,omitempty"`
+       Name                   string     `json:"name,omitempty"`
        CreatedAt              *time.Time `json:"created_at,omitempty"`
        ModifiedAt             *time.Time `json:"modified_at,omitempty"`
        PortableDataHash       string     `json:"portable_data_hash,omitempty"`
@@ -25,6 +30,10 @@ type Collection struct {
        IsTrashed              bool       `json:"is_trashed,omitempty"`
 }
 
+func (c Collection) resourceName() string {
+       return "collection"
+}
+
 // SizedDigests returns the hash+size part of each data block
 // referenced by the collection.
 func (c *Collection) SizedDigests() ([]SizedDigest, error) {
@@ -46,7 +55,7 @@ func (c *Collection) SizedDigests() ([]SizedDigest, error) {
                        return nil, fmt.Errorf("Invalid stream (<3 tokens): %q", line)
                }
                for _, token := range tokens[1:] {
-                       if !manifest.LocatorPattern.MatchString(token) {
+                       if !blockdigest.LocatorPattern.MatchString(token) {
                                // FIXME: ensure it's a file token
                                break
                        }