Skip to content

Commit b49d1d1

Browse files
author
SDKAuto
committed
CodeGen from PR 12928 in Azure/azure-rest-api-specs
Merge b67b5c8b986b4b4ca535aa3fa8622561e1b5bf37 into 88406f2eee30319a2aa6e4f1c82eaa86349def4c
1 parent 3805152 commit b49d1d1

File tree

6 files changed

+245
-8
lines changed

6 files changed

+245
-8
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,10 @@
7676
"$ref": "#/definitions/automationAccounts_variables_childResource"
7777
},
7878
{
79-
"$ref": "#/definitions/automationAccounts_webhooks_childResource"
79+
"$ref": "#/definitions/automationAccounts_watchers_childResource"
8080
},
8181
{
82-
"$ref": "#/definitions/automationAccounts_watchers_childResource"
82+
"$ref": "#/definitions/automationAccounts_webhooks_childResource"
8383
}
8484
]
8585
}
@@ -2801,4 +2801,4 @@
28012801
"description": "The properties of the create webhook operation."
28022802
}
28032803
}
2804-
}
2804+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1047,4 +1047,4 @@
10471047
"description": "Windows specific update configuration."
10481048
}
10491049
}
1050-
}
1050+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,4 +276,4 @@
276276
"description": "The parameter properties supplied to the create or update node configuration operation."
277277
}
278278
}
279-
}
279+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,4 +536,4 @@
536536
"description": "Definition of the runbook parameter type."
537537
}
538538
}
539-
}
539+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3740,4 +3740,4 @@
37403740
"description": "Windows specific update configuration."
37413741
}
37423742
}
3743-
}
3743+
}

‎schemas/2020-01-13-preview/Microsoft.Automation.json‎

