From df9ff4414e31eaa0b16e58fdd1b25782587c11a7 Mon Sep 17 00:00:00 2001 From: Cody Oss Date: Fri, 15 Oct 2021 15:57:24 -0600 Subject: [PATCH] fix breaking change --- storage/storage.go | 2 +- storage/writer.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/storage/storage.go b/storage/storage.go index 81ff43c6d60..36969c1eb76 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -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()), diff --git a/storage/writer.go b/storage/writer.go index c25a20e4b17..ec55e4a3ba4 100644 --- a/storage/writer.go +++ b/storage/writer.go @@ -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