Skip to content

Commit bf1d746

Browse files
author
msftbot[bot]
authored
[ReleasePR sql] Add missing usage.json to v5 sdk tag (#1583)
Create to sync Azure/azure-rest-api-specs#13960 [ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/master...AzureSDKAutomation:sdkAuto/sql?expand=1)
2 parents b83c958 + d5acfdd commit bf1d746

File tree

4 files changed

+8968
-101
lines changed

4 files changed

+8968
-101
lines changed

‎schemas/2014-04-01/Microsoft.Sql.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@
3737
"items": {
3838
"oneOf": [
3939
{
40-
"$ref": "#/definitions/servers_connectionPolicies_childResource"
40+
"$ref": "#/definitions/servers_databases_childResource"
4141
},
4242
{
43-
"$ref": "#/definitions/servers_firewallRules_childResource"
43+
"$ref": "#/definitions/servers_elasticPools_childResource"
4444
},
4545
{
46-
"$ref": "#/definitions/servers_databases_childResource"
46+
"$ref": "#/definitions/servers_communicationLinks_childResource"
4747
},
4848
{
49-
"$ref": "#/definitions/servers_elasticPools_childResource"
49+
"$ref": "#/definitions/servers_connectionPolicies_childResource"
5050
},
5151
{
52-
"$ref": "#/definitions/servers_communicationLinks_childResource"
52+
"$ref": "#/definitions/servers_firewallRules_childResource"
5353
},
5454
{
5555
"$ref": "#/definitions/servers_administrators_childResource"
@@ -348,9 +348,6 @@
348348
"type": "array",
349349
"items": {
350350
"oneOf": [
351-
{
352-
"$ref": "#/definitions/servers_databases_securityAlertPolicies_childResource"
353-
},
354351
{
355352
"$ref": "#/definitions/servers_databases_dataMaskingPolicies_childResource"
356353
},
@@ -360,6 +357,9 @@
360357
{
361358
"$ref": "#/definitions/servers_databases_extensions_childResource"
362359
},
360+
{
361+
"$ref": "#/definitions/servers_databases_securityAlertPolicies_childResource"
362+
},
363363
{
364364
"$ref": "#/definitions/servers_databases_transparentDataEncryption_childResource"
365365
},

‎schemas/2020-08-01-preview/Microsoft.Sql.json‎

Lines changed: 60 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,9 +1120,6 @@
11201120
"type": "array",
11211121
"items": {
11221122
"oneOf": [
1123-
{
1124-
"$ref": "#/definitions/servers_databases_childResource"
1125-
},
11261123
{
11271124
"$ref": "#/definitions/servers_elasticPools_childResource"
11281125
},
@@ -1135,6 +1132,9 @@
11351132
{
11361133
"$ref": "#/definitions/servers_auditingSettings_childResource"
11371134
},
1135+
{
1136+
"$ref": "#/definitions/servers_databases_childResource"
1137+
},
11381138
{
11391139
"$ref": "#/definitions/servers_encryptionProtector_childResource"
11401140
},
@@ -1650,63 +1650,25 @@
16501650
"servers_databases_extensions": {
16511651
"type": "object",
16521652
"properties": {
1653-
"administratorLogin": {
1654-
"type": "string",
1655-
"description": "Administrator login name."
1656-
},
1657-
"administratorLoginPassword": {
1658-
"type": "string",
1659-
"description": "Administrator login password."
1660-
},
16611653
"apiVersion": {
16621654
"type": "string",
16631655
"enum": [
16641656
"2020-08-01-preview"
16651657
]
16661658
},
1667-
"authenticationType": {
1668-
"type": "string",
1669-
"description": "Authentication type."
1670-
},
16711659
"name": {
16721660
"type": "string"
16731661
},
1674-
"operationMode": {
1675-
"oneOf": [
1676-
{
1677-
"type": "string",
1678-
"enum": [
1679-
"PolybaseImport"
1680-
]
1681-
},
1682-
{
1683-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1684-
}
1685-
],
1686-
"description": "Operation Mode."
1687-
},
1688-
"storageKey": {
1689-
"type": "string",
1690-
"description": "Storage key."
1691-
},
1692-
"storageKeyType": {
1662+
"properties": {
16931663
"oneOf": [
16941664
{
1695-
"type": "string",
1696-
"enum": [
1697-
"SharedAccessKey",
1698-
"StorageAccessKey"
1699-
]
1665+
"$ref": "#/definitions/DatabaseExtensionsProperties"
17001666
},
17011667
{
17021668
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
17031669
}
17041670
],
1705-
"description": "Storage key type."
1706-
},
1707-
"storageUri": {
1708-
"type": "string",
1709-
"description": "Storage Uri."
1671+
"description": "Contains the database information after successful export."
17101672
},
17111673
"type": {
17121674
"type": "string",
@@ -1718,10 +1680,7 @@
17181680
"required": [
17191681
"apiVersion",
17201682
"name",
1721-
"operationMode",
1722-
"storageKey",
1723-
"storageKeyType",
1724-
"storageUri",
1683+
"properties",
17251684
"type"
17261685
],
17271686
"description": "Microsoft.Sql/servers/databases/extensions"
@@ -3275,6 +3234,55 @@
32753234
],
32763235
"description": "Properties of a database blob auditing policy."
32773236
},
3237+
"DatabaseExtensionsProperties": {
3238+
"type": "object",
3239+
"properties": {
3240+
"operationMode": {
3241+
"oneOf": [
3242+
{
3243+
"type": "string",
3244+
"enum": [
3245+
"PolybaseImport"
3246+
]
3247+
},
3248+
{
3249+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
3250+
}
3251+
],
3252+
"description": "Operation Mode."
3253+
},
3254+
"storageKey": {
3255+
"type": "string",
3256+
"description": "Storage key."
3257+
},
3258+
"storageKeyType": {
3259+
"oneOf": [
3260+
{
3261+
"type": "string",
3262+
"enum": [
3263+
"SharedAccessKey",
3264+
"StorageAccessKey"
3265+
]
3266+
},
3267+
{
3268+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
3269+
}
3270+
],
3271+
"description": "Storage key type."
3272+
},
3273+
"storageUri": {
3274+
"type": "string",
3275+
"description": "Storage Uri."
3276+
}
3277+
},
3278+
"required": [
3279+
"operationMode",
3280+
"storageKey",
3281+
"storageKeyType",
3282+
"storageUri"
3283+
],
3284+
"description": "Contains the database information after successful export."
3285+
},
32783286
"DatabaseProperties": {
32793287
"type": "object",
32803288
"properties": {
@@ -6744,63 +6752,25 @@
67446752
"servers_databases_extensions_childResource": {
67456753
"type": "object",
67466754
"properties": {
6747-
"administratorLogin": {
6748-
"type": "string",
6749-
"description": "Administrator login name."
6750-
},
6751-
"administratorLoginPassword": {
6752-
"type": "string",
6753-
"description": "Administrator login password."
6754-
},
67556755
"apiVersion": {
67566756
"type": "string",
67576757
"enum": [
67586758
"2020-08-01-preview"
67596759
]
67606760
},
6761-
"authenticationType": {
6762-
"type": "string",
6763-
"description": "Authentication type."
6764-
},
67656761
"name": {
67666762
"type": "string"
67676763
},
6768-
"operationMode": {
6769-
"oneOf": [
6770-
{
6771-
"type": "string",
6772-
"enum": [
6773-
"PolybaseImport"
6774-
]
6775-
},
6776-
{
6777-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
6778-
}
6779-
],
6780-
"description": "Operation Mode."
6781-
},
6782-
"storageKey": {
6783-
"type": "string",
6784-
"description": "Storage key."
6785-
},
6786-
"storageKeyType": {
6764+
"properties": {
67876765
"oneOf": [
67886766
{
6789-
"type": "string",
6790-
"enum": [
6791-
"SharedAccessKey",
6792-
"StorageAccessKey"
6793-
]
6767+
"$ref": "#/definitions/DatabaseExtensionsProperties"
67946768
},
67956769
{
67966770
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
67976771
}
67986772
],
6799-
"description": "Storage key type."
6800-
},
6801-
"storageUri": {
6802-
"type": "string",
6803-
"description": "Storage Uri."
6773+
"description": "Contains the database information after successful export."
68046774
},
68056775
"type": {
68066776
"type": "string",
@@ -6812,10 +6782,7 @@
68126782
"required": [
68136783
"apiVersion",
68146784
"name",
6815-
"operationMode",
6816-
"storageKey",
6817-
"storageKeyType",
6818-
"storageUri",
6785+
"properties",
68196786
"type"
68206787
],
68216788
"description": "Microsoft.Sql/servers/databases/extensions"

0 commit comments

Comments
 (0)