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

Merge b67b5c8b986b4b4ca535aa3fa8622561e1b5bf37 into 88406f2eee30319a2aa6e4f1c82eaa86349def4c
AzureSDKAutomation · Feb 10, 2021 · b49d1d1 · b49d1d1
1 parent 3805152
commit b49d1d1
Show file tree

Hide file tree

Showing 6 changed files with 245 additions and 8 deletions.
diff --git a/schemas/2015-10-31/Microsoft.Automation.json b/schemas/2015-10-31/Microsoft.Automation.json
@@ -76,10 +76,10 @@
                 "$ref": "#/definitions/automationAccounts_variables_childResource"
               },
               {
-                "$ref": "#/definitions/automationAccounts_webhooks_childResource"
+                "$ref": "#/definitions/automationAccounts_watchers_childResource"
               },
               {
-                "$ref": "#/definitions/automationAccounts_watchers_childResource"
+                "$ref": "#/definitions/automationAccounts_webhooks_childResource"
               }
             ]
           }
@@ -2801,4 +2801,4 @@
       "description": "The properties of the create webhook operation."
     }
   }
-}
+}
diff --git 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."
     }
   }
-}
+}
diff --git 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."
     }
   }
-}
+}
diff --git 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."
     }
   }
-}
+}
diff --git 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."
     }
   }
-}
+}
diff --git a/schemas/2020-01-13-preview/Microsoft.Automation.json b/schemas/2020-01-13-preview/Microsoft.Automation.json
@@ -53,6 +53,9 @@
               {
                 "$ref": "#/definitions/automationAccounts_python2Packages_childResource"
               },
+              {
+                "$ref": "#/definitions/automationAccounts_nodeConfigurations_childResource"
+              },
               {
                 "$ref": "#/definitions/automationAccounts_compilationjobs_childResource"
               },
@@ -438,6 +441,60 @@
       ],
       "description": "Microsoft.Automation/automationAccounts/modules"
     },
+    "automationAccounts_nodeConfigurations": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-01-13-preview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The Dsc node configuration name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DscNodeConfigurationCreateOrUpdateParametersProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The parameter properties supplied to the create or update node configuration operation."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the tags attached to the resource."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "Microsoft.Automation/automationAccounts/nodeConfigurations"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Automation/automationAccounts/nodeConfigurations"
+    },
     "automationAccounts_privateEndpointConnections": {
       "type": "object",
       "properties": {
@@ -1201,6 +1258,60 @@
       ],
       "description": "Microsoft.Automation/automationAccounts/modules"
     },
+    "automationAccounts_nodeConfigurations_childResource": {
+      "type": "object",
+      "properties": {
+        "apiVersion": {
+          "type": "string",
+          "enum": [
+            "2020-01-13-preview"
+          ]
+        },
+        "name": {
+          "type": "string",
+          "description": "The Dsc node configuration name."
+        },
+        "properties": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DscNodeConfigurationCreateOrUpdateParametersProperties"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The parameter properties supplied to the create or update node configuration operation."
+        },
+        "tags": {
+          "oneOf": [
+            {
+              "type": "object",
+              "additionalProperties": {
+                "type": "string"
+              },
+              "properties": {}
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the tags attached to the resource."
+        },
+        "type": {
+          "type": "string",
+          "enum": [
+            "nodeConfigurations"
+          ]
+        }
+      },
+      "required": [
+        "apiVersion",
+        "name",
+        "properties",
+        "type"
+      ],
+      "description": "Microsoft.Automation/automationAccounts/nodeConfigurations"
+    },
     "automationAccounts_privateEndpointConnections_childResource": {
       "type": "object",
       "properties": {
@@ -1552,6 +1663,10 @@
       ],
       "description": "The properties of the create certificate operation."
     },
+    "Componentssgqdofschemasidentitypropertiesuserassignedidentitiesadditionalproperties": {
+      "type": "object",
+      "properties": {}
+    },
     "ConnectionCreateOrUpdateProperties": {
       "type": "object",
       "properties": {
@@ -1679,6 +1794,46 @@
       },
       "description": "Definition of the content link."
     },
+    "ContentSource": {
+      "type": "object",
+      "properties": {
+        "hash": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ContentHash"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Definition of the runbook property type."
+        },
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "embeddedContent",
+                "uri"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Gets or sets the content source type."
+        },
+        "value": {
+          "type": "string",
+          "description": "Gets or sets the value of the content. This is based on the content source type."
+        },
+        "version": {
+          "type": "string",
+          "description": "Gets or sets the version of the content."
+        }
+      },
+      "description": "Definition of the content source."
+    },
     "CredentialCreateOrUpdateProperties": {
       "type": "object",
       "properties": {
@@ -1757,9 +1912,63 @@
       },
       "description": "The Dsc configuration property associated with the entity."
     },
+    "DscNodeConfigurationCreateOrUpdateParametersProperties": {
+      "type": "object",
+      "properties": {
+        "configuration": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/DscConfigurationAssociationProperty"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The Dsc configuration property associated with the entity."
+        },
+        "incrementNodeConfigurationBuild": {
+          "oneOf": [
+            {
+              "type": "boolean"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "If a new build version of NodeConfiguration is required."
+        },
+        "source": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ContentSource"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Definition of the content source."
+        }
+      },
+      "required": [
+        "configuration",
+        "source"
+      ],
+      "description": "The parameter properties supplied to the create or update node configuration operation."
+    },
     "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": [
             {
@@ -1789,6 +1998,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": {
@@ -1833,6 +2053,8 @@
               "type": "string",
               "enum": [
                 "SystemAssigned",
+                "UserAssigned",
+                "SystemAssigned, UserAssigned",
                 "None"
               ]
             },
@@ -1841,6 +2063,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."
@@ -2316,4 +2553,4 @@
       "description": "Definition of the watcher properties"
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1047,4 +1047,4 @@ @@
           "description": "Windows specific update configuration."
         }
       }
-    }
+    }