15924: Change import paths to git.arvados.org.

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

diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go
index 295943b38d5f32d7f0a433103bb06e0863a0ab34..4c9305f3f7a7e0fb7b4ac2e38898a7eb0441ac07 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,21 +10,36 @@ import (
        "strings"
        "time"
 
-       "git.curoverse.com/arvados.git/sdk/go/manifest"
+       "git.arvados.org/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"`
+       Etag                      string                 `json:"etag"`
+       OwnerUUID                 string                 `json:"owner_uuid"`
+       TrashAt                   *time.Time             `json:"trash_at"`
+       ManifestText              string                 `json:"manifest_text"`
+       UnsignedManifestText      string                 `json:"unsigned_manifest_text"`
+       Name                      string                 `json:"name"`
+       CreatedAt                 time.Time              `json:"created_at"`
+       ModifiedAt                time.Time              `json:"modified_at"`
+       ModifiedByClientUUID      string                 `json:"modified_by_client_uuid"`
+       ModifiedByUserUUID        string                 `json:"modified_by_user_uuid"`
+       PortableDataHash          string                 `json:"portable_data_hash"`
+       ReplicationConfirmed      *int                   `json:"replication_confirmed"`
+       ReplicationConfirmedAt    *time.Time             `json:"replication_confirmed_at"`
+       ReplicationDesired        *int                   `json:"replication_desired"`
+       StorageClassesDesired     []string               `json:"storage_classes_desired"`
+       StorageClassesConfirmed   []string               `json:"storage_classes_confirmed"`
+       StorageClassesConfirmedAt time.Time              `json:"storage_classes_confirmed_at"`
+       DeleteAt                  *time.Time             `json:"delete_at"`
+       IsTrashed                 bool                   `json:"is_trashed"`
+       Properties                map[string]interface{} `json:"properties"`
+}
+
+func (c Collection) resourceName() string {
+       return "collection"
 }
 
 // SizedDigests returns the hash+size part of each data block
@@ -44,7 +63,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
                        }
@@ -58,7 +77,6 @@ func (c *Collection) SizedDigests() ([]SizedDigest, error) {
        return sds, scanner.Err()
 }
 
-// CollectionList is an arvados#collectionList resource.
 type CollectionList struct {
        Items          []Collection `json:"items"`
        ItemsAvailable int          `json:"items_available"`