Skip to content

Commit 7f877af

Browse files
adarceadarce
committed
Merges changes from 2021-10-01 into 2022-07-01.
Changes that were merged include: - Adding "object" type. - Fixing description of enableRbacAuthorization (no longer a preview feature).
1 parent d8e714e commit 7f877af

File tree

4 files changed

+122
-62
lines changed

4 files changed

+122
-62
lines changed

‎specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/common.json‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
"$ref": "#/definitions/CloudErrorBody"
1515
}
1616
},
17-
"x-ms-external": true
17+
"x-ms-external": true,
18+
"type": "object"
1819
},
1920
"CloudErrorBody": {
2021
"description": "An error response from Key Vault resource provider",
@@ -28,7 +29,8 @@
2829
"description": "User friendly error message. The message is typically localized and may vary with service version."
2930
}
3031
},
31-
"x-ms-external": true
32+
"x-ms-external": true,
33+
"type": "object"
3234
},
3335
"SystemData": {
3436
"description": "Metadata pertaining to creation and last modification of the key vault resource.",
@@ -60,7 +62,8 @@
6062
"format": "date-time",
6163
"description": "The timestamp of the key vault resource last modification (UTC)."
6264
}
63-
}
65+
},
66+
"type": "object"
6467
},
6568
"IdentityType": {
6669
"type": "string",

‎specification/keyvault/resource-manager/Microsoft.KeyVault/stable/2022-07-01/keyvault.json‎

Lines changed: 62 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1057,7 +1057,8 @@
10571057
"required": [
10581058
"name",
10591059
"family"
1060-
]
1060+
],
1061+
"type": "object"
10611062
},
10621063
"AccessPolicyEntry": {
10631064
"properties": {
@@ -1085,7 +1086,8 @@
10851086
"tenantId",
10861087
"objectId",
10871088
"permissions"
1088-
]
1089+
],
1090+
"type": "object"
10891091
},
10901092
"Permissions": {
10911093
"properties": {
@@ -1204,7 +1206,8 @@
12041206
"description": "Permissions to storage accounts"
12051207
}
12061208
},
1207-
"description": "Permissions the identity has for keys, secrets, certificates and storage."
1209+
"description": "Permissions the identity has for keys, secrets, certificates and storage.",
1210+
"type": "object"
12081211
},
12091212
"VaultProperties": {
12101213
"properties": {
@@ -1259,7 +1262,7 @@
12591262
"enableRbacAuthorization": {
12601263
"type": "boolean",
12611264
"default": false,
1262-
"description": "Property that controls how data actions are authorized. When true, the key vault will use Role Based Access Control (RBAC) for authorization of data actions, and the access policies specified in vault properties will be ignored (warning: this is a preview feature). When false, the key vault will use the access policies specified in vault properties, and any policy stored on Azure Resource Manager will be ignored. If null or not specified, the vault is created with the default value of false. Note that management actions are always authorized with RBAC."
1265+
"description": "Property that controls how data actions are authorized. When true, the key vault will use Role Based Access Control (RBAC) for authorization of data actions, and the access policies specified in vault properties will be ignored. When false, the key vault will use the access policies specified in vault properties, and any policy stored on Azure Resource Manager will be ignored. If null or not specified, the vault is created with the default value of false. Note that management actions are always authorized with RBAC."
12631266
},
12641267
"createMode": {
12651268
"type": "string",
@@ -1315,7 +1318,8 @@
13151318
"tenantId",
13161319
"sku"
13171320
],
1318-
"description": "Properties of the vault"
1321+
"description": "Properties of the vault",
1322+
"type": "object"
13191323
},
13201324
"VaultPatchProperties": {
13211325
"properties": {
@@ -1353,7 +1357,7 @@
13531357
},
13541358
"enableRbacAuthorization": {
13551359
"type": "boolean",
1356-
"description": "Property that controls how data actions are authorized. When true, the key vault will use Role Based Access Control (RBAC) for authorization of data actions, and the access policies specified in vault properties will be ignored (warning: this is a preview feature). When false, the key vault will use the access policies specified in vault properties, and any policy stored on Azure Resource Manager will be ignored. If null or not specified, the value of this property will not change."
1360+
"description": "Property that controls how data actions are authorized. When true, the key vault will use Role Based Access Control (RBAC) for authorization of data actions, and the access policies specified in vault properties will be ignored. When false, the key vault will use the access policies specified in vault properties, and any policy stored on Azure Resource Manager will be ignored. If null or not specified, the value of this property will not change."
13571361
},
13581362
"softDeleteRetentionInDays": {
13591363
"type": "integer",
@@ -1385,7 +1389,8 @@
13851389
"description": "Property to specify whether the vault will accept traffic from public internet. If set to 'disabled' all traffic except private endpoint traffic and that that originates from trusted services will be blocked. This will override the set firewall rules, meaning that even if the firewall rules are present we will not honor the rules."
13861390
}
13871391
},
1388-
"description": "Properties of the vault"
1392+
"description": "Properties of the vault",
1393+
"type": "object"
13891394
},
13901395
"VaultAccessPolicyProperties": {
13911396
"properties": {
@@ -1400,7 +1405,8 @@
14001405
"required": [
14011406
"accessPolicies"
14021407
],
1403-
"description": "Properties of the vault access policy"
1408+
"description": "Properties of the vault access policy",
1409+
"type": "object"
14041410
},
14051411
"DeletedVaultProperties": {
14061412
"properties": {
@@ -1440,7 +1446,8 @@
14401446
"description": "Purge protection status of the original vault."
14411447
}
14421448
},
1443-
"description": "Properties of the deleted vault."
1449+
"description": "Properties of the deleted vault.",
1450+
"type": "object"
14441451
},
14451452
"VaultCreateOrUpdateParameters": {
14461453
"properties": {
@@ -1465,7 +1472,8 @@
14651472
"location",
14661473
"properties"
14671474
],
1468-
"x-ms-azure-resource": true
1475+
"x-ms-azure-resource": true,
1476+
"type": "object"
14691477
},
14701478
"VaultPatchParameters": {
14711479
"properties": {
@@ -1482,7 +1490,8 @@
14821490
}
14831491
},
14841492
"description": "Parameters for creating or updating a vault",
1485-
"x-ms-azure-resource": true
1493+
"x-ms-azure-resource": true,
1494+
"type": "object"
14861495
},
14871496
"VaultAccessPolicyParameters": {
14881497
"properties": {
@@ -1515,7 +1524,8 @@
15151524
"required": [
15161525
"properties"
15171526
],
1518-
"x-ms-azure-resource": true
1527+
"x-ms-azure-resource": true,
1528+
"type": "object"
15191529
},
15201530
"Vault": {
15211531
"properties": {
@@ -1558,7 +1568,8 @@
15581568
"properties"
15591569
],
15601570
"description": "Resource information with extended details.",
1561-
"x-ms-azure-resource": true
1571+
"x-ms-azure-resource": true,
1572+
"type": "object"
15621573
},
15631574
"DeletedVault": {
15641575
"properties": {
@@ -1582,7 +1593,8 @@
15821593
"description": "Properties of the vault"
15831594
}
15841595
},
1585-
"description": "Deleted vault information with extended details."
1596+
"description": "Deleted vault information with extended details.",
1597+
"type": "object"
15861598
},
15871599
"VaultListResult": {
15881600
"properties": {
@@ -1598,7 +1610,8 @@
15981610
"description": "The URL to get the next set of vaults."
15991611
}
16001612
},
1601-
"description": "List of vaults"
1613+
"description": "List of vaults",
1614+
"type": "object"
16021615
},
16031616
"DeletedVaultListResult": {
16041617
"properties": {
@@ -1614,7 +1627,8 @@
16141627
"description": "The URL to get the next set of deleted vaults."
16151628
}
16161629
},
1617-
"description": "List of vaults"
1630+
"description": "List of vaults",
1631+
"type": "object"
16181632
},
16191633
"ResourceListResult": {
16201634
"properties": {
@@ -1630,7 +1644,8 @@
16301644
"description": "The URL to get the next set of vault resources."
16311645
}
16321646
},
1633-
"description": "List of vault resources."
1647+
"description": "List of vault resources.",
1648+
"type": "object"
16341649
},
16351650
"Resource": {
16361651
"properties": {
@@ -1664,7 +1679,8 @@
16641679
}
16651680
},
16661681
"description": "Key Vault resource",
1667-
"x-ms-azure-resource": true
1682+
"x-ms-azure-resource": true,
1683+
"type": "object"
16681684
},
16691685
"VaultCheckNameAvailabilityParameters": {
16701686
"properties": {
@@ -1688,7 +1704,8 @@
16881704
"name",
16891705
"type"
16901706
],
1691-
"description": "The parameters used to check the availability of the vault name."
1707+
"description": "The parameters used to check the availability of the vault name.",
1708+
"type": "object"
16921709
},
16931710
"CheckNameAvailabilityResult": {
16941711
"properties": {
@@ -1716,7 +1733,8 @@
17161733
"description": "An error message explaining the Reason value in more detail."
17171734
}
17181735
},
1719-
"description": "The CheckNameAvailability operation response."
1736+
"description": "The CheckNameAvailability operation response.",
1737+
"type": "object"
17201738
},
17211739
"NetworkRuleSet": {
17221740
"properties": {
@@ -1759,7 +1777,8 @@
17591777
"description": "The list of virtual network rules."
17601778
}
17611779
},
1762-
"description": "A set of rules governing the network accessibility of a vault."
1780+
"description": "A set of rules governing the network accessibility of a vault.",
1781+
"type": "object"
17631782
},
17641783
"IPRule": {
17651784
"properties": {
@@ -1771,7 +1790,8 @@
17711790
"required": [
17721791
"value"
17731792
],
1774-
"description": "A rule governing the accessibility of a vault from a specific ip address or ip range."
1793+
"description": "A rule governing the accessibility of a vault from a specific ip address or ip range.",
1794+
"type": "object"
17751795
},
17761796
"VirtualNetworkRule": {
17771797
"properties": {
@@ -1787,7 +1807,8 @@
17871807
"required": [
17881808
"id"
17891809
],
1790-
"description": "A rule governing the accessibility of a vault from a specific virtual network."
1810+
"description": "A rule governing the accessibility of a vault from a specific virtual network.",
1811+
"type": "object"
17911812
},
17921813
"PrivateEndpointConnectionItem": {
17931814
"properties": {
@@ -1805,7 +1826,8 @@
18051826
"description": "Private endpoint connection properties."
18061827
}
18071828
},
1808-
"description": "Private endpoint connection item."
1829+
"description": "Private endpoint connection item.",
1830+
"type": "object"
18091831
},
18101832
"PrivateEndpointConnection": {
18111833
"properties": {
@@ -1825,7 +1847,8 @@
18251847
}
18261848
],
18271849
"description": "Private endpoint connection resource.",
1828-
"x-ms-azure-resource": true
1850+
"x-ms-azure-resource": true,
1851+
"type": "object"
18291852
},
18301853
"PrivateEndpointConnectionListResult": {
18311854
"properties": {
@@ -1841,7 +1864,8 @@
18411864
"description": "The URL to get the next set of private endpoint connections."
18421865
}
18431866
},
1844-
"description": "List of private endpoint connections."
1867+
"description": "List of private endpoint connections.",
1868+
"type": "object"
18451869
},
18461870
"PrivateEndpointConnectionProperties": {
18471871
"properties": {
@@ -1858,7 +1882,8 @@
18581882
"description": "Provisioning state of the private endpoint connection."
18591883
}
18601884
},
1861-
"description": "Properties of the private endpoint connection resource."
1885+
"description": "Properties of the private endpoint connection resource.",
1886+
"type": "object"
18621887
},
18631888
"PrivateEndpoint": {
18641889
"properties": {
@@ -1868,7 +1893,8 @@
18681893
"description": "Full identifier of the private endpoint resource."
18691894
}
18701895
},
1871-
"description": "Private endpoint object properties."
1896+
"description": "Private endpoint object properties.",
1897+
"type": "object"
18721898
},
18731899
"PrivateLinkServiceConnectionState": {
18741900
"properties": {
@@ -1892,7 +1918,8 @@
18921918
}
18931919
}
18941920
},
1895-
"description": "An object that represents the approval state of the private link connection."
1921+
"description": "An object that represents the approval state of the private link connection.",
1922+
"type": "object"
18961923
},
18971924
"PrivateEndpointServiceConnectionStatus": {
18981925
"type": "string",
@@ -1935,7 +1962,8 @@
19351962
}
19361963
}
19371964
},
1938-
"description": "A list of private link resources"
1965+
"description": "A list of private link resources",
1966+
"type": "object"
19391967
},
19401968
"PrivateLinkResource": {
19411969
"properties": {
@@ -1950,7 +1978,8 @@
19501978
"$ref": "#/definitions/Resource"
19511979
}
19521980
],
1953-
"description": "A private link resource"
1981+
"description": "A private link resource",
1982+
"type": "object"
19541983
},
19551984
"PrivateLinkResourceProperties": {
19561985
"properties": {
@@ -1975,7 +2004,8 @@
19752004
"description": "Required DNS zone names of the the private link resource."
19762005
}
19772006
},
1978-
"description": "Properties of a private link resource."
2007+
"description": "Properties of a private link resource.",
2008+
"type": "object"
19792009
}
19802010
},
19812011
"parameters": {

0 commit comments

Comments
 (0)