From 2ee4056e2fac5f9b61773fba930957b5a6c1f452 Mon Sep 17 00:00:00 2001
From: Maor Leger <maorleger@users.noreply.github.com>
Date: Fri, 8 Oct 2021 13:24:07 -0700
Subject: [PATCH] [KeyVault] - Update test-resources.json (#18085)

No functional changes, just refactoring a bit. dotnet recently added their SKR container deployment to the template and made some changes that I want to take into JS.
---
 sdk/keyvault/test-resources.json | 45 ++++++++++++++++----------------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/sdk/keyvault/test-resources.json b/sdk/keyvault/test-resources.json
index ad5cd60f952d..5bd8b80fd3c1 100644
--- a/sdk/keyvault/test-resources.json
+++ b/sdk/keyvault/test-resources.json
@@ -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')]",
@@ -248,28 +242,34 @@
     },
     {
       "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",
@@ -277,8 +277,7 @@
             }
           ]
         }
-      },
-      "dependsOn": ["[resourceId('Microsoft.Web/serverfarms', variables('attestationAppName'))]"]
+      }
     }
   ],
   "outputs": {
@@ -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)]"
     }
   }
 }