From d50ea7233b80f662cb9e19883fb0083e653339ca Mon Sep 17 00:00:00 2001
From: lavinir <56975945+lavinir@users.noreply.github.com>
Date: Tue, 24 Nov 2020 14:47:32 +0200
Subject: [PATCH] Updating Package Manifest Schema in Private Preview API
 (#11688)

---
 custom-words.txt                              |  1 +
 .../IotDefenderSettings/PackageDownloads.json | 37 ++++++++++-
 .../iotDefenderSettings.json                  | 61 ++++++++++++++++---
 3 files changed, 88 insertions(+), 11 deletions(-)

diff --git a/custom-words.txt b/custom-words.txt
index a2d676a05df9..82a283f599d4 100644
--- a/custom-words.txt
+++ b/custom-words.txt
@@ -1604,6 +1604,7 @@ SMBIOS
 snapshotrun
 snapshotsdr
 SNAT
+SNMP
 softwareplan
 SOHSV
 solaris
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/IotDefenderSettings/PackageDownloads.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/IotDefenderSettings/PackageDownloads.json
index a074c8f4ed72..456dc61d0672 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/IotDefenderSettings/PackageDownloads.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/examples/IotDefenderSettings/PackageDownloads.json
@@ -62,11 +62,13 @@
           "upgrade": [
             {
               "version": "2.8.2",
+              "fromVersion": "2.8.0",
               "link": "http://microsoft.com/downloadLocation",
               "versionKind": "Latest"
             },
             {
               "version": "2.8.10",
+              "fromVersion": "2.8.0",
               "link": "http://microsoft.com/downloadLocation",
               "versionKind": "Previous"
             }
@@ -120,19 +122,48 @@
           "upgrade": [
             {
               "version": "2.8.2",
+              "fromVersion": "2.8.0",
               "link": "http://microsoft.com/downloadLocation",
               "versionKind": "Latest"
             },
             {
               "version": "2.8.10",
+              "fromVersion": "2.8.0",
               "link": "http://microsoft.com/downloadLocation",
               "versionKind": "Previous"
             }
           ]
         },
-        "threatIntelligence": {
-          "link": "http://microsoft.com/downloadLocation"
-        }
+        "threatIntelligence": [
+          {
+            "link": "http://microsoft.com/downloadLocation",
+            "version": "2020.02.10"
+          }
+        ],
+        "snmp": [
+          {
+            "link": "http://microsoft.com/downloadLocation",
+            "version": "2020.02.10"
+          }
+        ],
+        "wmiTool": [
+          {
+            "link": "http://microsoft.com/downloadLocation",
+            "version": "2020.02.10"
+          }
+        ],
+        "authorizedDevicesImportTemplate": [
+          {
+            "link": "http://microsoft.com/downloadLocation",
+            "version": "2020.02.10"
+          }
+        ],
+        "deviceInformationUpdateImportTemplate": [
+          {
+            "link": "http://microsoft.com/downloadLocation",
+            "version": "2020.02.10"
+          }
+        ]
       }
     }
   }
diff --git a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotDefenderSettings.json b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotDefenderSettings.json
index e0ff6e0058bb..e9af3b53b72d 100644
--- a/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotDefenderSettings.json
+++ b/specification/security/resource-manager/Microsoft.Security/preview/2020-08-06-preview/iotDefenderSettings.json
@@ -359,6 +359,22 @@
         }
       }
     },
+    "UpgradePackageDownloadInfo": {
+      "type": "object",
+      "description": "Information on a specific package upgrade download",
+      "properties": {
+        "fromVersion": {
+          "type": "string",
+          "description": "Minimum base version for upgrade",
+          "readOnly": true
+        }
+      },
+      "allOf": [
+        {
+          "$ref": "#/definitions/PackageDownloadInfo"
+        }
+      ]
+    },
     "PackageDownloads": {
       "type": "object",
       "description": "Information about package downloads",
@@ -418,7 +434,7 @@
               "type": "array",
               "description": "Sensor upgrade package downloads (on existing installations)",
               "items": {
-                "$ref": "#/definitions/PackageDownloadInfo"
+                "$ref": "#/definitions/UpgradePackageDownloadInfo"
               }
             }
           }
@@ -487,20 +503,49 @@
               "description": "Central Manager upgrade package downloads (on existing installations)",
               "readOnly": true,
               "items": {
-                "$ref": "#/definitions/PackageDownloadInfo"
+                "$ref": "#/definitions/UpgradePackageDownloadInfo"
               }
             }
           }
         },
         "threatIntelligence": {
-          "type": "object",
+          "type": "array",
           "description": "All downloads for threat intelligence",
           "readOnly": true,
-          "properties": {
-            "link": {
-              "description": "Download link",
-              "$ref": "#/definitions/DownloadLink"
-            }
+          "items": {
+            "$ref": "#/definitions/PackageDownloadInfo"
+          }
+        },
+        "snmp": {
+          "type": "array",
+          "description": "SNMP Server file",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/PackageDownloadInfo"
+          }
+        },
+        "wmiTool": {
+          "type": "array",
+          "description": "Used for local configuration export",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/PackageDownloadInfo"
+          }
+        },
+        "authorizedDevicesImportTemplate": {
+          "type": "array",
+          "description": "Authorized devices import template",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/PackageDownloadInfo"
+          }
+        },
+        "deviceInformationUpdateImportTemplate": {
+          "type": "array",
+          "description": "Authorized devices import template",
+          "readOnly": true,
+          "items": {
+            "$ref": "#/definitions/PackageDownloadInfo"
           }
         }
       }