From a126e64c363217c21d31a0783e4f7246ff6d5e6b Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 18 Feb 2021 03:54:40 +0000 Subject: [PATCH] CodeGen from PR 12928 in Azure/azure-rest-api-specs Merge a1a83dca6a2b3425e050b60447d8748641086401 into fdb32f2623c550dd4ff18a45bebbe7bd8050ae33 --- schemas/2015-10-31/Microsoft.Automation.json | 2 +- .../Microsoft.Automation.json | 2 +- schemas/2018-01-15/Microsoft.Automation.json | 2 +- schemas/2018-06-30/Microsoft.Automation.json | 2 +- schemas/2019-06-01/Microsoft.Automation.json | 2 +- .../Microsoft.Automation.json | 56 ++++++++++++++++++- 6 files changed, 60 insertions(+), 6 deletions(-) diff --git a/schemas/2015-10-31/Microsoft.Automation.json b/schemas/2015-10-31/Microsoft.Automation.json index 63fd902e7e..56c1d3aeec 100644 --- a/schemas/2015-10-31/Microsoft.Automation.json +++ b/schemas/2015-10-31/Microsoft.Automation.json @@ -2801,4 +2801,4 @@ "description": "The properties of the create webhook operation." } } -} \ No newline at end of file +} diff --git a/schemas/2017-05-15-preview/Microsoft.Automation.json b/schemas/2017-05-15-preview/Microsoft.Automation.json index 4d79c321f9..ba708dcf1f 100644 --- a/schemas/2017-05-15-preview/Microsoft.Automation.json +++ b/schemas/2017-05-15-preview/Microsoft.Automation.json @@ -1047,4 +1047,4 @@ "description": "Windows specific update configuration." } } -} \ No newline at end of file +} diff --git a/schemas/2018-01-15/Microsoft.Automation.json b/schemas/2018-01-15/Microsoft.Automation.json index 7065012a03..f7a4333431 100644 --- a/schemas/2018-01-15/Microsoft.Automation.json +++ b/schemas/2018-01-15/Microsoft.Automation.json @@ -276,4 +276,4 @@ "description": "The parameter properties supplied to the create or update node configuration operation." } } -} \ No newline at end of file +} diff --git a/schemas/2018-06-30/Microsoft.Automation.json b/schemas/2018-06-30/Microsoft.Automation.json index 4813cdb904..a605b3230f 100644 --- a/schemas/2018-06-30/Microsoft.Automation.json +++ b/schemas/2018-06-30/Microsoft.Automation.json @@ -536,4 +536,4 @@ "description": "Definition of the runbook parameter type." } } -} \ No newline at end of file +} diff --git a/schemas/2019-06-01/Microsoft.Automation.json b/schemas/2019-06-01/Microsoft.Automation.json index 26b7f651f3..1908d3ffd7 100644 --- a/schemas/2019-06-01/Microsoft.Automation.json +++ b/schemas/2019-06-01/Microsoft.Automation.json @@ -3740,4 +3740,4 @@ "description": "Windows specific update configuration." } } -} \ No newline at end of file +} diff --git a/schemas/2020-01-13-preview/Microsoft.Automation.json b/schemas/2020-01-13-preview/Microsoft.Automation.json index 9fbb9d7787..7992f8fed9 100644 --- a/schemas/2020-01-13-preview/Microsoft.Automation.json +++ b/schemas/2020-01-13-preview/Microsoft.Automation.json @@ -925,6 +925,17 @@ ], "description": "The encryption settings for automation account" }, + "publicNetworkAccess": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Indicates whether traffic on the non-ARM endpoint (Webhook/Agent) is allowed from the public internet" + }, "sku": { "oneOf": [ { @@ -1663,6 +1674,10 @@ ], "description": "The properties of the create certificate operation." }, + "Componentssgqdofschemasidentitypropertiesuserassignedidentitiesadditionalproperties": { + "type": "object", + "properties": {} + }, "ConnectionCreateOrUpdateProperties": { "type": "object", "properties": { @@ -1954,6 +1969,17 @@ "EncryptionProperties": { "type": "object", "properties": { + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/EncryptionPropertiesIdentity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "User identity used for CMK." + }, "keySource": { "oneOf": [ { @@ -1983,6 +2009,17 @@ }, "description": "The encryption settings for automation account" }, + "EncryptionPropertiesIdentity": { + "type": "object", + "properties": { + "userAssignedIdentity": { + "type": "object", + "properties": {}, + "description": "The user identity used for CMK. It will be an ARM resource id in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'." + } + }, + "description": "User identity used for CMK." + }, "FieldDefinition": { "type": "object", "properties": { @@ -2027,6 +2064,8 @@ "type": "string", "enum": [ "SystemAssigned", + "UserAssigned", + "SystemAssigned, UserAssigned", "None" ] }, @@ -2035,6 +2074,21 @@ } ], "description": "The identity type." + }, + "userAssignedIdentities": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/Componentssgqdofschemasidentitypropertiesuserassignedidentitiesadditionalproperties" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The list of user identities associated with the resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'." } }, "description": "Identity for the resource." @@ -2510,4 +2564,4 @@ "description": "Definition of the watcher properties" } } -} \ No newline at end of file +}