Merge branch 'master' into 9998-unsigned_manifest

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

diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go
index 295943b38d5f32d7f0a433103bb06e0863a0ab34..157ce1678873af7f709c16752e590fb79b2ea822 100644 (file)
--- a/sdk/go/arvados/collection.go
+++ b/sdk/go/arvados/collection.go
@@ -12,7 +12,7 @@ import (
 // Collection is an arvados#collection resource.
 type Collection struct {
        UUID                   string     `json:"uuid,omitempty"`
-       ExpiresAt              *time.Time `json:"expires_at,omitempty"`
+       TrashAt                *time.Time `json:"trash_at,omitempty"`
        ManifestText           string     `json:"manifest_text,omitempty"`
        UnsignedManifestText   string     `json:"unsigned_manifest_text,omitempty"`
        CreatedAt              *time.Time `json:"created_at,omitempty"`
@@ -21,6 +21,8 @@ type Collection struct {
        ReplicationConfirmed   *int       `json:"replication_confirmed,omitempty"`
        ReplicationConfirmedAt *time.Time `json:"replication_confirmed_at,omitempty"`
        ReplicationDesired     *int       `json:"replication_desired,omitempty"`
+       DeleteAt               *time.Time `json:"delete_at,omitempty"`
+       IsTrashed              bool       `json:"is_trashed,omitempty"`
 }
 
 // SizedDigests returns the hash+size part of each data block