X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a714babda599431fd509dff6dee87ab30a1793eb..ca544ed56275747db6423e9da0c34545296db3f5:/sdk/go/arvados/collection.go

diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go
index 295943b38d..5b61300607 100644
--- 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,21 +10,32 @@ 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.
 type Collection struct {
-	UUID                   string     `json:"uuid,omitempty"`
-	ExpiresAt              *time.Time `json:"expires_at,omitempty"`
-	ManifestText           string     `json:"manifest_text,omitempty"`
-	UnsignedManifestText   string     `json:"unsigned_manifest_text,omitempty"`
-	CreatedAt              *time.Time `json:"created_at,omitempty"`
-	ModifiedAt             *time.Time `json:"modified_at,omitempty"`
-	PortableDataHash       string     `json:"portable_data_hash,omitempty"`
-	ReplicationConfirmed   *int       `json:"replication_confirmed,omitempty"`
-	ReplicationConfirmedAt *time.Time `json:"replication_confirmed_at,omitempty"`
-	ReplicationDesired     *int       `json:"replication_desired,omitempty"`
+	UUID                      string     `json:"uuid,omitempty"`
+	OwnerUUID                 string     `json:"owner_uuid,omitempty"`
+	TrashAt                   *time.Time `json:"trash_at,omitempty"`
+	ManifestText              string     `json:"manifest_text"`
+	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"`
+	ReplicationConfirmed      *int       `json:"replication_confirmed,omitempty"`
+	ReplicationConfirmedAt    *time.Time `json:"replication_confirmed_at,omitempty"`
+	ReplicationDesired        *int       `json:"replication_desired,omitempty"`
+	StorageClassesDesired     []string   `json:"storage_classes_desired,omitempty"`
+	StorageClassesConfirmed   []string   `json:"storage_classes_confirmed,omitempty"`
+	StorageClassesConfirmedAt *time.Time `json:"storage_classes_confirmed_at,omitempty"`
+	DeleteAt                  *time.Time `json:"delete_at,omitempty"`
+	IsTrashed                 bool       `json:"is_trashed,omitempty"`
+}
+
+func (c Collection) resourceName() string {
+	return "collection"
 }
 
 // SizedDigests returns the hash+size part of each data block
@@ -44,7 +59,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
 			}