Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ReleasePR sql] Add missing usage.json to v5 sdk tag #1583

Merged
1 commit merged into from
Apr 16, 2021
Merged

[ReleasePR sql] Add missing usage.json to v5 sdk tag #1583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions schemas/2014-04-01/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@
"items": {
"oneOf": [
{
"$ref": "#/definitions/servers_connectionPolicies_childResource"
"$ref": "#/definitions/servers_databases_childResource"
},
{
"$ref": "#/definitions/servers_firewallRules_childResource"
"$ref": "#/definitions/servers_elasticPools_childResource"
},
{
"$ref": "#/definitions/servers_databases_childResource"
"$ref": "#/definitions/servers_communicationLinks_childResource"
},
{
"$ref": "#/definitions/servers_elasticPools_childResource"
"$ref": "#/definitions/servers_connectionPolicies_childResource"
},
{
"$ref": "#/definitions/servers_communicationLinks_childResource"
"$ref": "#/definitions/servers_firewallRules_childResource"
},
{
"$ref": "#/definitions/servers_administrators_childResource"
Expand Down Expand Up @@ -348,9 +348,6 @@
"type": "array",
"items": {
"oneOf": [
{
"$ref": "#/definitions/servers_databases_securityAlertPolicies_childResource"
},
{
"$ref": "#/definitions/servers_databases_dataMaskingPolicies_childResource"
},
Expand All @@ -360,6 +357,9 @@
{
"$ref": "#/definitions/servers_databases_extensions_childResource"
},
{
"$ref": "#/definitions/servers_databases_securityAlertPolicies_childResource"
},
{
"$ref": "#/definitions/servers_databases_transparentDataEncryption_childResource"
},
Expand Down
153 changes: 60 additions & 93 deletions schemas/2020-08-01-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1120,9 +1120,6 @@
"type": "array",
"items": {
"oneOf": [
{
"$ref": "#/definitions/servers_databases_childResource"
},
{
"$ref": "#/definitions/servers_elasticPools_childResource"
},
Expand All @@ -1135,6 +1132,9 @@
{
"$ref": "#/definitions/servers_auditingSettings_childResource"
},
{
"$ref": "#/definitions/servers_databases_childResource"
},
{
"$ref": "#/definitions/servers_encryptionProtector_childResource"
},
Expand Down Expand Up @@ -1650,63 +1650,25 @@
"servers_databases_extensions": {
"type": "object",
"properties": {
"administratorLogin": {
"type": "string",
"description": "Administrator login name."
},
"administratorLoginPassword": {
"type": "string",
"description": "Administrator login password."
},
"apiVersion": {
"type": "string",
"enum": [
"2020-08-01-preview"
]
},
"authenticationType": {
"type": "string",
"description": "Authentication type."
},
"name": {
"type": "string"
},
"operationMode": {
"oneOf": [
{
"type": "string",
"enum": [
"PolybaseImport"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Operation Mode."
},
"storageKey": {
"type": "string",
"description": "Storage key."
},
"storageKeyType": {
"properties": {
"oneOf": [
{
"type": "string",
"enum": [
"SharedAccessKey",
"StorageAccessKey"
]
"$ref": "#/definitions/DatabaseExtensionsProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Storage key type."
},
"storageUri": {
"type": "string",
"description": "Storage Uri."
"description": "Contains the database information after successful export."
},
"type": {
"type": "string",
Expand All @@ -1718,10 +1680,7 @@
"required": [
"apiVersion",
"name",
"operationMode",
"storageKey",
"storageKeyType",
"storageUri",
"properties",
"type"
],
"description": "Microsoft.Sql/servers/databases/extensions"
Expand Down Expand Up @@ -3275,6 +3234,55 @@
],
"description": "Properties of a database blob auditing policy."
},
"DatabaseExtensionsProperties": {
"type": "object",
"properties": {
"operationMode": {
"oneOf": [
{
"type": "string",
"enum": [
"PolybaseImport"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Operation Mode."
},
"storageKey": {
"type": "string",
"description": "Storage key."
},
"storageKeyType": {
"oneOf": [
{
"type": "string",
"enum": [
"SharedAccessKey",
"StorageAccessKey"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Storage key type."
},
"storageUri": {
"type": "string",
"description": "Storage Uri."
}
},
"required": [
"operationMode",
"storageKey",
"storageKeyType",
"storageUri"
],
"description": "Contains the database information after successful export."
},
"DatabaseProperties": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -6744,63 +6752,25 @@
"servers_databases_extensions_childResource": {
"type": "object",
"properties": {
"administratorLogin": {
"type": "string",
"description": "Administrator login name."
},
"administratorLoginPassword": {
"type": "string",
"description": "Administrator login password."
},
"apiVersion": {
"type": "string",
"enum": [
"2020-08-01-preview"
]
},
"authenticationType": {
"type": "string",
"description": "Authentication type."
},
"name": {
"type": "string"
},
"operationMode": {
"oneOf": [
{
"type": "string",
"enum": [
"PolybaseImport"
]
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Operation Mode."
},
"storageKey": {
"type": "string",
"description": "Storage key."
},
"storageKeyType": {
"properties": {
"oneOf": [
{
"type": "string",
"enum": [
"SharedAccessKey",
"StorageAccessKey"
]
"$ref": "#/definitions/DatabaseExtensionsProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
}
],
"description": "Storage key type."
},
"storageUri": {
"type": "string",
"description": "Storage Uri."
"description": "Contains the database information after successful export."
},
"type": {
"type": "string",
Expand All @@ -6812,10 +6782,7 @@
"required": [
"apiVersion",
"name",
"operationMode",
"storageKey",
"storageKeyType",
"storageUri",
"properties",
"type"
],
"description": "Microsoft.Sql/servers/databases/extensions"
Expand Down
Loading