Skip to content

Commit

Permalink
Fixed inconsistent definitions for SQL 2014 apis. (#3210)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaredmoo @marstr
jaredmoo authored and marstr committed Jun 12, 2018
1 parent 9eef844 commit ad8f7e5
Show file tree
Hide file tree
Showing 32 changed files with 361 additions and 1,106 deletions.
112 changes: 0 additions & 112 deletions specification/sql/resource-manager/Microsoft.Sql/preview/2017-03-01-preview/databases.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -741,118 +741,6 @@
}
}
},
"DatabaseOperationListResult": {
"description": "The response to a list database operations request",
"type": "object",
"properties": {
"value": {
"description": "Array of results.",
"type": "array",
"items": {
"$ref": "#/definitions/DatabaseOperation"
},
"readOnly": true
},
"nextLink": {
"description": "Link to retrieve next page of results.",
"type": "string",
"readOnly": true
}
}
},
"DatabaseOperationProperties": {
"description": "The properties of a database operation.",
"type": "object",
"properties": {
"databaseName": {
"description": "The name of the database the operation is being performed on.",
"type": "string",
"readOnly": true
},
"operation": {
"description": "The name of operation.",
"type": "string",
"readOnly": true
},
"operationFriendlyName": {
"description": "The friendly name of operation.",
"type": "string",
"readOnly": true
},
"percentComplete": {
"format": "int32",
"description": "The percentage of the operation completed.",
"type": "integer",
"readOnly": true
},
"serverName": {
"description": "The name of the server.",
"type": "string",
"readOnly": true
},
"startTime": {
"format": "date-time",
"description": "The operation start time.",
"type": "string",
"readOnly": true
},
"state": {
"description": "The operation state.",
"enum": [
"Pending",
"InProgress",
"Succeeded",
"Failed",
"CancelInProgress",
"Cancelled"
],
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "ManagementOperationState",
"modelAsString": true
}
},
"errorCode": {
"format": "int32",
"description": "The operation error code.",
"type": "integer",
"readOnly": true
},
"errorDescription": {
"description": "The operation error description.",
"type": "string",
"readOnly": true
},
"errorSeverity": {
"format": "int32",
"description": "The operation error severity.",
"type": "integer",
"readOnly": true
},
"isUserError": {
"description": "Whether or not the error is a user error.",
"type": "boolean",
"readOnly": true
}
}
},
"DatabaseOperation": {
"description": "A database operation.",
"type": "object",
"allOf": [
{
"$ref": "../../../common/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
"properties": {
"$ref": "#/definitions/DatabaseOperationProperties",
"description": "Resource properties.",
"x-ms-client-flatten": true
}
}
},
"ImportExportDatabaseDefinition": {
"description": "Contains the information necessary to perform import/export operation.",
"required": [
Expand Down
66 changes: 21 additions & 45 deletions specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/advisors.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@
"operationId": "ServerAdvisors_ListByServer",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -64,7 +64,7 @@
"operationId": "ServerAdvisors_Get",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
Expand All @@ -77,10 +77,10 @@
"type": "string"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -108,7 +108,7 @@
"operationId": "ServerAdvisors_Update",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
Expand All @@ -130,10 +130,10 @@
}
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -161,7 +161,7 @@
"operationId": "ServerAdvisors_CreateOrUpdate",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
Expand All @@ -183,10 +183,10 @@
}
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand All @@ -213,7 +213,7 @@
"operationId": "DatabaseAdvisors_ListByDatabase",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
Expand All @@ -222,10 +222,10 @@
"$ref": "#/parameters/DatabaseNameParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand All @@ -252,7 +252,7 @@
"operationId": "DatabaseAdvisors_Get",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
Expand All @@ -264,10 +264,10 @@
"$ref": "#/parameters/AdvisorNameParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand All @@ -292,7 +292,7 @@
"operationId": "DatabaseAdvisors_CreateOrUpdate",
"parameters": [
{
"$ref": "#/parameters/ResourceGroupParameter"
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
Expand All @@ -313,10 +313,10 @@
}
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
}
],
"responses": {
Expand Down Expand Up @@ -424,30 +424,6 @@
}
},
"parameters": {
"SubscriptionIdParameter": {
"name": "subscriptionId",
"in": "path",
"description": "The subscription ID that identifies an Azure subscription.",
"required": true,
"type": "string",
"x-ms-parameter-location": "client"
},
"ApiVersionParameter": {
"name": "api-version",
"in": "query",
"description": "The API version to use for the request.",
"required": true,
"type": "string",
"x-ms-parameter-location": "client"
},
"ResourceGroupParameter": {
"name": "resourceGroupName",
"in": "path",
"description": "The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.",
"required": true,
"type": "string",
"x-ms-parameter-location": "method"
},
"ServerNameParameter": {
"name": "serverName",
"in": "path",
Expand Down
40 changes: 9 additions & 31 deletions ...sql/resource-manager/Microsoft.Sql/stable/2014-04-01/backupLongTermRetentionPolicies.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
},
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ResourceGroupParameter"
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
Expand Down Expand Up @@ -85,13 +85,13 @@
},
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ResourceGroupParameter"
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
Expand Down Expand Up @@ -161,13 +161,13 @@
},
"parameters": [
{
"$ref": "#/parameters/ApiVersionParameter"
"$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
"$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"$ref": "#/parameters/ResourceGroupParameter"
"$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter"
},
{
"$ref": "#/parameters/ServerNameParameter"
Expand Down Expand Up @@ -251,28 +251,6 @@
}
},
"parameters": {
"ApiVersionParameter": {
"name": "api-version",
"in": "query",
"required": true,
"type": "string",
"description": "The API version to use for the request."
},
"SubscriptionIdParameter": {
"name": "subscriptionId",
"in": "path",
"required": true,
"type": "string",
"description": "The subscription ID that identifies an Azure subscription."
},
"ResourceGroupParameter": {
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group that contains the resource. You can obtain this value from the Azure Resource Manager API or the portal.",
"x-ms-parameter-location": "method"
},
"ServerNameParameter": {
"name": "serverName",
"in": "path",
Expand Down
Loading

0 comments on commit ad8f7e5

Please sign in to comment.