CodeGen from PR 12928 in Azure/azure-rest-api-specs

Merge 8e0fffaaba70b55b18aecfa6189fc510cb8e5afe into a2a3da0d9f4a26b317fc15eb1cf34557c2a8d05a

Author: SDKAuto

schemas/2015-10-31/Microsoft.Automation.json

@@ -2801,4 +2801,4 @@
       "description": "The properties of the create webhook operation."
     }
   }
-}
+}

schemas/2017-05-15-preview/Microsoft.Automation.json

@@ -1047,4 +1047,4 @@
       "description": "Windows specific update configuration."
     }
   }
-}
+}

schemas/2018-01-15/Microsoft.Automation.json

@@ -276,4 +276,4 @@
       "description": "The parameter properties supplied to the create or update node configuration operation."
     }
   }
-}
+}

schemas/2018-06-30/Microsoft.Automation.json

@@ -536,4 +536,4 @@
       "description": "Definition of the runbook parameter type."
     }
   }
-}
+}

schemas/2019-06-01/Microsoft.Automation.json

@@ -3740,4 +3740,4 @@
       "description": "Windows specific update configuration."
     }
   }
-}
+}

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"
     }
   }
-}
+}