Lines changed: 238 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@
5353
{
5454
"$ref": "#/definitions/automationAccounts_python2Packages_childResource"
5555
},
56+
{
57+
"$ref": "#/definitions/automationAccounts_nodeConfigurations_childResource"
58+
},
5659
{
5760
"$ref": "#/definitions/automationAccounts_compilationjobs_childResource"
5861
},
@@ -438,6 +441,60 @@
438441
],
439442
"description": "Microsoft.Automation/automationAccounts/modules"
440443
},
444+
"automationAccounts_nodeConfigurations": {
445+
"type": "object",
446+
"properties": {
447+
"apiVersion": {
448+
"type": "string",
449+
"enum": [
450+
"2020-01-13-preview"
451+
]
452+
},
453+
"name": {
454+
"type": "string",
455+
"description": "The Dsc node configuration name."
456+
},
457+
"properties": {
458+
"oneOf": [
459+
{
460+
"$ref": "#/definitions/DscNodeConfigurationCreateOrUpdateParametersProperties"
461+
},
462+
{
463+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
464+
}
465+
],
466+
"description": "The parameter properties supplied to the create or update node configuration operation."
467+
},
468+
"tags": {
469+
"oneOf": [
470+
{
471+
"type": "object",
472+
"additionalProperties": {
473+
"type": "string"
474+
},
475+
"properties": {}
476+
},
477+
{
478+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
479+
}
480+
],
481+
"description": "Gets or sets the tags attached to the resource."
482+
},
483+
"type": {
484+
"type": "string",
485+
"enum": [
486+
"Microsoft.Automation/automationAccounts/nodeConfigurations"
487+
]
488+
}
489+
},
490+
"required": [
491+
"apiVersion",
492+
"name",
493+
"properties",
494+
"type"
495+
],
496+
"description": "Microsoft.Automation/automationAccounts/nodeConfigurations"
497+
},
441498
"automationAccounts_privateEndpointConnections": {
442499
"type": "object",
443500
"properties": {
@@ -1201,6 +1258,60 @@
12011258
],
12021259
"description": "Microsoft.Automation/automationAccounts/modules"
12031260
},
1261+
"automationAccounts_nodeConfigurations_childResource": {
1262+
"type": "object",
1263+
"properties": {
1264+
"apiVersion": {
1265+
"type": "string",
1266+
"enum": [
1267+
"2020-01-13-preview"
1268+
]
1269+
},
1270+
"name": {
1271+
"type": "string",
1272+
"description": "The Dsc node configuration name."
1273+
},
1274+
"properties": {
1275+
"oneOf": [
1276+
{
1277+
"$ref": "#/definitions/DscNodeConfigurationCreateOrUpdateParametersProperties"
1278+
},
1279+
{
1280+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1281+
}
1282+
],
1283+
"description": "The parameter properties supplied to the create or update node configuration operation."
1284+
},
1285+
"tags": {
1286+
"oneOf": [
1287+
{
1288+
"type": "object",
1289+
"additionalProperties": {
1290+
"type": "string"
1291+
},
1292+
"properties": {}
1293+
},
1294+
{
1295+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1296+
}
1297+
],
1298+
"description": "Gets or sets the tags attached to the resource."
1299+
},
1300+
"type": {
1301+
"type": "string",
1302+
"enum": [
1303+
"nodeConfigurations"
1304+
]
1305+
}
1306+
},
1307+
"required": [
1308+
"apiVersion",
1309+
"name",
1310+
"properties",
1311+
"type"
1312+
],
1313+
"description": "Microsoft.Automation/automationAccounts/nodeConfigurations"
1314+
},
12041315
"automationAccounts_privateEndpointConnections_childResource": {
12051316
"type": "object",
12061317
"properties": {
@@ -1552,6 +1663,10 @@
15521663
],
15531664
"description": "The properties of the create certificate operation."
15541665
},
1666+
"Componentssgqdofschemasidentitypropertiesuserassignedidentitiesadditionalproperties": {
1667+
"type": "object",
1668+
"properties": {}
1669+
},
15551670
"ConnectionCreateOrUpdateProperties": {
15561671
"type": "object",
15571672
"properties": {
@@ -1679,6 +1794,46 @@
16791794
},
16801795
"description": "Definition of the content link."
16811796
},
1797+
"ContentSource": {
1798+
"type": "object",
1799+
"properties": {
1800+
"hash": {
1801+
"oneOf": [
1802+
{
1803+
"$ref": "#/definitions/ContentHash"
1804+
},
1805+
{
1806+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1807+
}
1808+
],
1809+
"description": "Definition of the runbook property type."
1810+
},
1811+
"type": {
1812+
"oneOf": [
1813+
{
1814+
"type": "string",
1815+
"enum": [
1816+
"embeddedContent",
1817+
"uri"
1818+
]
1819+
},
1820+
{
1821+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1822+
}
1823+
],
1824+
"description": "Gets or sets the content source type."
1825+
},
1826+
"value": {
1827+
"type": "string",
1828+
"description": "Gets or sets the value of the content. This is based on the content source type."
1829+
},
1830+
"version": {
1831+
"type": "string",
1832+
"description": "Gets or sets the version of the content."
1833+
}
1834+
},
1835+
"description": "Definition of the content source."
1836+
},
16821837
"CredentialCreateOrUpdateProperties": {
16831838
"type": "object",
16841839
"properties": {
@@ -1757,9 +1912,63 @@
17571912
},
17581913
"description": "The Dsc configuration property associated with the entity."
17591914
},
1915+
"DscNodeConfigurationCreateOrUpdateParametersProperties": {
1916+
"type": "object",
1917+
"properties": {
1918+
"configuration": {
1919+
"oneOf": [
1920+
{
1921+
"$ref": "#/definitions/DscConfigurationAssociationProperty"
1922+
},
1923+
{
1924+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1925+
}
1926+
],
1927+
"description": "The Dsc configuration property associated with the entity."
1928+
},
1929+
"incrementNodeConfigurationBuild": {
1930+
"oneOf": [
1931+
{
1932+
"type": "boolean"
1933+
},
1934+
{
1935+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1936+
}
1937+
],
1938+
"description": "If a new build version of NodeConfiguration is required."
1939+
},
1940+
"source": {
1941+
"oneOf": [
1942+
{
1943+
"$ref": "#/definitions/ContentSource"
1944+
},
1945+
{
1946+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1947+
}
1948+
],
1949+
"description": "Definition of the content source."
1950+
}
1951+
},
1952+
"required": [
1953+
"configuration",
1954+
"source"
1955+
],
1956+
"description": "The parameter properties supplied to the create or update node configuration operation."
1957+
},
17601958
"EncryptionProperties": {
17611959
"type": "object",
17621960
"properties": {
1961+
"identity": {
1962+
"oneOf": [
1963+
{
1964+
"$ref": "#/definitions/EncryptionPropertiesIdentity"
1965+
},
1966+
{
1967+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1968+
}
1969+
],
1970+
"description": "User identity used for CMK."
1971+
},
17631972
"keySource": {
17641973
"oneOf": [
17651974
{
@@ -1789,6 +1998,17 @@
17891998
},
17901999
"description": "The encryption settings for automation account"
17912000
},
2001+
"EncryptionPropertiesIdentity": {
2002+
"type": "object",
2003+
"properties": {
2004+
"userAssignedIdentity": {
2005+
"type": "object",
2006+
"properties": {},
2007+
"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}'."
2008+
}
2009+
},
2010+
"description": "User identity used for CMK."
2011+
},
17922012
"FieldDefinition": {
17932013
"type": "object",
17942014
"properties": {
@@ -1833,6 +2053,8 @@
18332053
"type": "string",
18342054
"enum": [
18352055
"SystemAssigned",
2056+
"UserAssigned",
2057+
"SystemAssigned, UserAssigned",
18362058
"None"
18372059
]
18382060
},
@@ -1841,6 +2063,21 @@
18412063
}
18422064
],
18432065
"description": "The identity type."
2066+
},
2067+
"userAssignedIdentities": {
2068+
"oneOf": [
2069+
{
2070+
"type": "object",
2071+
"additionalProperties": {
2072+
"$ref": "#/definitions/Componentssgqdofschemasidentitypropertiesuserassignedidentitiesadditionalproperties"
2073+
},
2074+
"properties": {}
2075+
},
2076+
{
2077+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2078+
}
2079+
],
2080+
"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}'."
18442081
}
18452082
},
18462083
"description": "Identity for the resource."
@@ -2316,4 +2553,4 @@
23162553
"description": "Definition of the watcher properties"
23172554
}
23182555
}
2319-
}
2556+
}

0 commit comments

Comments
 (0)