Skip to content

Commit

Permalink
Workaround for Azure#17515
Browse files Browse the repository at this point in the history
  • Loading branch information
seveas committed Apr 11, 2022
1 parent 2d6c688 commit ae197d9
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
4 changes: 2 additions & 2 deletions sdk/storage/azblob/zc_blob_client.go
Expand Up @@ -208,8 +208,8 @@ func (b *BlobClient) AbortCopyFromURL(ctx context.Context, copyID string, option
// To remove all tags from the blob, call this operation with no tags set.
// https://docs.microsoft.com/en-us/rest/api/storageservices/set-blob-tags
func (b *BlobClient) SetTags(ctx context.Context, options *SetTagsBlobOptions) (BlobSetTagsResponse, error) {
blobSetTagsOptions, modifiedAccessConditions := options.pointers()
resp, err := b.client.SetTags(ctx, blobSetTagsOptions, modifiedAccessConditions)
blobSetTagsOptions, leaseAccessConditions, modifiedAccessConditions := options.pointers()
resp, err := b.client.SetTags(ctx, blobSetTagsOptions, leaseAccessConditions, modifiedAccessConditions)

return resp, handleError(err)
}
Expand Down
7 changes: 4 additions & 3 deletions sdk/storage/azblob/zm_blob_request_options.go
Expand Up @@ -258,11 +258,12 @@ type SetTagsBlobOptions struct {
TagsMap map[string]string

ModifiedAccessConditions *ModifiedAccessConditions
LeaseAccessConditions *LeaseAccessConditions
}

func (o *SetTagsBlobOptions) pointers() (*BlobSetTagsOptions, *ModifiedAccessConditions) {
func (o *SetTagsBlobOptions) pointers() (*BlobSetTagsOptions, *LeaseAccessConditions, *ModifiedAccessConditions) {
if o == nil {
return nil, nil
return nil, nil, nil
}

options := &BlobSetTagsOptions{
Expand All @@ -274,7 +275,7 @@ func (o *SetTagsBlobOptions) pointers() (*BlobSetTagsOptions, *ModifiedAccessCon
VersionID: o.VersionID,
}

return options, o.ModifiedAccessConditions
return options, o.LeaseAccessConditions, o.ModifiedAccessConditions
}

// GetTagsBlobOptions provides set of configurations for GetTags operation
Expand Down
9 changes: 6 additions & 3 deletions sdk/storage/azblob/zz_generated_blob_client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit ae197d9

Please sign in to comment.