Merge pull request #10609 from talhers/upgrade-va-storage

Upgraded storage creation in Vulnerability Assessment auto enablement…

src/Sql/Sql/AdvancedThreatProtection/Templates/DeployInstanceVaTemplate.json

@@ -21,18 +21,20 @@
         "storageName": "[tolower(concat('sqlva', variables('uniqueStorage')))]",
     },
     "resources": [
-        {
-            "condition": "[parameters('enableVa')]",
-            "type": "Microsoft.Storage/storageAccounts",
-            "name": "[variables('storageName')]",
-            "apiVersion": "2016-01-01",
-            "location": "[parameters('location')]",
-            "sku": {
-                "name": "Standard_LRS",
-            },
-            "kind": "Storage",
-            "properties": {},
+      {
+        "condition": "[parameters('enableVa')]",
+        "type": "Microsoft.Storage/storageAccounts",
+        "name": "[variables('storageName')]",
+        "apiVersion": "2019-04-01",
+        "location": "[parameters('location')]",
+        "sku": {
+          "name": "Standard_LRS",
         },
+        "kind": "StorageV2",
+        "properties": {
+          "supportsHttpsTrafficOnly": true
+        }
+      },
         {
             "condition": "[parameters('enableVa')]",
             "type": "Microsoft.Sql/managedInstances/vulnerabilityAssessments",

src/Sql/Sql/AdvancedThreatProtection/Templates/DeployServerVaTemplate.json

@@ -21,18 +21,20 @@
         "storageName": "[tolower(concat('sqlva', variables('uniqueStorage')))]",
     },
     "resources": [
-        {
-            "condition": "[parameters('enableVa')]",
-            "type": "Microsoft.Storage/storageAccounts",
-            "name": "[variables('storageName')]",
-            "apiVersion": "2016-01-01",
-            "location": "[parameters('location')]",
-            "sku": {
-                "name": "Standard_LRS",
-            },
-            "kind": "Storage",
-            "properties": {},
+      {
+        "condition": "[parameters('enableVa')]",
+        "type": "Microsoft.Storage/storageAccounts",
+        "name": "[variables('storageName')]",
+        "apiVersion": "2019-04-01",
+        "location": "[parameters('location')]",
+        "sku": {
+          "name": "Standard_LRS",
         },
+        "kind": "StorageV2",
+        "properties": {
+          "supportsHttpsTrafficOnly": true
+        }
+      },
         {
             "condition": "[parameters('enableVa')]",
             "type": "Microsoft.Sql/servers/vulnerabilityAssessments",

src/Sql/Sql/ChangeLog.md

@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Upgraded storage creation in Vulnerability Assessment auto enablement to StorageV2
 
 ## Version 2.1.0
 * Added support for database ReadReplicaCount.