Fix Managed HSM test deployment (#21979)

Also gets rid of unnecessary, deprecated enableSoftDelete parameter.
Azure · Jun 18, 2021 · 6ac2f79 · 6ac2f79
1 parent a111864
commit 6ac2f79
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/sdk/keyvault/test-resources.json b/sdk/keyvault/test-resources.json
@@ -60,13 +60,6 @@
                 "description": "Whether to enable deployment of Managed HSM. The default is false."
             }
         },
-        "enableSoftDelete": {
-            "type": "bool",
-            "defaultValue": true,
-            "metadata": {
-                "description": "Whether to enable soft delete for the Key Vault. The default is true."
-            }
-        },
         "keyVaultSku": {
             "type": "string",
             "defaultValue": "premium",
@@ -78,7 +71,7 @@
     "variables": {
         "kvApiVersion": "2019-09-01",
         "kvName": "[parameters('baseName')]",
-        "hsmApiVersion": "2020-04-01-preview",
+        "hsmApiVersion": "2021-04-01-preview",
         "hsmName": "[concat(parameters('baseName'), 'hsm')]",
         "mgmtApiVersion": "2019-04-01",
         "blobContainerName": "backup",
@@ -93,10 +86,8 @@
         },
         "networkAcls": {
             "bypass": "AzureServices",
-            "virtualNetworkRules": [
-            ],
-            "ipRules": [
-            ],
+            "virtualNetworkRules": [],
+            "ipRules": [],
             "defaultAction": "Allow"
         }
     },
@@ -169,7 +160,7 @@
                 "enabledForDeployment": false,
                 "enabledForDiskEncryption": false,
                 "enabledForTemplateDeployment": false,
-                "enableSoftDelete": "[parameters('enableSoftDelete')]"
+                "enableSoftDelete": true
             }
         },
         {
@@ -188,7 +179,9 @@
                     "[parameters('testApplicationOid')]"
                 ],
                 "enablePurgeProtection": false,
-                "enableSoftDelete": "[parameters('enableSoftDelete')]"
+                "enableSoftDelete": true,
+                "publicNetworkAccess": "Enabled",
+                "networkAcls": "[variables('networkAcls')]"
             }
         },
         {