From 59fe68f2ed9a88c8afdb85aa2094433ecb6bfe71 Mon Sep 17 00:00:00 2001 From: Jared Moore Date: Mon, 27 Feb 2017 13:48:01 -0800 Subject: [PATCH 1/3] Added $filter param to list databases --- .../examples/DatabaseListWithFilter.json | 43 +++++++++++++++++++ arm-sql/2014-04-01/swagger/sql.core.json | 12 +++++- 2 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 arm-sql/2014-04-01/examples/DatabaseListWithFilter.json diff --git a/arm-sql/2014-04-01/examples/DatabaseListWithFilter.json b/arm-sql/2014-04-01/examples/DatabaseListWithFilter.json new file mode 100644 index 000000000000..fc41a2f6d3e3 --- /dev/null +++ b/arm-sql/2014-04-01/examples/DatabaseListWithFilter.json @@ -0,0 +1,43 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-6845", + "serverName": "sqlcrudtest-7177", + "api-version": "2014-04-01", + "$filter": "properties/edition eq 'System'" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-6845/providers/Microsoft.Sql/servers/sqlcrudtest-7177/databases/master", + "name": "master", + "type": "Microsoft.Sql/servers/databases", + "location": "Japan East", + "kind": "v12.0,system", + "properties": { + "databaseId": "e760a51c-3dce-4d8c-976b-a2b929a73e08", + "edition": "System", + "status": "Online", + "serviceLevelObjective": "System2", + "collation": "SQL_Latin1_General_CP1_CI_AS", + "maxSizeBytes": "32212254720", + "creationDate": "2017-02-10T00:59:33.483Z", + "currentServiceObjectiveId": "620323bf-2879-4807-b30d-c2e6d7b3b3aa", + "requestedServiceObjectiveId": "620323bf-2879-4807-b30d-c2e6d7b3b3aa", + "requestedServiceObjectiveName": "System2", + "sampleName": null, + "defaultSecondaryLocation": "Japan West", + "earliestRestoreDate": null, + "elasticPoolName": null, + "containmentState": 2, + "readScale": "Disabled", + "failoverGroupId": null + } + } + ] + } + } + } +} \ No newline at end of file diff --git a/arm-sql/2014-04-01/swagger/sql.core.json b/arm-sql/2014-04-01/swagger/sql.core.json index 10eb4d151b63..e69d8b7f0be8 100644 --- a/arm-sql/2014-04-01/swagger/sql.core.json +++ b/arm-sql/2014-04-01/swagger/sql.core.json @@ -275,7 +275,7 @@ "in": "query", "required": false, "type": "string", - "description": "The comma separated list of child objects to expand in the response. Possible properties: serviceTierAdvisors, upgradeHint, transparentDataEncryption." + "description": "A comma separated list of child objects to expand in the response. Possible properties: serviceTierAdvisors, upgradeHint, transparentDataEncryption." } ], "responses": { @@ -296,7 +296,8 @@ "operationId": "Databases_ListByServer", "description": "Returns a list of databases by server.", "x-ms-examples": { - "List databases by server": { "$ref": "../examples/DatabaseList.json" } + "List databases by server": { "$ref": "../examples/DatabaseList.json" }, + "List databases by server with filter": { "$ref": "../examples/DatabaseListWithFilter.json" } }, "parameters": [ { @@ -310,6 +311,13 @@ }, { "$ref": "#/parameters/ServerNameParameter" + }, + { + "name": "$filter", + "in": "query", + "required": false, + "type": "string", + "description": "An OData filter expression that describes a subset of databases to return." } ], "responses": { From 95602504738845068320e0ef71248fd90fae5f36 Mon Sep 17 00:00:00 2001 From: Jared Moore Date: Mon, 27 Feb 2017 17:51:25 -0800 Subject: [PATCH 2/3] Fixed 'CreateMode' enum name capitalization --- arm-sql/2014-04-01/swagger/sql.core.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm-sql/2014-04-01/swagger/sql.core.json b/arm-sql/2014-04-01/swagger/sql.core.json index e69d8b7f0be8..9e4389a6bf1c 100644 --- a/arm-sql/2014-04-01/swagger/sql.core.json +++ b/arm-sql/2014-04-01/swagger/sql.core.json @@ -2302,7 +2302,7 @@ "Restore" ], "x-ms-enum": { - "name": "createMode", + "name": "CreateMode", "modelAsString": true }, "x-ms-mutability": [ "create" ] From 095037b5347c42221065f3e9eb3630e1698f423d Mon Sep 17 00:00:00 2001 From: Jared Moore Date: Mon, 27 Feb 2017 22:39:53 -0800 Subject: [PATCH 3/3] Tweaked list operation descriptions --- arm-sql/2014-04-01/swagger/sql.core.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arm-sql/2014-04-01/swagger/sql.core.json b/arm-sql/2014-04-01/swagger/sql.core.json index 9e4389a6bf1c..b57fb1bf2b68 100644 --- a/arm-sql/2014-04-01/swagger/sql.core.json +++ b/arm-sql/2014-04-01/swagger/sql.core.json @@ -294,7 +294,7 @@ "Databases" ], "operationId": "Databases_ListByServer", - "description": "Returns a list of databases by server.", + "description": "Returns a list of databases in a server.", "x-ms-examples": { "List databases by server": { "$ref": "../examples/DatabaseList.json" }, "List databases by server with filter": { "$ref": "../examples/DatabaseListWithFilter.json" } @@ -528,7 +528,7 @@ "Servers" ], "operationId": "Servers_ListByResourceGroup", - "description": "Returns a server.", + "description": "Returns a list of servers in a resource group.", "x-ms-examples": { "List servers by resource group": { "$ref": "../examples/ServerListByResourceGroup.json" } }, @@ -740,7 +740,7 @@ "ElasticPools" ], "operationId": "ElasticPools_ListByServer", - "description": "Returns elastic pools.", + "description": "Returns a list of elastic pools in a server.", "x-ms-examples":{ "List elastic pools": { "$ref": "../examples/ElasticPoolList.json" } }, @@ -910,7 +910,7 @@ "ElasticPools" ], "operationId": "ElasticPools_ListDatabases", - "description": "Returns a database inside of an elastic pool.", + "description": "Returns a list of databases in an elastic pool.", "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -1068,7 +1068,7 @@ "RecommendedElasticPools" ], "operationId": "RecommendedElasticPools_ListDatabases", - "description": "Returns a database inside of a recommented elastic pool.", + "description": "Returns a list of databases inside a recommented elastic pool.", "parameters": [ { "$ref": "#/parameters/ApiVersionParameter"