Skip to content

Commit f1ad625

Browse files
authored
vcpkg: use x-azcopy as x-azblob requires SAS token (even in read scenarios) (Azure#3076)
vcpkg introduced a new set of features and changed behavior for `x-azblob` in cases where no SAS is provided. There's an `x-azcopy` configuration which does not require SAS and works in `read` scenarios. Successful PR build: https://dev.azure.com/azure-sdk/public/_build/results?buildId=5404051&view=logs&j=f62abde3-0c2c-58c2-34fa-f25f24e797de&t=7bf7baf7-4679-52b3-46c9-d10933f9b078 Successful internal build: https://dev.azure.com/azure-sdk/internal/_build/results?buildId=5404053&view=logs&j=f62abde3-0c2c-58c2-34fa-f25f24e797de&t=7bf7baf7-4679-52b3-46c9-d10933f9b078
1 parent 28c9cfc commit f1ad625

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

eng/pipelines/templates/steps/vcpkg.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22
- pwsh: |
3-
Write-Host '##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azblob,https://azuresdkartifacts.blob.core.windows.net/public-vcpkg-container,,read'
3+
Write-Host '##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azcopy,https://azuresdkartifacts.blob.core.windows.net/public-vcpkg-container,read'
44
Write-Host '##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES_SECRET;issecret=true;]clear;x-azurl,https://azuresdkartifacts.blob.core.windows.net/public-vcpkg-container,,read'
55
displayName: Set vcpkg variables
66

eng/scripts/Set-VcpkgWriteModeCache.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,5 @@ Write-Host "Ensure redaction of SAS tokens in logs"
4242
Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SAS_TOKEN;issecret=true;]$vcpkgBinarySourceSas"
4343

4444
Write-Host "Setting vcpkg binary cache to read and write"
45-
Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azblob,https://$StorageAccountName.blob.core.windows.net/$StorageContainerName,$vcpkgBinarySourceSas,readwrite"
45+
Write-Host "##vso[task.setvariable variable=VCPKG_BINARY_SOURCES_SECRET;issecret=true;]clear;x-azcopy-sas,https://$StorageAccountName.blob.core.windows.net/$StorageContainerName,$vcpkgBinarySourceSas,readwrite"
4646
Write-Host "##vso[task.setvariable variable=X_VCPKG_ASSET_SOURCES_SECRET;issecret=true;]clear;x-azurl,https://$StorageAccountName.blob.core.windows.net/$StorageContainerName,$vcpkgBinarySourceSas,readwrite"

0 commit comments

Comments
 (0)