Skip to content

fix: Microsoft.Sql model validation errors #6704

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

Merged
michaeljqzq merged 2 commits into from
Aug 1, 2019
Merged

fix: Microsoft.Sql model validation errors #6704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0feaeac
fix: Microsoft.Sql/stable/2014-04-01 model validation
nschonni Jul 23, 2019
368b591
fix: sql preview model validation errors
nschonni Jul 31, 2019
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
2 changes: 1 addition & 1 deletion ...ification/sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/blobAuditing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
"type": "boolean"
},
"isAzureMonitorTargetEnabled": {
"description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
"description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
"type": "boolean"
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...rosoft.Sql/preview/2015-05-01-preview/examples/DatabaseAzureMonitorAuditingCreateMin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"parameters": {
"properties": {
"state": "Enabled",
"IsAzureMonitorTargetEnabled": true
"isAzureMonitorTargetEnabled": true
}
}
},
Expand Down
12 changes: 3 additions & 9 deletions ...source-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/FailoverGroupDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,8 @@
"api-version": "2015-05-01-preview"
},
"responses": {
"200": {
"body": ""
},
"202": {
"body": ""
},
"204": {
"body": ""
}
"200": {},
"202": {},
"204": {}
}
}
8 changes: 2 additions & 6 deletions ...esource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/FirewallRuleDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,7 @@
"api-version": "2015-05-01-preview"
},
"responses": {
"200": {
"body": ""
},
"204": {
"body": ""
}
"200": {},
"204": {}
}
}
8 changes: 2 additions & 6 deletions ...urce-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ManagedInstanceDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@
"api-version": "2015-05-01-preview"
},
"responses": {
"200": {
"body": ""
},
"200": {},
"202": {},
"204": {
"body": ""
}
"204": {}
}
}
8 changes: 2 additions & 6 deletions .../sql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ServerDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@
"api-version": "2015-05-01-preview"
},
"responses": {
"200": {
"body": ""
},
"200": {},
"202": {},
"204": {
"body": ""
}
"204": {}
}
}
8 changes: 2 additions & 6 deletions ...l/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/ServerKeyDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@
"api-version": "2015-05-01-preview"
},
"responses": {
"200": {
"body": ""
},
"200": {},
"202": {},
"204": {
"body": ""
}
"204": {}
}
}
4 changes: 1 addition & 3 deletions ...l/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/SyncAgentCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
"type": "Microsoft.Sql/servers/syncAgents"
}
},
"202": {
"body": ""
}
"202": {}
}
}
4 changes: 1 addition & 3 deletions ...ce-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/SyncAgentCreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
"type": "Microsoft.Sql/servers/syncAgents"
}
},
"202": {
"body": ""
}
"202": {}
}
}
12 changes: 3 additions & 9 deletions ...l/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/SyncAgentDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,8 @@
"api-version": "2015-05-01-preview"
},
"responses": {
"200": {
"body": ""
},
"202": {
"body": ""
},
"204": {
"body": ""
}
"200": {},
"202": {},
"204": {}
}
}
4 changes: 1 addition & 3 deletions ...l/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/SyncAgentUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@
"type": "Microsoft.Sql/servers/syncAgents"
}
},
"202": {
"body": ""
}
"202": {}
}
}
4 changes: 1 addition & 3 deletions ...l/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/SyncGroupCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@
"type": "Microsoft.Sql/servers/databases/syncGroups"
}
},
"202": {
"body": ""
}
"202": {}
}
}
4 changes: 1 addition & 3 deletions ...ce-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/SyncGroupCreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@
"type": "Microsoft.Sql/servers/databases/syncGroups"
}
},
"202": {
"body": ""
}
"202": {}
}
}
12 changes: 3 additions & 9 deletions ...l/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/SyncGroupDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,8 @@
"api-version": "2015-05-01-preview"
},
"responses": {
"200": {
"body": ""
},
"202": {
"body": ""
},
"204": {
"body": ""
}
"200": {},
"202": {},
"204": {}
}
}
4 changes: 1 addition & 3 deletions ...ql/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/SyncGroupPatch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
"type": "Microsoft.Sql/servers/databases/syncGroups"
}
},
"202": {
"body": ""
}
"202": {}
}
}
4 changes: 1 addition & 3 deletions ...l/resource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/SyncGroupUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@
"type": "Microsoft.Sql/servers/databases/syncGroups"
}
},
"202": {
"body": ""
}
"202": {}
}
}
12 changes: 3 additions & 9 deletions .../resource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/SyncMemberDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,8 @@
"api-version": "2015-05-01-preview"
},
"responses": {
"200": {
"body": ""
},
"202": {
"body": ""
},
"204": {
"body": ""
}
"200": {},
"202": {},
"204": {}
}
}
8 changes: 2 additions & 6 deletions ...ource-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/VirtualClusterDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@
"api-version": "2015-05-01-preview"
},
"responses": {
"200": {
"body": ""
},
"200": {},
"202": {},
"204": {
"body": ""
}
"204": {}
}
}
12 changes: 3 additions & 9 deletions ...-manager/Microsoft.Sql/preview/2015-05-01-preview/examples/VirtualNetworkRulesDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,8 @@
"api-version": "2015-05-01-preview"
},
"responses": {
"200": {
"body": ""
},
"202": {
"body": ""
},
"204": {
"body": ""
}
"200": {},
"202": {},
"204": {}
}
}
8 changes: 4 additions & 4 deletions ...ification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/blobAuditing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@
"type": "boolean"
},
"isAzureMonitorTargetEnabled": {
"description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
"description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
"type": "boolean"
}
}
Expand Down Expand Up @@ -567,7 +567,7 @@
"type": "boolean"
},
"isAzureMonitorTargetEnabled": {
"description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
"description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
"type": "boolean"
}
}
Expand Down Expand Up @@ -641,7 +641,7 @@
"type": "boolean"
},
"isAzureMonitorTargetEnabled": {
"description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
"description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
"type": "boolean"
}
}
Expand Down Expand Up @@ -715,7 +715,7 @@
"type": "boolean"
},
"isAzureMonitorTargetEnabled": {
"description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'State' as 'Enabled' and 'IsAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
"description": "Specifies whether audit events are sent to Azure Monitor. \r\nIn order to send the events to Azure Monitor, specify 'state' as 'Enabled' and 'isAzureMonitorTargetEnabled' as true.\r\n\r\nWhen using REST API to configure auditing, Diagnostic Settings with 'SQLSecurityAuditEvents' diagnostic logs category on the database should be also created.\r\nNote that for server level audit you should use the 'master' database as {databaseName}.\r\n\r\nDiagnostic Settings URI format:\r\nPUT https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview\r\n\r\nFor more information, see [Diagnostic Settings REST API](https://go.microsoft.com/fwlink/?linkid=2033207)\r\nor [Diagnostic Settings PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043)\r\n",
"type": "boolean"
}
}
Expand Down
4 changes: 1 addition & 3 deletions ...ce-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/CancelDatabaseOperation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"api-version": "2017-03-01-preview"
},
"responses": {
"200": {
"body": ""
}
"200": {}
}
}
2 changes: 1 addition & 1 deletion ...rosoft.Sql/preview/2017-03-01-preview/examples/DatabaseAzureMonitorAuditingCreateMin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"parameters": {
"properties": {
"state": "Enabled",
"IsAzureMonitorTargetEnabled": true
"isAzureMonitorTargetEnabled": true
}
}
},
Expand Down
3 changes: 2 additions & 1 deletion ...-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/DatabaseRestorePointsPost.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"restorePointLabel": "mylabel"
}
}
}
},
"202": {}
}
}
8 changes: 2 additions & 6 deletions ...urce-manager/Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedDatabaseDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,8 @@
"api-version": "2017-03-01-preview"
},
"responses": {
"200": {
"body": ""
},
"200": {},
"202": {},
"204": {
"body": ""
}
"204": {}
}
}
6 changes: 3 additions & 3 deletions ...rosoft.Sql/preview/2017-03-01-preview/examples/ManagedDatabaseSecurityAlertCreateMax.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"databaseSecurityAlertPolicyResource": {
"properties": {
"state": "Enabled",
"emailAccountAdmins": "true",
"emailAccountAdmins": true,
"emailAddresses": [
"[email protected]",
"[email protected]"
Expand All @@ -33,7 +33,7 @@
"kind": "V12",
"properties": {
"state": "Enabled",
"emailAccountAdmins": "true",
"emailAccountAdmins": true,
"emailAddresses": [
"[email protected]",
"[email protected]"
Expand All @@ -56,7 +56,7 @@
"kind": "V12",
"properties": {
"state": "Enabled",
"emailAccountAdmins": "true",
"emailAccountAdmins": true,
"emailAddresses": [
"[email protected]",
"[email protected]"
Expand Down
4 changes: 2 additions & 2 deletions ...rosoft.Sql/preview/2017-03-01-preview/examples/ManagedDatabaseSecurityAlertCreateMin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"kind": "V12",
"properties": {
"state": "Enabled",
"emailAccountAdmins": "true",
"emailAccountAdmins": true,
"emailAddresses": [],
"disabledAlerts": [],
"retentionDays": 0,
Expand All @@ -38,7 +38,7 @@
"kind": "V12",
"properties": {
"state": "Enabled",
"emailAccountAdmins": "true",
"emailAccountAdmins": true,
"emailAddresses": [],
"disabledAlerts": [],
"retentionDays": 0,
Expand Down
2 changes: 1 addition & 1 deletion ...t.Sql/preview/2017-03-01-preview/examples/ManagedDatabaseSecurityAlertListByDatabase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"kind": "V12",
"properties": {
"state": "Enabled",
"emailAccountAdmins": "true",
"emailAccountAdmins": true,
"emailAddresses": [
"[email protected]",
"[email protected]"
Expand Down
4 changes: 1 addition & 3 deletions ...Microsoft.Sql/preview/2017-03-01-preview/examples/ManagedInstanceAdministratorDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@
"api-version": "2017-03-01-preview"
},
"responses": {
"200": {
"body": ""
},
"200": {},
"202": {}
}
}
Loading