Skip to content

changes to support queryString property for VM CSE sample #19

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

Open
bmoore-msft wants to merge 1 commit into
base: master
Choose a base branch
from
Open

changes to support queryString property for VM CSE sample #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 4 additions & 16 deletions VMCSEInstallFileBash/azuredeploy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,6 @@
"description": "Password for the Virtual Machine."
}
},
"_artifactsLocation": {
"type": "string",
"defaultValue": "[deployment().properties.templateLink.uri]",
"metadata": {
"description": "Auto-generated container in staging storage account to receive post-build staging folder upload"
}
},
"_artifactsLocationSasToken": {
"type": "securestring",
"defaultValue": "",
"metadata": {
"description": "Auto-generated token to access _artifactsLocation"
}
},
"vmSize": {
"type":"string",
"defaultValue": "Standard_A2",
Expand All @@ -45,6 +31,8 @@
}
},
"variables": {
"_artifactsLocation": "[deployment().properties.templateLink.uri]",
"_artifactsLocationSasToken": "[if(contains(deployment().properties.templateLink, 'queryString'), deployment().properties.templateLink.queryString, '')]",
"imagePublisher": "Canonical",
"imageOffer": "UbuntuServer",
"OSVersion": "16.04.0-LTS",
Expand All @@ -61,7 +49,7 @@
"fileToBeCopied": "FileToBeCopied.txt",
"scriptFolder": ".",
"scriptFileName": "copyfilefromazure.sh",
"scriptArgs": "[concat('-a ', parameters('_artifactsLocation'), ' -t \"', parameters('_artifactsLocationSasToken'), '\" -p ', variables('scriptFolder'), ' -f ', variables('fileToBeCopied'))]"
"scriptArgs": "[concat('-a ', variables('_artifactsLocation'), ' -t \"', variables('_artifactsLocationSasToken'), '\" -p ', variables('scriptFolder'), ' -f ', variables('fileToBeCopied'))]"
},
"resources": [
{
Expand Down Expand Up @@ -192,7 +180,7 @@
"forceUpdateTag": "changeThisToEnsureScriptRuns-maxlength=50",
"settings": {
"fileUris": [
"[uri(parameters('_artifactsLocation'), concat(variables('scriptFileName'), parameters('_artifactsLocationSasToken')))]"
"[uri(variables('_artifactsLocation'), concat(variables('scriptFileName'), '?', variables('_artifactsLocationSasToken')))]"
],
"commandToExecute": "[concat('bash ', variables('scriptFileName'), ' ', variables('scriptArgs'))]"
}
Expand Down
2 changes: 1 addition & 1 deletion VMCSEInstallFileBash/copyfilefromazure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ while getopts "a:t:p:f:" opt; do
esac
done

fileUrl="$artifactsLocation/$pathToFile/$fileToInstall$token"
fileUrl="$artifactsLocation/$pathToFile/$fileToInstall?${token#\?}"
stagingDir="/staging"

mkdir -v "$stagingDir"
Expand Down