Skip to content

Commit

Permalink
Fixed/suppressed most linter warnings/errors for Microsoft.Sql (Azure…
Browse files Browse the repository at this point in the history
…#1441)

* Validation baseline

* Fixed legit TrackedResourceListByImmediateParent warnings.

* Fixed ARM resource model warnings.

Microsoft.Sql has some resource types that do not contain "type" property. We had modeled these as "SubResource". However since "type" is not required in the ProxyResource definition, we can use ProxyResource instead, which fixed various resource model related warnings.

* Removed "kind" enums.

These are not real enums because they are actually semicolon-separated lists. e.g. server kind can be "v12.0;user".

* Add example for Databases_FailoverReplicationLinkAllowDataLoss

* Added missing import/export description

* Normalize operation ids.

In some cases we are not specifically following the ARM guidelines for operation ids. This change fixes most of the inconsistent cases.

SDK breaking change.

* Added restore points examples

* Fixed model validation warnings

* Added override-info to sql readme so .net generate succeeds.

* Removed validation progress helper files
  • Loading branch information
jaredmoo authored and jhendrixMSFT committed Jul 24, 2017
1 parent 978a5f1 commit 7370412
Show file tree
Hide file tree
Showing 34 changed files with 435 additions and 328 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"DatabaseAdvisors"
],
"description": "Returns a list of database advisors.",
"operationId": "Databases_ListAdvisors",
"operationId": "DatabaseAdvisors_ListByDatabase",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
Expand Down Expand Up @@ -61,7 +61,7 @@
"DatabaseAdvisors"
],
"description": "Returns details of a Database Advisor.",
"operationId": "Databases_GetAdvisor",
"operationId": "DatabaseAdvisors_Get",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
Expand Down Expand Up @@ -101,7 +101,7 @@
"DatabaseAdvisors"
],
"description": "Creates or updates a database advisor.",
"operationId": "Databases_CreateOrUpdateAdvisor",
"operationId": "DatabaseAdvisors_CreateOrUpdate",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"tags": [
"BackupLongTermRetentionPolicies"
],
"operationId": "Databases_GetBackupLongTermRetentionPolicy",
"operationId": "BackupLongTermRetentionPolicies_Get",
"description": "Returns a database backup long term retention policy",
"x-ms-examples": {
"Get backup long term retention policy": {
Expand Down Expand Up @@ -76,7 +76,7 @@
"tags": [
"BackupLongTermRetentionPolicies"
],
"operationId": "Databases_CreateOrUpdateLongTermRetentionPolicy",
"operationId": "BackupLongTermRetentionPolicies_CreateOrUpdate",
"description": "Creates or updates a database backup long term retention policy",
"x-ms-examples": {
"Update backup long term retention policy": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"tags": [
"BackupLongTermRetentionVaults"
],
"operationId": "Servers_GetBackupLongTermRetentionVault",
"operationId": "BackupLongTermRetentionVaults_Get",
"description": "Gets a server backup long term retention vault",
"x-ms-examples": {
"Get backup long term retention vault": {
Expand Down Expand Up @@ -69,7 +69,7 @@
"tags": [
"BackupLongTermRetentionVaults"
],
"operationId": "Servers_CreateBackupLongTermRetentionVault",
"operationId": "BackupLongTermRetentionVaults_CreateOrUpdate",
"description": "Updates a server backup long term retention vault",
"x-ms-examples": {
"Update backup long term retention vault": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,12 @@
"tags": [
"DatabaseBackup"
],
"operationId": "Databases_ListRestorePoints",
"operationId": "RestorePoints_ListByDatabase",
"description": "Gets a list of database restore points.",
"x-ms-examples": {
"Get a database's restore points" : { "$ref": "./examples/DatabaseRestorePointsList.json" },
"Get a data warehouse's restore points" : { "$ref": "./examples/DataWarehouseRestorePointsList.json" }
},
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"tags": [
"ConnectionPolicies"
],
"operationId": "Servers_CreateOrUpdateConnectionPolicy",
"operationId": "ServerConnectionPolicies_CreateOrUpdate",
"description": "Creates or updates the server's connection policy.",
"x-ms-examples": {
"Create or update a server's secure connection policy": { "$ref": "./examples/ServerConnectionPolicyCreateOrUpdate.json" }
Expand Down Expand Up @@ -71,7 +71,7 @@
"tags": [
"ConnectionPolicies"
],
"operationId": "Servers_GetConnectionPolicy",
"operationId": "ServerConnectionPolicies_Get",
"description": "Gets the server's secure connection policy.",
"x-ms-examples": {
"Get a server's secure connection policy": { "$ref": "./examples/ServerConnectionPolicyGet.json" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"tags": [
"DataMaskingPolicies"
],
"operationId": "Databases_CreateOrUpdateDataMaskingPolicy",
"operationId": "DataMaskingPolicies_CreateOrUpdate",
"description": "Creates or updates a database data masking policy",
"x-ms-examples": {
"Create or update data masking policy max": { "$ref": "./examples/DataMaskingPolicyCreateOrUpdateMax.json" },
Expand Down Expand Up @@ -69,7 +69,7 @@
"tags": [
"DataMaskingPolicies"
],
"operationId": "Databases_GetDataMaskingPolicy",
"operationId": "DataMaskingPolicies_Get",
"description": "Gets a database data masking policy.",
"x-ms-examples": {
"Get data masking policy": { "$ref": "./examples/DataMaskingPolicyGet.json" }
Expand Down Expand Up @@ -109,7 +109,7 @@
"tags": [
"DataMaskingRules"
],
"operationId": "Databases_CreateOrUpdateDataMaskingRule",
"operationId": "DataMaskingRules_CreateOrUpdate",
"description": "Creates or updates a database data masking rule.",
"x-ms-examples": {
"Create/Update data masking rule for text": { "$ref": "./examples/DataMaskingRuleCreateOrUpdateText.json" },
Expand Down Expand Up @@ -174,7 +174,7 @@
"tags": [
"DataMaskingRules"
],
"operationId": "Databases_ListDataMaskingRules",
"operationId": "DataMaskingRules_ListByDatabase",
"description": "Gets a list of database data masking rules.",
"x-ms-examples": {
"List data masking rules": { "$ref": "./examples/DataMaskingRuleList.json" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"SecurityAlert"
],
"description": "Gets a database's threat detection policy.",
"operationId": "Databases_GetThreatDetectionPolicy",
"operationId": "DatabaseThreatDetectionPolicies_Get",
"x-ms-examples": {
"Get database security alert policy": { "$ref": "./examples/DatabaseSecurityAlertGet.json" }
},
Expand Down Expand Up @@ -76,7 +76,7 @@
"SecurityAlert"
],
"description": "Creates or updates a database's threat detection policy.",
"operationId": "Databases_CreateOrUpdateThreatDetectionPolicy",
"operationId": "DatabaseThreatDetectionPolicies_CreateOrUpdate",
"x-ms-examples": {
"Create database security alert policy min": { "$ref": "./examples/DatabaseSecurityAlertCreateMin.json" },
"Create database security alert policy max": { "$ref": "./examples/DatabaseSecurityAlertCreateMax.json" }
Expand Down Expand Up @@ -344,4 +344,4 @@
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"tags": [
"TransparentDataEncryption"
],
"operationId": "Databases_ListTransparentDataEncryptionConfigurations",
"operationId": "TransparentDataEncryptionConfigurations_ListByDatabase",
"description": "Gets a list of a database's transparent data encryption configurations. There is only ever one element, named 'current', so GetTransparentDataEncryptionConfiguration should be used instead.",
"deprecated": true,
"x-ms-examples": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"parameters":{
"subscriptionId":"00000000-1111-2222-3333-444444444444",
"resourceGroupName":"sqlcrudtest-6730",
"serverName":"sqlcrudtest-9007",
"databaseName":"3481",
"api-version":"2014-04-01"
},
"responses":{
"200":{
"body":{
"value":[
{
"id":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-6730/providers/Microsoft.Sql/servers/9007/databases/3481/restorepoints/131448209670000000",
"name":"131448209670000000",
"location":"West US",
"type":"Microsoft.Sql/servers/databases/restorePoints",
"properties":{
"restorePointType":"DISCRETE",
"earliestRestoreDate":null,
"restorePointCreationDate":"2017-07-18T03:09:27Z"
}
},
{
"id":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-6730/providers/Microsoft.Sql/servers/9007/databases/3481/restorepoints/131448353660000000",
"name":"131448353660000000",
"location":"West US",
"type":"Microsoft.Sql/servers/databases/restorePoints",
"properties":{
"restorePointType":"DISCRETE",
"earliestRestoreDate":null,
"restorePointCreationDate":"2017-07-18T07:09:26Z"
}
},
{
"id":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-6730/providers/Microsoft.Sql/servers/9007/databases/3481/restorepoints/131448497660000000",
"name":"131448497660000000",
"location":"West US",
"type":"Microsoft.Sql/servers/databases/restorePoints",
"properties":{
"restorePointType":"DISCRETE",
"earliestRestoreDate":null,
"restorePointCreationDate":"2017-07-18T11:09:26Z"
}
},
{
"id":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-6730/providers/Microsoft.Sql/servers/9007/databases/3481/restorepoints/131448641650000000",
"name":"131448641650000000",
"location":"West US",
"type":"Microsoft.Sql/servers/databases/restorePoints",
"properties":{
"restorePointType":"DISCRETE",
"earliestRestoreDate":null,
"restorePointCreationDate":"2017-07-18T15:09:25Z"
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"parameters":{
"subscriptionId":"00000000-1111-2222-3333-444444444444",
"resourceGroupName":"sqlcrudtest-6730",
"serverName":"sqlcrudtest-9007",
"databaseName":"3481",
"api-version":"2014-04-01"
},
"responses":{
"200":{
"body":{
"value":[
{
"id":"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-6730/providers/Microsoft.Sql/servers/sqlcrudtest-9007/databases/3481/restorepoints/ContinuousRestorePoint",
"name":"ContinuousRestorePoint",
"location":"West US",
"type":"Microsoft.Sql/servers/databases/restorePoints",
"properties":{
"restorePointType":"CONTINUOUS",
"earliestRestoreDate":"2017-06-12T00:00:00Z",
"restorePointCreationDate":null
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
"resourceGroupName": "sqlcrudtest-4799",
"serverName": "sqlcrudtest-5961",
"databaseName": "testdb",
"extensionName": "import",
"api-version": "2014-04-01",
"parameters": {
"name": "Import",
"type": "Microsoft.Sql/servers/databases/extensions",
"name": "Import",
"type": "Microsoft.Sql/servers/databases/extensions",
"properties": {
"operationMode": "Import",
"storageKeyType":"SharedAccessKey",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@
"resourceGroupName": "sqlcrudtest-4799",
"serverName": "sqlcrudtest-5961",
"databaseName": "testdb",
"extensionName": "import",
"api-version": "2014-04-01",
"parameters": {
"name": "Import",
"type": "Microsoft.Sql/servers/databases/extensions",
"name": "Import",
"type": "Microsoft.Sql/servers/databases/extensions",
"properties": {
"operationMode": "Import",
"storageKeyType": "StorageAccessKey",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"resourceGroupName": "sqlcrudtest-4799",
"serverName": "sqlcrudtest-5961",
"databaseName": "testdb",
"extensionName": "import",
"api-version": "2014-04-01",
"parameters": {
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"resourceGroupName": "sqlcrudtest-4799",
"serverName": "sqlcrudtest-5961",
"databaseName": "testdb",
"extensionName": "import",
"api-version": "2014-04-01",
"parameters": {
"properties": {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"databaseName": "testdb",
"api-version": "2014-04-01",
"parameters": {
"location": "Japan East"
}
},
"responses": {
Expand Down
Loading

0 comments on commit 7370412

Please sign in to comment.