Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing Metadata and other properties setting in UploadStreamToBlockBlob #17209

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion sdk/storage/azblob/go.mod
Expand Up @@ -4,7 +4,7 @@ go 1.16

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/dnaeon/go-vcr v1.2.0 // indirect
github.com/stretchr/testify v1.7.0
Expand Down
3 changes: 3 additions & 0 deletions sdk/storage/azblob/go.sum
@@ -1,5 +1,8 @@
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0 h1:8wVJL0HUP5yDFXvotdewORTw7Yu88JbreWN/mobSvsQ=
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.0/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 h1:qoVeMsc9/fh/yhxVaA0obYjVH/oI/ihrOoMwsLS9KSA=
github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1/go.mod h1:fBF9PQNqB8scdgpZ3ufzaLntG0AG7C1WjPMsiFOmfHM=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3 h1:E+m3SkZCN0Bf5q7YdTs5lSm2CYY3CK4spn5OmUIiQtk=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.8.3/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1 h1:sLZ/Y+P/5RRtsXWylBjB5lkgixYfm0MQPiwrSX//JSo=
github.com/Azure/azure-sdk-for-go/sdk/internal v0.9.1/go.mod h1:KLF4gFr6DcKFZwSuH8w8yEK6DpFl3LP5rhdvAb7Yz5I=
Expand Down
19 changes: 17 additions & 2 deletions sdk/storage/azblob/highlevel.go
Expand Up @@ -587,11 +587,26 @@ func (u *UploadStreamToBlockBlobOptions) defaults() error {
return nil
}
func (u *UploadStreamToBlockBlobOptions) getStageBlockOptions() *StageBlockOptions {
return &StageBlockOptions{}
leaseAccessConditions, _ := u.BlobAccessConditions.pointers()
return &StageBlockOptions{
CpkInfo: u.CpkInfo,
CpkScopeInfo: u.CpkScopeInfo,
LeaseAccessConditions: leaseAccessConditions,
}
}

func (u *UploadStreamToBlockBlobOptions) getCommitBlockListOptions() *CommitBlockListOptions {
return &CommitBlockListOptions{}
options := &CommitBlockListOptions{
BlobTagsMap: u.BlobTagsMap,
Metadata: u.Metadata,
Tier: u.AccessTier,
BlobHTTPHeaders: u.HTTPHeaders,
CpkInfo: u.CpkInfo,
CpkScopeInfo: u.CpkScopeInfo,
BlobAccessConditions: u.BlobAccessConditions,
}

return options
}

// UploadStreamToBlockBlob copies the file held in io.Reader to the Blob at blockBlobClient.
Expand Down
134 changes: 0 additions & 134 deletions sdk/storage/azblob/proxy_test.go

This file was deleted.

