X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6599088b45103087b4be743fd51a8330e694e57f..da0aee751d8cb039c9b6b85a03e7d62cb973e3b3:/sdk/go/arvados/collection.go diff --git a/sdk/go/arvados/collection.go b/sdk/go/arvados/collection.go index 9274238d28..157ce16788 100644 --- a/sdk/go/arvados/collection.go +++ b/sdk/go/arvados/collection.go @@ -14,6 +14,7 @@ type Collection struct { UUID string `json:"uuid,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"` ModifiedAt *time.Time `json:"modified_at,omitempty"` PortableDataHash string `json:"portable_data_hash,omitempty"` @@ -27,13 +28,17 @@ type Collection struct { // SizedDigests returns the hash+size part of each data block // referenced by the collection. func (c *Collection) SizedDigests() ([]SizedDigest, error) { - if c.ManifestText == "" && c.PortableDataHash != "d41d8cd98f00b204e9800998ecf8427e+0" { + manifestText := c.ManifestText + if manifestText == "" { + manifestText = c.UnsignedManifestText + } + if manifestText == "" && c.PortableDataHash != "d41d8cd98f00b204e9800998ecf8427e+0" { // TODO: Check more subtle forms of corruption, too return nil, fmt.Errorf("manifest is missing") } var sds []SizedDigest - scanner := bufio.NewScanner(strings.NewReader(c.ManifestText)) - scanner.Buffer(make([]byte, 1048576), len(c.ManifestText)) + scanner := bufio.NewScanner(strings.NewReader(manifestText)) + scanner.Buffer(make([]byte, 1048576), len(manifestText)) for scanner.Scan() { line := scanner.Text() tokens := strings.Split(line, " ")