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

[KeyVault] - Update test-resources.json #18085

Merged
merged 4 commits into from
Oct 8, 2021
Merged

[KeyVault] - Update test-resources.json #18085

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95ebd65
wip
maorleger Oct 8, 2021
1a39829
fix formatting
maorleger Oct 8, 2021
3eef92a
fix formatting
maorleger Oct 8, 2021
bfac88e
remove trailing slash
maorleger Oct 8, 2021
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
49 changes: 24 additions & 25 deletions sdk/keyvault/test-resources.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,25 +64,19 @@
"description": "The base time to add 2 hours to for SAS token expiration. The default is the current time."
}
},
"attestationImageName": {
"attestationImage": {
"type": "string",
"defaultValue": "keyvault-mock-attestation",
"defaultValue": "keyvault-mock-attestation:latest",
"metadata": {
"description": "The name of the secure key release attestation image to deploy. Only deployed when enableHsm is true."
}
},
"attestationImageTag": {
"type": "string",
"defaultValue": "latest",
"metadata": {
"description": "The tag of the secure key release attestation image to use. The default is 'latest'. Only deployed when enableHsm is true."
"description": "The attestation image to use. The default is 'keyvault-mock-attestation:latest'."
}
}
},
"variables": {
"kvApiVersion": "2019-09-01",
"attestationImageId": "[concat('DOCKER|azsdkengsys.azurecr.io/', parameters('attestationImageName'), ':', parameters('attestationImageTag'))]",
"attestationAppName": "[concat(parameters('baseName'), '-skr-attestation')]",
"attestationFarm": "[concat(parameters('baseName'), 'farm')]",
"attestationSite": "[concat(parameters('baseName'), 'site')]",
"attestationImageUri": "[concat('DOCKER|azsdkengsys.azurecr.io/', parameters('attestationImage'))]",
"kvName": "[parameters('baseName')]",
"hsmApiVersion": "2020-04-01-preview",
"hsmName": "[concat(parameters('baseName'), 'hsm')]",
Expand Down Expand Up @@ -248,37 +242,42 @@
},
{
"type": "Microsoft.Web/serverfarms",
"apiVersion": "2021-01-15",
"name": "[variables('attestationAppName')]",
"apiVersion": "2020-12-01",
"name": "[variables('attestationFarm')]",
"condition": "[parameters('enableHsm')]",
"location": "[parameters('location')]",
"kind": "linux",
"sku": { "name": "B1" },
"sku": {
"name": "B1"
},
"properties": {
"reserved": true
}
},
{
"type": "Microsoft.Web/sites",
"apiVersion": "2016-08-01",
"name": "[variables('attestationAppName')]",
"apiVersion": "2020-12-01",
"name": "[variables('attestationSite')]",
"condition": "[parameters('enableHsm')]",
"dependsOn": [
"[resourceId('Microsoft.Web/serverfarms', variables('attestationFarm'))]"
],
"location": "[parameters('location')]",
"properties": {
"httpsOnly": true,
"serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('attestationAppName'))]",
"serverFarmId": "[resourceId('Microsoft.Web/serverfarms', variables('attestationFarm'))]",
"siteConfig": {
"name": "[variables('attestationAppName')]",
"name": "[variables('attestationSite')]",
"alwaysOn": true,
"linuxFxVersion": "[variables('attestationImageId')]",
"linuxFxVersion": "[variables('attestationImageUri')]",
"appSettings": [
{
"name": "WEBSITES_ENABLE_APP_SERVICE_STORAGE",
"value": "false"
"name": "WEBSITES_ENABLE_APP_SERVICE_STORAGE",
"value": "false"
maorleger marked this conversation as resolved.
Show resolved Hide resolved
}
]
}
},
"dependsOn": ["[resourceId('Microsoft.Web/serverfarms', variables('attestationAppName'))]"]
}
}
],
"outputs": {
Expand Down Expand Up @@ -318,7 +317,7 @@
"AZURE_KEYVAULT_ATTESTATION_URI": {
"type": "string",
"condition": "[parameters('enableHsm')]",
"value": "[concat('https://', reference(resourceId('Microsoft.Web/sites', variables('attestationAppName')), '2018-02-01').defaultHostName, '/')]"
"value": "[format('https://{0}/', reference(variables('attestationSite')).defaultHostName)]",
}
}
}