diff --git a/schemas/2016-02-03/Microsoft.Devices.json b/schemas/2016-02-03/Microsoft.Devices.json index 5de52f72d5..81bab2898c 100644 --- a/schemas/2016-02-03/Microsoft.Devices.json +++ b/schemas/2016-02-03/Microsoft.Devices.json @@ -542,4 +542,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2017-01-19/Microsoft.Devices.json b/schemas/2017-01-19/Microsoft.Devices.json index d73b5ec9d3..f0cb87c409 100644 --- a/schemas/2017-01-19/Microsoft.Devices.json +++ b/schemas/2017-01-19/Microsoft.Devices.json @@ -872,4 +872,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2017-07-01/Microsoft.Devices.json b/schemas/2017-07-01/Microsoft.Devices.json index ac80bf6d1e..3ba5308870 100644 --- a/schemas/2017-07-01/Microsoft.Devices.json +++ b/schemas/2017-07-01/Microsoft.Devices.json @@ -1047,4 +1047,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2018-01-22/Microsoft.Devices.json b/schemas/2018-01-22/Microsoft.Devices.json index 73d64870f0..75ad6fe518 100644 --- a/schemas/2018-01-22/Microsoft.Devices.json +++ b/schemas/2018-01-22/Microsoft.Devices.json @@ -1040,4 +1040,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2018-04-01/Microsoft.Devices.json b/schemas/2018-04-01/Microsoft.Devices.json index 8786f72c7e..0187ca0c46 100644 --- a/schemas/2018-04-01/Microsoft.Devices.json +++ b/schemas/2018-04-01/Microsoft.Devices.json @@ -1045,4 +1045,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2018-12-01-preview/Microsoft.Devices.json b/schemas/2018-12-01-preview/Microsoft.Devices.json index 12c57f1de6..e4617dc378 100644 --- a/schemas/2018-12-01-preview/Microsoft.Devices.json +++ b/schemas/2018-12-01-preview/Microsoft.Devices.json @@ -1090,4 +1090,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2019-03-22-preview/Microsoft.Devices.json b/schemas/2019-03-22-preview/Microsoft.Devices.json index 985bcf087c..a83f009309 100644 --- a/schemas/2019-03-22-preview/Microsoft.Devices.json +++ b/schemas/2019-03-22-preview/Microsoft.Devices.json @@ -1098,4 +1098,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2019-03-22/Microsoft.Devices.json b/schemas/2019-03-22/Microsoft.Devices.json index 21003c9a21..e08ff1a1aa 100644 --- a/schemas/2019-03-22/Microsoft.Devices.json +++ b/schemas/2019-03-22/Microsoft.Devices.json @@ -1020,4 +1020,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2019-07-01-preview/Microsoft.Devices.json b/schemas/2019-07-01-preview/Microsoft.Devices.json index 3da388b7b1..27381adfbb 100644 --- a/schemas/2019-07-01-preview/Microsoft.Devices.json +++ b/schemas/2019-07-01-preview/Microsoft.Devices.json @@ -1100,4 +1100,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2019-11-04/Microsoft.Devices.json b/schemas/2019-11-04/Microsoft.Devices.json index 30005f66e4..f701b8fa0d 100644 --- a/schemas/2019-11-04/Microsoft.Devices.json +++ b/schemas/2019-11-04/Microsoft.Devices.json @@ -1067,4 +1067,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2020-03-01/Microsoft.Devices.json b/schemas/2020-03-01/Microsoft.Devices.json index 0ee82decf8..690f158943 100644 --- a/schemas/2020-03-01/Microsoft.Devices.json +++ b/schemas/2020-03-01/Microsoft.Devices.json @@ -1387,4 +1387,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2020-04-01/Microsoft.Devices.json b/schemas/2020-04-01/Microsoft.Devices.json index e52595b561..0e5a93d444 100644 --- a/schemas/2020-04-01/Microsoft.Devices.json +++ b/schemas/2020-04-01/Microsoft.Devices.json @@ -1387,4 +1387,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2020-06-15/Microsoft.Devices.json b/schemas/2020-06-15/Microsoft.Devices.json index 49d44331b1..3be56da387 100644 --- a/schemas/2020-06-15/Microsoft.Devices.json +++ b/schemas/2020-06-15/Microsoft.Devices.json @@ -1435,4 +1435,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2020-07-10-preview/Microsoft.Devices.json b/schemas/2020-07-10-preview/Microsoft.Devices.json index 277836e83a..02415fcccf 100644 --- a/schemas/2020-07-10-preview/Microsoft.Devices.json +++ b/schemas/2020-07-10-preview/Microsoft.Devices.json @@ -17,6 +17,16 @@ "type": "string", "description": "The Etag field is *not* required. If it is provided in the response body, it must also be provided as a header per the normal ETag convention." }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/ArmIdentity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + }, "location": { "type": "string", "description": "The resource location." @@ -219,6 +229,33 @@ } }, "definitions": { + "ArmIdentity": { + "type": "object", + "properties": { + "identityType": { + "type": "string", + "description": "Identity type. Only allowed values are SystemAssigned and UserAssigned. Comma separated if both for ex: SystemAssigned,UserAssigned" + }, + "userAssignedIdentities": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/ArmUserIdentity" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ] + } + } + }, + "ArmUserIdentity": { + "type": "object", + "properties": {} + }, "CertificateProperties": { "type": "object", "properties": { @@ -817,9 +854,30 @@ ], "description": "The IP filter rules for the IoT hub." }, + "KEKIdentity": { + "type": "object", + "properties": { + "userAssignedIdentity": { + "type": "string", + "description": "The user assigned identity." + } + }, + "description": "The properties of the KeyVault identity." + }, "KeyVaultKeyProperties": { "type": "object", "properties": { + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/KEKIdentity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The properties of the KeyVault identity." + }, "keyIdentifier": { "type": "string", "description": "The identifier of the key." @@ -1513,4 +1571,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +} diff --git a/schemas/2020-08-01/Microsoft.Devices.json b/schemas/2020-08-01/Microsoft.Devices.json index f08fba4772..bbf45e9327 100644 --- a/schemas/2020-08-01/Microsoft.Devices.json +++ b/schemas/2020-08-01/Microsoft.Devices.json @@ -1435,4 +1435,4 @@ "description": "The properties of the Azure Storage endpoint for file upload." } } -} \ No newline at end of file +}