From bb5e41462d813fdd5596c8db0844e23e1e244c1e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 12 Jun 2024 13:50:03 +0200 Subject: [PATCH] op: Address review issues --- op/upload.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/op/upload.go b/op/upload.go index 7c41c9f7..76302d49 100644 --- a/op/upload.go +++ b/op/upload.go @@ -75,7 +75,9 @@ func Upload(ctx context.Context, blobServiceClient *service.Client, container, b } if opts == nil { - opts = &UploadOptions{} + opts = &UploadOptions{ + Logger: noopLogger, + } } parallelism := 8 * runtime.NumCPU() @@ -83,10 +85,7 @@ func Upload(ctx context.Context, blobServiceClient *service.Client, container, b parallelism = opts.Parallelism } overwrite := opts.Overwrite - logger := noopLogger - if opts.Logger != nil { - logger = opts.Logger - } + logger := opts.Logger if err := ensureVHDSanity(vhd); err != nil { return err @@ -204,7 +203,7 @@ func ensureVHDSanity(vhd string) error { // metadata. The parameter client is the Azure pageblob client // representing a blob in a container, size is the size of the new // page blob in bytes and parameter vhdMetadata is the custom metadata -// to be associacted with the page blob. +// to be associated with the page blob. func createBlob(ctx context.Context, client *pageblob.Client, size int64, vhdMetadata *metadata.Metadata) error { m, err := vhdMetadata.ToMap() if err != nil { @@ -219,7 +218,7 @@ func createBlob(ctx context.Context, client *pageblob.Client, size int64, vhdMet // setBlobMD5Hash sets MD5 hash of the blob in its properties func setBlobMD5Hash(ctx context.Context, client *blob.Client, vhdMetadata *metadata.Metadata) error { - if vhdMetadata.FileMetadata.MD5Hash == nil { + if vhdMetadata.FileMetadata == nil || len(vhdMetadata.FileMetadata.MD5Hash) == 0 { return nil } buf := make([]byte, base64.StdEncoding.EncodedLen(len(vhdMetadata.FileMetadata.MD5Hash)))