@@ -0,0 +1,4 @@
---
AZURE_STORAGE_ACCOUNT_KEY: Kg==
AZURE_STORAGE_ACCOUNT_NAME: azureblobstoragecanada
AZURE_STORAGE_ENDPOINT_SUFFIX: core.windows.net/
@@ -0,0 +1,139 @@
---
version: 1
interactions:
- request:
body: <StorageServiceProperties><DeleteRetentionPolicy><Enabled>true</Enabled><Days>5</Days></DeleteRetentionPolicy></StorageServiceProperties>
form: {}
headers:
Accept:
- application/xml
Authorization:
- sanitized
Content-Length:
- "137"
Content-Type:
- application/xml
User-Agent:
- azsdk-go-azblob/v0.3.0 azsdk-go-azcore/v0.21.1 (go1.17.7; Windows_NT)
X-Ms-Date:
- Thu, 10 Mar 2022 15:40:41 GMT
X-Ms-Version:
- "2019-12-12"
url: https://azureblobstoragecanada.blob.core.windows.net/?comp=properties&restype=service
method: PUT
response:
body: ""
headers:
Content-Length:
- "0"
Date:
- Thu, 10 Mar 2022 15:40:38 GMT
Server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
X-Ms-Request-Id:
- a06292af-201e-0072-4195-348837000000
X-Ms-Version:
- "2019-12-12"
status: 202 Accepted
code: 202
duration: ""
- request:
body: ""
form: {}
headers:
Accept:
- application/xml
Authorization:
- sanitized
User-Agent:
- azsdk-go-azblob/v0.3.0 azsdk-go-azcore/v0.21.1 (go1.17.7; Windows_NT)
X-Ms-Date:
- Thu, 10 Mar 2022 15:41:13 GMT
X-Ms-Version:
- "2019-12-12"
url: https://azureblobstoragecanada.blob.core.windows.net/?comp=properties&restype=service
method: GET
response:
body: "\uFEFF\x3C\x3F\x78\x6D\x6C\x20\x76\x65\x72\x73\x69\x6F\x6E\x3D\"\x31\x2E\x30\"\x20\x65\x6E\x63\x6F\x64\x69\x6E\x67\x3D\"\x75\x74\x66\x2D\x38\"\x3F\x3E\x3C\x53\x74\x6F\x72\x61\x67\x65\x53\x65\x72\x76\x69\x63\x65\x50\x72\x6F\x70\x65\x72\x74\x69\x65\x73\x3E\x3C\x4C\x6F\x67\x67\x69\x6E\x67\x3E\x3C\x56\x65\x72\x73\x69\x6F\x6E\x3E\x31\x2E\x30\x3C\x2F\x56\x65\x72\x73\x69\x6F\x6E\x3E\x3C\x52\x65\x61\x64\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x52\x65\x61\x64\x3E\x3C\x57\x72\x69\x74\x65\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x57\x72\x69\x74\x65\x3E\x3C\x44\x65\x6C\x65\x74\x65\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x44\x65\x6C\x65\x74\x65\x3E\x3C\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x2F\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x2F\x4C\x6F\x67\x67\x69\x6E\x67\x3E\x3C\x48\x6F\x75\x72\x4D\x65\x74\x72\x69\x63\x73\x3E\x3C\x56\x65\x72\x73\x69\x6F\x6E\x3E\x31\x2E\x30\x3C\x2F\x56\x65\x72\x73\x69\x6F\x6E\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x74\x72\x75\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x49\x6E\x63\x6C\x75\x64\x65\x41\x50\x49\x73\x3E\x74\x72\x75\x65\x3C\x2F\x49\x6E\x63\x6C\x75\x64\x65\x41\x50\x49\x73\x3E\x3C\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x74\x72\x75\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x44\x61\x79\x73\x3E\x37\x3C\x2F\x44\x61\x79\x73\x3E\x3C\x2F\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x2F\x48\x6F\x75\x72\x4D\x65\x74\x72\x69\x63\x73\x3E\x3C\x4D\x69\x6E\x75\x74\x65\x4D\x65\x74\x72\x69\x63\x73\x3E\x3C\x56\x65\x72\x73\x69\x6F\x6E\x3E\x31\x2E\x30\x3C\x2F\x56\x65\x72\x73\x69\x6F\x6E\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x2F\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x2F\x4D\x69\x6E\x75\x74\x65\x4D\x65\x74\x72\x69\x63\x73\x3E\x3C\x43\x6F\x72\x73\x20\x2F\x3E\x3C\x44\x65\x6C\x65\x74\x65\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x74\x72\x75\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x44\x61\x79\x73\x3E\x35\x3C\x2F\x44\x61\x79\x73\x3E\x3C\x2F\x44\x65\x6C\x65\x74\x65\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x53\x74\x61\x74\x69\x63\x57\x65\x62\x73\x69\x74\x65\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x2F\x53\x74\x61\x74\x69\x63\x57\x65\x62\x73\x69\x74\x65\x3E\x3C\x2F\x53\x74\x6F\x72\x61\x67\x65\x53\x65\x72\x76\x69\x63\x65\x50\x72\x6F\x70\x65\x72\x74\x69\x65\x73\x3E"
headers:
Content-Type:
- application/xml
Date:
- Thu, 10 Mar 2022 15:41:08 GMT
Server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
X-Ms-Request-Id:
- a0630eba-201e-0072-7895-348837000000
X-Ms-Version:
- "2019-12-12"
status: 200 OK
code: 200
duration: ""
- request:
body: <StorageServiceProperties><DeleteRetentionPolicy><Enabled>false</Enabled></DeleteRetentionPolicy></StorageServiceProperties>
form: {}
headers:
Accept:
- application/xml
Authorization:
- sanitized
Content-Length:
- "124"
Content-Type:
- application/xml
User-Agent:
- azsdk-go-azblob/v0.3.0 azsdk-go-azcore/v0.21.1 (go1.17.7; Windows_NT)
X-Ms-Date:
- Thu, 10 Mar 2022 15:41:13 GMT
X-Ms-Version:
- "2019-12-12"
url: https://azureblobstoragecanada.blob.core.windows.net/?comp=properties&restype=service
method: PUT
response:
body: ""
headers:
Content-Length:
- "0"
Date:
- Thu, 10 Mar 2022 15:41:09 GMT
Server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
X-Ms-Request-Id:
- a0630f74-201e-0072-2195-348837000000
X-Ms-Version:
- "2019-12-12"
status: 202 Accepted
code: 202
duration: ""
- request:
body: ""
form: {}
headers:
Accept:
- application/xml
Authorization:
- sanitized
User-Agent:
- azsdk-go-azblob/v0.3.0 azsdk-go-azcore/v0.21.1 (go1.17.7; Windows_NT)
X-Ms-Date:
- Thu, 10 Mar 2022 15:41:44 GMT
X-Ms-Version:
- "2019-12-12"
url: https://azureblobstoragecanada.blob.core.windows.net/?comp=properties&restype=service
method: GET
response:
body: "\uFEFF\x3C\x3F\x78\x6D\x6C\x20\x76\x65\x72\x73\x69\x6F\x6E\x3D\"\x31\x2E\x30\"\x20\x65\x6E\x63\x6F\x64\x69\x6E\x67\x3D\"\x75\x74\x66\x2D\x38\"\x3F\x3E\x3C\x53\x74\x6F\x72\x61\x67\x65\x53\x65\x72\x76\x69\x63\x65\x50\x72\x6F\x70\x65\x72\x74\x69\x65\x73\x3E\x3C\x4C\x6F\x67\x67\x69\x6E\x67\x3E\x3C\x56\x65\x72\x73\x69\x6F\x6E\x3E\x31\x2E\x30\x3C\x2F\x56\x65\x72\x73\x69\x6F\x6E\x3E\x3C\x52\x65\x61\x64\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x52\x65\x61\x64\x3E\x3C\x57\x72\x69\x74\x65\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x57\x72\x69\x74\x65\x3E\x3C\x44\x65\x6C\x65\x74\x65\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x44\x65\x6C\x65\x74\x65\x3E\x3C\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x2F\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x2F\x4C\x6F\x67\x67\x69\x6E\x67\x3E\x3C\x48\x6F\x75\x72\x4D\x65\x74\x72\x69\x63\x73\x3E\x3C\x56\x65\x72\x73\x69\x6F\x6E\x3E\x31\x2E\x30\x3C\x2F\x56\x65\x72\x73\x69\x6F\x6E\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x74\x72\x75\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x49\x6E\x63\x6C\x75\x64\x65\x41\x50\x49\x73\x3E\x74\x72\x75\x65\x3C\x2F\x49\x6E\x63\x6C\x75\x64\x65\x41\x50\x49\x73\x3E\x3C\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x74\x72\x75\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x44\x61\x79\x73\x3E\x37\x3C\x2F\x44\x61\x79\x73\x3E\x3C\x2F\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x2F\x48\x6F\x75\x72\x4D\x65\x74\x72\x69\x63\x73\x3E\x3C\x4D\x69\x6E\x75\x74\x65\x4D\x65\x74\x72\x69\x63\x73\x3E\x3C\x56\x65\x72\x73\x69\x6F\x6E\x3E\x31\x2E\x30\x3C\x2F\x56\x65\x72\x73\x69\x6F\x6E\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x2F\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x2F\x4D\x69\x6E\x75\x74\x65\x4D\x65\x74\x72\x69\x63\x73\x3E\x3C\x43\x6F\x72\x73\x20\x2F\x3E\x3C\x44\x65\x6C\x65\x74\x65\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x2F\x44\x65\x6C\x65\x74\x65\x52\x65\x74\x65\x6E\x74\x69\x6F\x6E\x50\x6F\x6C\x69\x63\x79\x3E\x3C\x53\x74\x61\x74\x69\x63\x57\x65\x62\x73\x69\x74\x65\x3E\x3C\x45\x6E\x61\x62\x6C\x65\x64\x3E\x66\x61\x6C\x73\x65\x3C\x2F\x45\x6E\x61\x62\x6C\x65\x64\x3E\x3C\x2F\x53\x74\x61\x74\x69\x63\x57\x65\x62\x73\x69\x74\x65\x3E\x3C\x2F\x53\x74\x6F\x72\x61\x67\x65\x53\x65\x72\x76\x69\x63\x65\x50\x72\x6F\x70\x65\x72\x74\x69\x65\x73\x3E"
headers:
Content-Type:
- application/xml
Date:
- Thu, 10 Mar 2022 15:41:39 GMT
Server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
X-Ms-Request-Id:
- a0637a96-201e-0072-7695-348837000000
X-Ms-Version:
- "2019-12-12"
status: 200 OK
code: 200
duration: ""
@@ -0,0 +1,4 @@
---
AZURE_STORAGE_ACCOUNT_KEY: Kg==
AZURE_STORAGE_ACCOUNT_NAME: azureblobstoragecanada
AZURE_STORAGE_ENDPOINT_SUFFIX: core.windows.net/
@@ -0,0 +1,43 @@
---
version: 1
interactions:
- request:
body: <StorageServiceProperties><DeleteRetentionPolicy><Enabled>true</Enabled></DeleteRetentionPolicy></StorageServiceProperties>
form: {}
headers:
Accept:
- application/xml
Authorization:
- sanitized
Content-Length:
- "123"
Content-Type:
- application/xml
User-Agent:
- azsdk-go-azblob/v0.3.0 azsdk-go-azcore/v0.21.1 (go1.17.7; Windows_NT)
X-Ms-Date:
- Thu, 10 Mar 2022 14:46:23 GMT
X-Ms-Version:
- "2019-12-12"
url: https://azureblobstoragecanada.blob.core.windows.net/?comp=properties&restype=service
method: PUT
response:
body: "\uFEFF\x3C\x3F\x78\x6D\x6C\x20\x76\x65\x72\x73\x69\x6F\x6E\x3D\"\x31\x2E\x30\"\x20\x65\x6E\x63\x6F\x64\x69\x6E\x67\x3D\"\x75\x74\x66\x2D\x38\"\x3F\x3E\x3C\x45\x72\x72\x6F\x72\x3E\x3C\x43\x6F\x64\x65\x3E\x49\x6E\x76\x61\x6C\x69\x64\x58\x6D\x6C\x44\x6F\x63\x75\x6D\x65\x6E\x74\x3C\x2F\x43\x6F\x64\x65\x3E\x3C\x4D\x65\x73\x73\x61\x67\x65\x3E\x58\x4D\x4C\x20\x73\x70\x65\x63\x69\x66\x69\x65\x64\x20\x69\x73\x20\x6E\x6F\x74\x20\x73\x79\x6E\x74\x61\x63\x74\x69\x63\x61\x6C\x6C\x79\x20\x76\x61\x6C\x69\x64\x2E\n\x52\x65\x71\x75\x65\x73\x74\x49\x64\x3A\x64\x36\x65\x37\x64\x63\x32\x31\x2D\x32\x30\x31\x65\x2D\x30\x30\x36\x32\x2D\x33\x64\x38\x64\x2D\x33\x34\x34\x64\x35\x66\x30\x30\x30\x30\x30\x30\n\x54\x69\x6D\x65\x3A\x32\x30\x32\x32\x2D\x30\x33\x2D\x31\x30\x54\x31\x34\x3A\x34\x36\x3A\x31\x38\x2E\x38\x39\x36\x37\x31\x39\x30\x5A\x3C\x2F\x4D\x65\x73\x73\x61\x67\x65\x3E\x3C\x4C\x69\x6E\x65\x4E\x75\x6D\x62\x65\x72\x3E\x31\x3C\x2F\x4C\x69\x6E\x65\x4E\x75\x6D\x62\x65\x72\x3E\x3C\x4C\x69\x6E\x65\x50\x6F\x73\x69\x74\x69\x6F\x6E\x3E\x37\x35\x3C\x2F\x4C\x69\x6E\x65\x50\x6F\x73\x69\x74\x69\x6F\x6E\x3E\x3C\x52\x65\x61\x73\x6F\x6E\x3E\x45\x6C\x65\x6D\x65\x6E\x74\x20\x69\x73\x20\x6D\x69\x73\x73\x69\x6E\x67\x3A\x20\x44\x61\x79\x73\x2E\x3C\x2F\x52\x65\x61\x73\x6F\x6E\x3E\x3C\x2F\x45\x72\x72\x6F\x72\x3E"
headers:
Content-Length:
- "327"
Content-Type:
- application/xml
Date:
- Thu, 10 Mar 2022 14:46:18 GMT
Server:
- Windows-Azure-Blob/1.0 Microsoft-HTTPAPI/2.0
X-Ms-Error-Code:
- InvalidXmlDocument
X-Ms-Request-Id:
- d6e7dc21-201e-0062-3d8d-344d5f000000
X-Ms-Version:
- "2019-12-12"
status: 400 XML specified is not syntactically valid.
code: 400
duration: ""
@@ -0,0 +1,4 @@
---
AZURE_STORAGE_ACCOUNT_KEY: Kg==
AZURE_STORAGE_ACCOUNT_NAME: azureblobstoragecanada
AZURE_STORAGE_ENDPOINT_SUFFIX: core.windows.net/