From d1e4d0a1d56ceadf0b913ad7c620a01291f91c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?McCoy=20Pati=C3=B1o?= Date: Thu, 17 Jun 2021 14:55:24 -0700 Subject: [PATCH 1/3] Update ARM template --- sdk/keyvault/test-resources.json | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/sdk/keyvault/test-resources.json b/sdk/keyvault/test-resources.json index ad86a7906503..529e67f44f9d 100644 --- a/sdk/keyvault/test-resources.json +++ b/sdk/keyvault/test-resources.json @@ -84,7 +84,7 @@ }, "variables": { "azureKeyVaultUrl": "[format('https://{0}{1}', parameters('baseName'), parameters('keyVaultDomainSuffix'))]", - "hsmApiVersion": "2020-04-01-preview", + "hsmApiVersion": "2021-04-01-preview", "hsmName": "[concat(parameters('baseName'), 'hsm')]", "mgmtApiVersion": "2019-04-01", "blobContainerName": "backup", @@ -189,12 +189,19 @@ "name": "Standard_B1" }, "properties": { - "tenantId": "[parameters('tenantId')]", - "initialAdminObjectIds": [ + "TenantId": "[parameters('tenantId')]", + "InitialAdminObjectIds": [ "[parameters('testApplicationOid')]" ], - "enablePurgeProtection": false, - "enableSoftDelete": "[parameters('enableSoftDelete')]" + "EnablePurgeProtection": false, + "EnableSoftDelete": "[parameters('enableSoftDelete')]", + "PublicNetworkAccess": "Enabled", + "NetworkAcls": { + "Bypass": "AzureServices", + "DefaultAction": "Allow", + "IpRules": [], + "VirtualNetworkRules": [] + } } }, { From 73b1ef260f65985588f2214b7b1cd344f4c1e7fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?McCoy=20Pati=C3=B1o?= Date: Fri, 18 Jun 2021 14:52:31 -0700 Subject: [PATCH 2/3] New default Bypass value --- sdk/keyvault/test-resources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/keyvault/test-resources.json b/sdk/keyvault/test-resources.json index 529e67f44f9d..3a0e7ca33d9a 100644 --- a/sdk/keyvault/test-resources.json +++ b/sdk/keyvault/test-resources.json @@ -197,7 +197,7 @@ "EnableSoftDelete": "[parameters('enableSoftDelete')]", "PublicNetworkAccess": "Enabled", "NetworkAcls": { - "Bypass": "AzureServices", + "Bypass": "None", "DefaultAction": "Allow", "IpRules": [], "VirtualNetworkRules": [] From 1a1cb115d1f289f5b6c0e2522a81bc0874a8bcfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?McCoy=20Pati=C3=B1o?= Date: Mon, 21 Jun 2021 12:50:16 -0700 Subject: [PATCH 3/3] Clean up/align with .NET --- sdk/keyvault/test-resources.json | 32 +++++++++----------------------- 1 file changed, 9 insertions(+), 23 deletions(-) diff --git a/sdk/keyvault/test-resources.json b/sdk/keyvault/test-resources.json index 3a0e7ca33d9a..e40bb34d8844 100644 --- 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." - } - }, "keyVaultDomainSuffix": { "type": "string", "defaultValue": ".vault.azure.net", @@ -99,10 +92,8 @@ }, "networkAcls": { "bypass": "AzureServices", - "virtualNetworkRules": [ - ], - "ipRules": [ - ], + "virtualNetworkRules": [], + "ipRules": [], "defaultAction": "Allow" } }, @@ -175,7 +166,7 @@ "enabledForDeployment": false, "enabledForDiskEncryption": false, "enabledForTemplateDeployment": false, - "enableSoftDelete": "[parameters('enableSoftDelete')]" + "enableSoftDelete": true } }, { @@ -189,19 +180,14 @@ "name": "Standard_B1" }, "properties": { - "TenantId": "[parameters('tenantId')]", - "InitialAdminObjectIds": [ + "tenantId": "[parameters('tenantId')]", + "initialAdminObjectIds": [ "[parameters('testApplicationOid')]" ], - "EnablePurgeProtection": false, - "EnableSoftDelete": "[parameters('enableSoftDelete')]", - "PublicNetworkAccess": "Enabled", - "NetworkAcls": { - "Bypass": "None", - "DefaultAction": "Allow", - "IpRules": [], - "VirtualNetworkRules": [] - } + "enablePurgeProtection": false, + "enableSoftDelete": true, + "publicNetworkAccess": "Enabled", + "networkAcls": "[variables('networkAcls')]" } }, {