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.

Sign up for GitHub

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

fixed AzCopy path for useSanitizerActivate #19993

Merged
merged 2 commits into from
Jun 13, 2024
Merged

fixed AzCopy path for useSanitizerActivate #19993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a390020
fixed AzCopy path for useSanitizerActivate
v-snalawade Jun 12, 2024
5f2a48a
Merge branch 'master' into users/v-snalawade/fixazcopypath
v-snalawade Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Tasks/AzureFileCopyV4/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,9 @@ function Upload-FilesToAzureContainer

if ($useSanitizerActivate) {
$sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)')
Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
& azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
$uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
Invoke-Expression $uploadCommand
} else {
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
$uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV4/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 4,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV4/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 4,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
5 changes: 3 additions & 2 deletions Tasks/AzureFileCopyV5/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,9 @@ function Upload-FilesToAzureContainer
if ($useSanitizerActivate) {
# Splitting arguments on space, but not on space inside quotes
$sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)')
Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
& azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
$uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
Invoke-Expression $uploadCommand
} else {
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
$uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV5/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 5,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV5/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 5,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
5 changes: 3 additions & 2 deletions Tasks/AzureFileCopyV6/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,9 @@ function Upload-FilesToAzureContainer
if ($useSanitizerActivate) {
# Splitting arguments on space, but not on space inside quotes
$sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)')
Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
& azcopy copy $sourcePath $containerURL $sanitizedArguments
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
$uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
Invoke-Expression $uploadCommand
} else {

Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV6/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 6,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureFileCopyV6/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 6,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down
4 changes: 2 additions & 2 deletions _generated/AzureFileCopyV4.versionmap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Default|4.241.2
Node20_229_2|4.241.3
Default|4.241.4
Node20_229_2|4.241.5
5 changes: 3 additions & 2 deletions _generated/AzureFileCopyV4/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,9 @@ function Upload-FilesToAzureContainer

if ($useSanitizerActivate) {
$sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)')
Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
& azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
$uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
Invoke-Expression $uploadCommand
} else {
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
$uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
Expand Down
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV4/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 4,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down Expand Up @@ -301,7 +301,7 @@
"ServicePrincipalError": "There was an error with the service principal used for the deployment."
},
"_buildConfigMapping": {
"Default": "4.241.2",
"Node20_229_2": "4.241.3"
"Default": "4.241.4",
"Node20_229_2": "4.241.5"
}
}
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV4/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 4,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down Expand Up @@ -301,7 +301,7 @@
"ServicePrincipalError": "ms-resource:loc.messages.ServicePrincipalError"
},
"_buildConfigMapping": {
"Default": "4.241.2",
"Node20_229_2": "4.241.3"
"Default": "4.241.4",
"Node20_229_2": "4.241.5"
}
}
5 changes: 3 additions & 2 deletions _generated/AzureFileCopyV4_Node20/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,9 @@ function Upload-FilesToAzureContainer

