Skip to content

[AutoPR sql] Add new resource to Microsoft.Sql "ServerTrustGroup". #290

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

Closed
openapi-sdkautomation wants to merge 1 commit into from
Closed

[AutoPR sql] Add new resource to Microsoft.Sql "ServerTrustGroup". #290

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
37 changes: 16 additions & 21 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 @@ -24,7 +24,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/ServerPropertiesModel"
"$ref": "#/definitions/ServerProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -160,7 +160,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/AdvisorPropertiesModel"
"$ref": "#/definitions/AdvisorProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -422,7 +422,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/AdvisorPropertiesModel"
"$ref": "#/definitions/AdvisorProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -874,7 +874,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/ElasticPoolPropertiesModel"
"$ref": "#/definitions/ElasticPoolProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -954,7 +954,7 @@
}
},
"definitions": {
"AdvisorPropertiesModel": {
"AdvisorProperties": {
"type": "object",
"properties": {
"autoExecuteValue": {
Expand Down Expand Up @@ -1032,10 +1032,7 @@
"PointInTimeRestore",
"Recovery",
"Restore",
"RestoreLongTermRetentionBackup",
"Secondary",
"RestoreExternalBackup",
"RestoreExternalBackupSecondary"
"RestoreLongTermRetentionBackup"
]
},
{
Expand Down Expand Up @@ -1191,16 +1188,14 @@
"restorePointInTime": {
"type": "string",
"format": "date-time",
"description": "Specifies the point in time (ISO8601 format) of the source database that will be restored to create the new database."
"description": "Conditional. If createMode is PointInTimeRestore, this value is required. If createMode is Restore, this value is optional. Specifies the point in time (ISO8601 format) of the source database that will be restored to create the new database. Must be greater than or equal to the source database's earliestRestoreDate value."
},
"sampleName": {
"oneOf": [
{
"type": "string",
"enum": [
"AdventureWorksLT",
"WideWorldImportersStd",
"WideWorldImportersFull"
"AdventureWorksLT"
]
},
{
Expand All @@ -1212,11 +1207,11 @@
"sourceDatabaseDeletionDate": {
"type": "string",
"format": "date-time",
"description": "Specifies the time that the database was deleted."
"description": "Conditional. If createMode is Restore and sourceDatabaseId is the deleted database's original resource id when it existed (as opposed to its current restorable dropped database id), then this value is required. Specifies the time that the database was deleted."
},
"sourceDatabaseId": {
"type": "string",
"description": "The resource identifier of the source database associated with create operation of this database."
"description": "Conditional. If createMode is Copy, NonReadableSecondary, OnlineSecondary, PointInTimeRestore, Recovery, or Restore, then this value is required. Specifies the resource ID of the source database. If createMode is NonReadableSecondary or OnlineSecondary, the name of the source database must be the same as the new database being created."
},
"zoneRedundant": {
"oneOf": [
Expand Down Expand Up @@ -1486,7 +1481,7 @@
],
"description": "The properties of a database data masking rule."
},
"ElasticPoolPropertiesModel": {
"ElasticPoolProperties": {
"type": "object",
"properties": {
"databaseDtuMax": {
Expand Down Expand Up @@ -1773,7 +1768,7 @@
],
"description": "The properties of a server secure connection policy."
},
"ServerPropertiesModel": {
"ServerProperties": {
"type": "object",
"properties": {
"administratorLogin": {
Expand Down Expand Up @@ -1860,7 +1855,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/AdvisorPropertiesModel"
"$ref": "#/definitions/AdvisorProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -2022,7 +2017,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/AdvisorPropertiesModel"
"$ref": "#/definitions/AdvisorProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -2488,7 +2483,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/ElasticPoolPropertiesModel"
"$ref": "#/definitions/ElasticPoolProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -2646,4 +2641,4 @@
"description": "Represents the properties of a database transparent data encryption."
}
}
}
}
14 changes: 7 additions & 7 deletions schemas/2015-05-01-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/SyncGroupPropertiesModel"
"$ref": "#/definitions/SyncGroupProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -292,7 +292,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/SyncMemberPropertiesModel"
"$ref": "#/definitions/SyncMemberProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -824,7 +824,7 @@
],
"description": "Read-write endpoint of the failover group instance."
},
"FirewallRuleModel": {
"FirewallRule": {
"type": "object",
"properties": {
"name": {
Expand Down Expand Up @@ -1093,7 +1093,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/SyncMemberPropertiesModel"
"$ref": "#/definitions/SyncMemberProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -1418,7 +1418,7 @@
},
"description": "Properties of an Azure SQL Database sync agent."
},
"SyncGroupPropertiesModel": {
"SyncGroupProperties": {
"type": "object",
"properties": {
"conflictResolutionPolicy": {
Expand Down Expand Up @@ -1539,7 +1539,7 @@
},
"description": "Properties of column in sync group table."
},
"SyncMemberPropertiesModel": {
"SyncMemberProperties": {
"type": "object",
"properties": {
"databaseName": {
Expand Down Expand Up @@ -1633,4 +1633,4 @@
"description": "Properties of a virtual network rule."
}
}
}
}
19 changes: 9 additions & 10 deletions schemas/2017-03-01-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/DatabasePropertiesModel"
"$ref": "#/definitions/DatabaseProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -1247,7 +1247,7 @@
],
"description": "Properties of a database blob auditing policy."
},
"DatabasePropertiesModel": {
"DatabaseProperties": {
"type": "object",
"properties": {
"catalogCollation": {
Expand All @@ -1274,17 +1274,16 @@
{
"type": "string",
"enum": [
"Copy",
"Default",
"NonReadableSecondary",
"Copy",
"Secondary",
"OnlineSecondary",
"PointInTimeRestore",
"Recovery",
"Restore",
"RestoreLongTermRetentionBackup",
"Secondary",
"Recovery",
"RestoreExternalBackup",
"RestoreExternalBackupSecondary"
"RestoreExternalBackupSecondary",
"RestoreLongTermRetentionBackup"
]
},
{
Expand Down Expand Up @@ -1840,7 +1839,7 @@
"oneOf": [
{
"type": "number",
"default": 2
"default": 2.0
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -2992,4 +2991,4 @@
"description": "Properties of a Vulnerability Assessment recurring scans."
}
}
}
}
15 changes: 7 additions & 8 deletions schemas/2017-10-01-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,17 +480,16 @@
{
"type": "string",
"enum": [
"Copy",
"Default",
"NonReadableSecondary",
"OnlineSecondary",
"Copy",
"Secondary",
"PointInTimeRestore",
"Recovery",
"Restore",
"RestoreLongTermRetentionBackup",
"Secondary",
"Recovery",
"RestoreExternalBackup",
"RestoreExternalBackupSecondary"
"RestoreExternalBackupSecondary",
"RestoreLongTermRetentionBackup",
"OnlineSecondary"
]
},
{
Expand Down Expand Up @@ -1102,4 +1101,4 @@
"description": "Properties of a Vulnerability Assessment recurring scans."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2018-06-01-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1358,4 +1358,4 @@
"description": "Properties of a Vulnerability Assessment recurring scans."
}
}
}
}
21 changes: 10 additions & 11 deletions schemas/2019-06-01-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/DatabasePropertiesModel"
"$ref": "#/definitions/DatabaseProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -507,7 +507,7 @@
],
"description": "Properties of a active directory administrator."
},
"DatabasePropertiesModel": {
"DatabaseProperties": {
"type": "object",
"properties": {
"autoPauseDelay": {
Expand Down Expand Up @@ -545,17 +545,16 @@
{
"type": "string",
"enum": [
"Copy",
"Default",
"NonReadableSecondary",
"OnlineSecondary",
"Copy",
"Secondary",
"PointInTimeRestore",
"Recovery",
"Restore",
"RestoreLongTermRetentionBackup",
"Secondary",
"Recovery",
"RestoreExternalBackup",
"RestoreExternalBackupSecondary"
"RestoreExternalBackupSecondary",
"RestoreLongTermRetentionBackup",
"OnlineSecondary"
]
},
{
Expand Down Expand Up @@ -898,7 +897,7 @@
"properties": {
"oneOf": [
{
"$ref": "#/definitions/DatabasePropertiesModel"
"$ref": "#/definitions/DatabaseProperties"
},
{
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
Expand Down Expand Up @@ -1460,4 +1459,4 @@
"description": "Workload group definition. For more information look at sys.workload_management_workload_groups (DMV)."
}
}
}
}
2 changes: 1 addition & 1 deletion schemas/2020-02-02-preview/Microsoft.Sql.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,4 +969,4 @@
"description": "An ARM Resource SKU."
}
}
}
}