Skip to content

Commit

Permalink
fix breaking change
Browse files Browse the repository at this point in the history
  • Loading branch information
codyoss committed Oct 15, 2021
1 parent 1c026aa commit df9ff44
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion storage/storage.go
Expand Up @@ -1444,7 +1444,7 @@ func newObjectFromProto(o *storagepb.Object) *ObjectAttrs {
Generation: o.Generation,
Metageneration: o.Metageneration,
StorageClass: o.StorageClass,
CustomerKeySHA256: o.GetCustomerEncryption().GetKeySha256(),
CustomerKeySHA256: string(o.GetCustomerEncryption().GetKeySha256Bytes()),
KMSKeyName: o.GetKmsKey(),
Created: convertProtoTime(o.GetCreateTime()),
Deleted: convertProtoTime(o.GetDeleteTime()),
Expand Down
2 changes: 1 addition & 1 deletion storage/writer.go
Expand Up @@ -436,7 +436,7 @@ func (w *Writer) queryProgress() (int64, error) {
q, err := w.o.c.gc.QueryWriteStatus(w.ctx, &storagepb.QueryWriteStatusRequest{UploadId: w.upid})

// q.GetCommittedSize() will return 0 if q is nil.
return q.GetCommittedSize(), err
return q.GetPersistedSize(), err
}

// uploadBuffer opens a Write stream and uploads the buffer at the given offset (if
Expand Down

0 comments on commit df9ff44

Please sign in to comment.