if ($useSanitizerActivate) {
$sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)')
Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
& azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
$uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
Invoke-Expression $uploadCommand
} else {
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
$uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
Expand Down
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV4_Node20/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 4,
"Minor": 241,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down Expand Up @@ -305,7 +305,7 @@
"ServicePrincipalError": "There was an error with the service principal used for the deployment."
},
"_buildConfigMapping": {
"Default": "4.241.2",
"Node20_229_2": "4.241.3"
"Default": "4.241.4",
"Node20_229_2": "4.241.5"
}
}
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV4_Node20/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 4,
"Minor": 241,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down Expand Up @@ -305,7 +305,7 @@
"ServicePrincipalError": "ms-resource:loc.messages.ServicePrincipalError"
},
"_buildConfigMapping": {
"Default": "4.241.2",
"Node20_229_2": "4.241.3"
"Default": "4.241.4",
"Node20_229_2": "4.241.5"
}
}
4 changes: 2 additions & 2 deletions _generated/AzureFileCopyV5.versionmap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Default|5.241.2
Node20_229_2|5.241.3
Default|5.241.4
Node20_229_2|5.241.5
5 changes: 3 additions & 2 deletions _generated/AzureFileCopyV5/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,9 @@ function Upload-FilesToAzureContainer
if ($useSanitizerActivate) {
# Splitting arguments on space, but not on space inside quotes
$sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)')
Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
& azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
$uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
Invoke-Expression $uploadCommand
} else {
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
$uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
Expand Down
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV5/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 5,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down Expand Up @@ -301,7 +301,7 @@
"AzModuleNotFound": "Could not find the modules: 'Az.Accounts'. If the module was recently installed, retry after restarting the Azure Pipelines task agent."
},
"_buildConfigMapping": {
"Default": "5.241.2",
"Node20_229_2": "5.241.3"
"Default": "5.241.4",
"Node20_229_2": "5.241.5"
}
}
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV5/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 5,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down Expand Up @@ -301,7 +301,7 @@
"AzModuleNotFound": "ms-resource:loc.messages.AzModuleNotFound"
},
"_buildConfigMapping": {
"Default": "5.241.2",
"Node20_229_2": "5.241.3"
"Default": "5.241.4",
"Node20_229_2": "5.241.5"
}
}
5 changes: 3 additions & 2 deletions _generated/AzureFileCopyV5_Node20/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,9 @@ function Upload-FilesToAzureContainer
if ($useSanitizerActivate) {
# Splitting arguments on space, but not on space inside quotes
$sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)')
Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
& azcopy copy $sourcePath $containerURL$containerSasToken $sanitizedArguments
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
$uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
Invoke-Expression $uploadCommand
} else {
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
$uploadToBlobCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
Expand Down
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV5_Node20/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 5,
"Minor": 241,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down Expand Up @@ -305,7 +305,7 @@
"AzModuleNotFound": "Could not find the modules: 'Az.Accounts'. If the module was recently installed, retry after restarting the Azure Pipelines task agent."
},
"_buildConfigMapping": {
"Default": "5.241.2",
"Node20_229_2": "5.241.3"
"Default": "5.241.4",
"Node20_229_2": "5.241.5"
}
}
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV5_Node20/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 5,
"Minor": 241,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down Expand Up @@ -305,7 +305,7 @@
"AzModuleNotFound": "ms-resource:loc.messages.AzModuleNotFound"
},
"_buildConfigMapping": {
"Default": "5.241.2",
"Node20_229_2": "5.241.3"
"Default": "5.241.4",
"Node20_229_2": "5.241.5"
}
}
4 changes: 2 additions & 2 deletions _generated/AzureFileCopyV6.versionmap.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Default|6.241.2
Node20_229_2|6.241.3
Default|6.241.4
Node20_229_2|6.241.5
5 changes: 3 additions & 2 deletions _generated/AzureFileCopyV6/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,9 @@ function Upload-FilesToAzureContainer
if ($useSanitizerActivate) {
# Splitting arguments on space, but not on space inside quotes
$sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)')
Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
& azcopy copy $sourcePath $containerURL $sanitizedArguments
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
$uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
Invoke-Expression $uploadCommand
} else {

Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
Expand Down
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV6/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 6,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down Expand Up @@ -288,7 +288,7 @@
"AzModuleNotFound": "Could not find the modules: 'Az.Accounts'. If the module was recently installed, retry after restarting the Azure Pipelines task agent."
},
"_buildConfigMapping": {
"Default": "6.241.2",
"Node20_229_2": "6.241.3"
"Default": "6.241.4",
"Node20_229_2": "6.241.5"
}
}
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV6/task.loc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 6,
"Minor": 241,
"Patch": 2
"Patch": 4
},
"demands": [
"azureps"
Expand Down Expand Up @@ -288,7 +288,7 @@
"AzModuleNotFound": "ms-resource:loc.messages.AzModuleNotFound"
},
"_buildConfigMapping": {
"Default": "6.241.2",
"Node20_229_2": "6.241.3"
"Default": "6.241.4",
"Node20_229_2": "6.241.5"
}
}
5 changes: 3 additions & 2 deletions _generated/AzureFileCopyV6_Node20/Utility.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,8 +238,9 @@ function Upload-FilesToAzureContainer
if ($useSanitizerActivate) {
# Splitting arguments on space, but not on space inside quotes
$sanitizedArguments = [regex]::Split($additionalArguments, ' (?=(?:[^"]|"[^"]*")*$)')
Write-Output "##[command] & azcopy copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
& azcopy copy $sourcePath $containerURL $sanitizedArguments
Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
$uploadCommand = "& `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $sanitizedArguments"
Invoke-Expression $uploadCommand
} else {

Write-Output "##[command] & `"$azCopyExeLocation`" copy `"$sourcePath`" `"$containerURL`" $additionalArguments"
Expand Down
6 changes: 3 additions & 3 deletions _generated/AzureFileCopyV6_Node20/task.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": {
"Major": 6,
"Minor": 241,
"Patch": 3
"Patch": 5
},
"demands": [
"azureps"
Expand Down Expand Up @@ -292,7 +292,7 @@
"AzModuleNotFound": "Could not find the modules: 'Az.Accounts'. If the module was recently installed, retry after restarting the Azure Pipelines task agent."
},
"_buildConfigMapping": {
"Default": "6.241.2",
"Node20_229_2": "6.241.3"
"Default": "6.241.4",
"Node20_229_2": "6.241.5"
}
}
Loading