diff --git a/arm-sql/2014-04-01/examples/DatabaseSecurityAlertCreateMax.json b/arm-sql/2014-04-01/examples/DatabaseSecurityAlertCreateMax.json index 37a8cefbaaf8..2d1b9706731a 100644 --- a/arm-sql/2014-04-01/examples/DatabaseSecurityAlertCreateMax.json +++ b/arm-sql/2014-04-01/examples/DatabaseSecurityAlertCreateMax.json @@ -6,7 +6,7 @@ "databaseName": "testdb", "securityAlertPolicyName": "Default", "api-version": "2014-04-01", - "databaseSecurityAlertPolicy": { + "parameters": { "properties": { "state": "Enabled", "emailAccountAdmins": "Enabled", diff --git a/arm-sql/2014-04-01/examples/DatabaseSecurityAlertCreateMin.json b/arm-sql/2014-04-01/examples/DatabaseSecurityAlertCreateMin.json index 013852889c9d..a1e002a706e1 100644 --- a/arm-sql/2014-04-01/examples/DatabaseSecurityAlertCreateMin.json +++ b/arm-sql/2014-04-01/examples/DatabaseSecurityAlertCreateMin.json @@ -6,7 +6,7 @@ "databaseName": "testdb", "securityAlertPolicyName": "Default", "api-version": "2014-04-01", - "databaseSecurityAlertPolicy": { + "parameters": { "properties": { "state": "Enabled", "storageAccountAccessKey": "sdlfkjabc+sdlfkjsdlkfsjdfLDKFTERLKFDFKLjsdfksjdflsdkfD2342309432849328476458/3RSD==", diff --git a/arm-sql/2014-04-01/examples/ImportExportOperationGetByDatabase.json b/arm-sql/2014-04-01/examples/ImportExportOperationGetByDatabase.json deleted file mode 100644 index 25559ae02571..000000000000 --- a/arm-sql/2014-04-01/examples/ImportExportOperationGetByDatabase.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-4799", - "serverName": "sqlcrudtest-5961", - "databaseName": "testdb", - "operationId": "f01d7bfe-7162-44e7-9350-f1c85ce83e4c", - "api-version": "2014-04-01", - "parameters": {} - }, - "responses": { - "200": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-5961/databases/testdb/importExportOperationResult/f01d7bfe-7162-44e7-9350-f1c85ce83e4c", - "name": "f01d7bfe-7162-44e7-9350-f1c85ce83e4c", - "type": "Microsoft.Sql/servers/databases/importExportOperationResults", - "properties": { - "requestId": "f01d7bfe-7162-44e7-9350-f1c85ce83e4c", - "requestType": "Export", - "queuedTime": "3/1/2017 12:14:25 AM", - "lastModifiedTime": "3/1/2017 12:16:33 AM", - "blobUri": "https://test.blob.core.windows.net/bacpacs/test.bacpac", - "serverName": "test", - "databaseName": "testdb", - "status": "Completed", - "errorMessage": null - } - } - } -} \ No newline at end of file diff --git a/arm-sql/2014-04-01/examples/ImportExportOperationGetByServer.json b/arm-sql/2014-04-01/examples/ImportExportOperationGetByServer.json deleted file mode 100644 index b6b96268c280..000000000000 --- a/arm-sql/2014-04-01/examples/ImportExportOperationGetByServer.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-4799", - "serverName": "sqlcrudtest-5961", - "operationId": "f01d7bfe-7162-44e7-9350-f1c85ce83e4c", - "api-version": "2014-04-01", - "parameters": {} - }, - "responses": { - "200": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-5961/importExportOperationResult/f01d7bfe-7162-44e7-9350-f1c85ce83e4c", - "name": "f01d7bfe-7162-44e7-9350-f1c85ce83e4c", - "type": "Microsoft.Sql/servers/importExportOperationResults", - "properties": { - "requestId": "f01d7bfe-7162-44e7-9350-f1c85ce83e4c", - "requestType": "Export", - "queuedTime": "3/1/2017 12:14:25 AM", - "lastModifiedTime": "3/1/2017 12:16:33 AM", - "blobUri": "https://test.blob.core.windows.net/bacpacs/test.bacpac", - "serverName": "test", - "databaseName": "testdb", - "status": "Completed", - "errorMessage": null - } - } - } -} \ No newline at end of file diff --git a/arm-sql/2014-04-01/examples/ImportExportOperationListByServer.json b/arm-sql/2014-04-01/examples/ImportExportOperationListByServer.json deleted file mode 100644 index 5b3bbbafaf61..000000000000 --- a/arm-sql/2014-04-01/examples/ImportExportOperationListByServer.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-4799", - "serverName": "sqlcrudtest-5961", - "api-version": "2014-04-01", - "parameters": {} - }, - "responses": { - "200": { - "value":[ - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-5961/importExportOperationResult/f01d7bfe-7162-44e7-9350-f1c85ce83e4c", - "name": "f01d7bfe-7162-44e7-9350-f1c85ce83e4c", - "type": "Microsoft.Sql/servers/importExportOperationResults", - "properties": { - "requestId": "f01d7bfe-7162-44e7-9350-f1c85ce83e4c", - "requestType": "Export", - "queuedTime": "3/1/2017 12:14:25 AM", - "lastModifiedTime": "3/1/2017 12:16:33 AM", - "blobUri": "https://test.blob.core.windows.net/bacpacs/test.bacpac", - "serverName": "test", - "databaseName": "testdb", - "status": "Completed", - "errorMessage": null - } - }] - } - } -} \ No newline at end of file diff --git a/arm-sql/2014-04-01/swagger/databaseSecurityAlertPolicies.json b/arm-sql/2014-04-01/swagger/databaseSecurityAlertPolicies.json index 967d8cbc8f53..5d9ab4bfd755 100644 --- a/arm-sql/2014-04-01/swagger/databaseSecurityAlertPolicies.json +++ b/arm-sql/2014-04-01/swagger/databaseSecurityAlertPolicies.json @@ -21,8 +21,8 @@ "tags": [ "SecurityAlert" ], - "description": "Gets a Threat Detection policy associated with a database.", - "operationId": "DatabaseThreatDetectionPolicies_Get", + "description": "Gets a database's threat detection policy.", + "operationId": "Databases_GetThreatDetectionPolicy", "x-ms-examples": { "Get database security alert policy": { "$ref": "../examples/DatabaseSecurityAlertGet.json" } }, @@ -63,8 +63,8 @@ "tags": [ "SecurityAlert" ], - "description": "Creates or updates a Threat Detection policy for a database.", - "operationId": "DatabaseThreatDetectionPolicies_CreateOrUpdate", + "description": "Creates or updates a database's threat detection policy.", + "operationId": "Databases_CreateOrUpdateThreatDetectionPolicy", "x-ms-examples": { "Create database security alert policy min": { "$ref": "../examples/DatabaseSecurityAlertCreateMin.json" }, "Create database security alert policy max": { "$ref": "../examples/DatabaseSecurityAlertCreateMax.json" } @@ -87,7 +87,7 @@ "type": "string" }, { - "name": "databaseSecurityAlertPolicy", + "name": "parameters", "in": "body", "description": "The database Threat Detection policy.", "required": true, @@ -120,75 +120,23 @@ } }, "definitions": { - "Resource": { - "description": "Resource properties", + "DatabaseSecurityAlertPolicy": { + "description": "Contains information about a database Threat Detection policy.", + "type": "object", "properties": { - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name" - }, - "id": { - "readOnly": true, - "type": "string", - "description": "Resource ID" - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type" - }, - "location": { - "type": "string", - "description": "Resource location" + "location":{ + "type":"string", + "x-ms-mutability":[ + "read", + "create" + ], + "description":"The geo-location where the resource lives" }, - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags" - } - }, - "required": [ - "location" - ], - "x-ms-azure-resource": true - }, - "SqlSubResource": { - "description": "Subresource properties", - "properties": { - "name": { + "kind": { "readOnly": true, "type": "string", - "description": "Resource name" + "description": "Resource kind." }, - "id": { - "readOnly": true, - "type": "string", - "description": "The resource ID." - } - } - }, - "SqlTypedSubResource": { - "description": "Subresource properties", - "properties": { - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type" - } - }, - "allOf": [ - { - "$ref": "#/definitions/SqlSubResource" - } - ] - }, - "DatabaseSecurityAlertPolicy": { - "description": "Contains information about a database Threat Detection policy.", - "type": "object", - "properties": { "properties": { "$ref": "#/definitions/DatabaseSecurityAlertPolicyProperties", "x-ms-client-flatten": true @@ -196,7 +144,7 @@ }, "allOf": [ { - "$ref": "#/definitions/SqlTypedSubResource" + "$ref": "./sql.core.json#/definitions/ProxyResource" } ] }, @@ -217,19 +165,8 @@ } }, "disabledAlerts": { - "description": "Specifies the comma-separated list of alerts that are disabled, or empty string to disable no alerts.", - "type": "string", - "enum": [ - "Sql_Injection", - "Sql_Injection_Vulnerability", - "Access_Anomaly", - "Usage_Anomaly", - "Preview" - ], - "x-ms-enum": { - "name": "SecurityAlert", - "modelAsString": true - } + "description": "Specifies the semicolon-separated list of alerts that are disabled, or empty string to disable no alerts. Possible values: Sql_Injection; Sql_Injection_Vulnerability; Access_Anomaly; Usage_Anomaly.", + "type": "string" }, "emailAddresses": { "description": "Specifies the semicolon-separated list of e-mail addresses to which the alert is sent.", @@ -252,7 +189,10 @@ }, "storageAccountAccessKey": { "description": "Specifies the identifier key of the Threat Detection audit storage account. If state is Enabled, storageAccountAccessKey is required.", - "type": "string" + "type": "string", + "x-ms-mutability": [ + "create", "update" + ] }, "retentionDays": { "format": "int32", diff --git a/arm-sql/2014-04-01/swagger/firewallRules.json b/arm-sql/2014-04-01/swagger/firewallRules.json index 1fcc21c55838..68de877f4469 100644 --- a/arm-sql/2014-04-01/swagger/firewallRules.json +++ b/arm-sql/2014-04-01/swagger/firewallRules.json @@ -21,7 +21,7 @@ "tags": [ "FirewallRules" ], - "operationId": "Servers_CreateOrUpdateFirewallRule", + "operationId": "FirewallRules_CreateOrUpdate", "description": "Creates or updates a firewall rule.", "x-ms-examples": { "Create a firewall rule max/min": { "$ref": "../examples/FirewallRuleCreate.json" }, @@ -52,7 +52,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ServerFirewallRule" + "$ref": "#/definitions/FirewallRule" }, "description": "The required parameters for creating or updating a firewall rule." } @@ -61,13 +61,13 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerFirewallRule" + "$ref": "#/definitions/FirewallRule" } }, "201": { "description": "Created", "schema": { - "$ref": "#/definitions/ServerFirewallRule" + "$ref": "#/definitions/FirewallRule" } } } @@ -76,7 +76,7 @@ "tags": [ "FirewallRules" ], - "operationId": "Servers_DeleteFirewallRule", + "operationId": "FirewallRules_Delete", "description": "Deletes a firewall rule.", "x-ms-examples": { "Delete a firewall rule": { "$ref": "../examples/FirewallRuleDelete.json" } @@ -115,7 +115,7 @@ "tags": [ "FirewallRules" ], - "operationId": "Servers_GetFirewallRule", + "operationId": "FirewallRules_Get", "description": "Gets a firewall rule.", "x-ms-examples": { "Get Firewall Rule": { "$ref": "../examples/FirewallRuleGet.json" } @@ -145,7 +145,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerFirewallRule" + "$ref": "#/definitions/FirewallRule" } } } @@ -156,7 +156,7 @@ "tags": [ "FirewallRules" ], - "operationId": "Servers_ListFirewallRules", + "operationId": "FirewallRules_ListByServer", "description": "Returns a list of firewall rules.", "x-ms-examples": { "List Firewall Rules": { "$ref": "../examples/FirewallRuleList.json" } @@ -179,7 +179,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ServerFirewallRuleListResult" + "$ref": "#/definitions/FirewallRuleListResult" } } }, @@ -190,7 +190,7 @@ } }, "definitions": { - "ServerFirewallRuleProperties": { + "FirewallRuleProperties": { "properties": { "startIpAddress": { "type": "string", @@ -204,7 +204,7 @@ "required": ["startIpAddress", "endIpAddress"], "description": "Represents the properties of a server firewall rule." }, - "ServerFirewallRule": { + "FirewallRule": { "properties": { "kind": { "type": "string", @@ -222,44 +222,29 @@ "readOnly": true }, "properties": { - "$ref": "#/definitions/ServerFirewallRuleProperties", + "$ref": "#/definitions/FirewallRuleProperties", "description": "The properties representing the resource.", "x-ms-client-flatten": true } }, "allOf": [ { - "$ref": "#/definitions/SqlSubResource" + "$ref": "./sql.core.json#/definitions/SubResource" } ], "description": "Represents a server firewall rule." }, - "ServerFirewallRuleListResult": { + "FirewallRuleListResult": { "properties": { "value": { "type": "array", "items": { - "$ref": "#/definitions/ServerFirewallRule" + "$ref": "#/definitions/FirewallRule" }, "description": "The list of server firewall rules." } }, "description": "Represents the response to a List Firewall Rules request." - }, - "SqlSubResource": { - "description": "Subresource properties", - "properties": { - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name" - }, - "id": { - "readOnly": true, - "type": "string", - "description": "The resource ID." - } - } } }, "parameters": { diff --git a/arm-sql/2014-04-01/swagger/importExport.json b/arm-sql/2014-04-01/swagger/importExport.json index 2c02effa06ab..8b0fba0eeefb 100644 --- a/arm-sql/2014-04-01/swagger/importExport.json +++ b/arm-sql/2014-04-01/swagger/importExport.json @@ -21,7 +21,7 @@ "tags": [ "ImportExport" ], - "operationId": "Servers_ImportDatabase", + "operationId": "Databases_Import", "description": "Imports a bacpac into a new database. ", "parameters": [ { @@ -41,7 +41,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ImportRequestParameters" + "$ref": "#/definitions/ImportRequest" }, "description": "The required parameters for importing a Bacpac into a database." } @@ -50,7 +50,7 @@ "201": { "description": "Created", "schema": { - "$ref": "#/definitions/ImportExportOperationResponse" + "$ref": "#/definitions/ImportExportResponse" } }, "202": { @@ -69,8 +69,8 @@ "tags": [ "ImportExport" ], - "operationId": "Databases_Import", - "description": "Imports a bacpac into an existing database. The existing database must be empty.", + "operationId": "Databases_CreateImportOperation", + "description": "Creates an import operation that imports a bacpac into an existing database. The existing database must be empty.", "parameters": [ { "$ref": "#/parameters/ApiVersionParameter" @@ -96,7 +96,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ImportExtensionRequestParameters" + "$ref": "#/definitions/ImportExtensionRequest" }, "description": "The required parameters for importing a Bacpac into a database." } @@ -105,7 +105,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ImportExportOperationResponse" + "$ref": "#/definitions/ImportExportResponse" } }, "202": { @@ -151,7 +151,7 @@ "in": "body", "required": true, "schema": { - "$ref": "#/definitions/ExportRequestParameters" + "$ref": "#/definitions/ExportRequest" }, "description": "The required parameters for exporting a database." } @@ -160,7 +160,7 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/ImportExportOperationResponse" + "$ref": "#/definitions/ImportExportResponse" } }, "202": { @@ -172,134 +172,6 @@ }, "x-ms-long-running-operation": true } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/importExportOperationResults": { - "get": { - "tags": [ - "ImportExport" - ], - "operationId": "ImportExportOperations_ListByServer", - "description": "The status of an import operation given the operation ID.", - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ImportExportOperationListResponse" - } - } - }, - "x-ms-examples": { - "List Import/Export operations by server": { "$ref": "../examples/ImportExportOperationListByServer.json" } - }, - "x-ms-pageable": { - "nextLinkName": null - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/importExportOperationResults/{operationId}": { - "get": { - "tags": [ - "ImportExport" - ], - "operationId": "ImportExportOperations_GetByServer", - "description": "The of an import operation given the operation ID.", - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "name": "operationId", - "in": "path", - "required": true, - "type": "string", - "format": "uuid", - "description": "The operation ID associated with the operation." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ImportExportOperationResponse" - } - } - }, - "x-ms-examples": { - "Get Import/Export operations by server": { "$ref": "../examples/ImportExportOperationGetByServer.json" } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/importExportOperationResults/{operationId}": { - "get": { - "tags": [ - "ImportExport" - ], - "operationId": "ImportExportOperations_GetByDatabase", - "description": "The status of an import or export operation on a database given the operation ID.", - "parameters": [ - { - "$ref": "#/parameters/ApiVersionParameter" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "name": "databaseName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the database" - }, - { - "name": "operationId", - "in": "path", - "required": true, - "type": "string", - "format": "uuid", - "description": "The operation ID associated with the operation." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ImportExportOperationResponse" - } - } - }, - "x-ms-examples": { - "Get Import/Export operations by database": { "$ref": "../examples/ImportExportOperationGetByDatabase.json" } - } - } } }, "definitions": { @@ -307,22 +179,22 @@ "properties": { "operationMode": { "type": "string", - "description": "The type of Import/Export operation being performed. This is always Import.", - "enum":["Import"], + "description": "The type of import operation being performed. This is always Import.", + "enum": ["Import"], "x-ms-enum":{ - "name": "OperationMode" + "name": "ImportOperationMode" } } }, "required": ["operationMode"], "allOf": [ { - "$ref": "#/definitions/ExportRequestParameters" + "$ref": "#/definitions/ExportRequest" } ], "description": "Represents the properties for an import operation" }, - "ImportExtensionRequestParameters": { + "ImportExtensionRequest": { "properties": { "name": { "type": "string", @@ -340,48 +212,20 @@ }, "description": "Import database parameters." }, - "ImportExportOperationListResponse": { + "ImportExportResponse": { "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/ImportExportOperationResponse" - } - } - }, - "required": ["value"], - "description": "Response for Import/Export List operation." - }, - "ImportExportOperationResponse": { - "properties": { - "id": { - "type": "string", - "readOnly": true, - "description": "The id returned from the server." - }, - "name": { - "type": "string", - "readOnly": true, - "description": "The name returned from the server." - }, - "type": { - "type": "string", - "readOnly": true, - "description": "The type returned from the server." - }, "properties": { - "allOf": [ - { - "$ref": "#/definitions/ImportExportOperationResponseProperties" - } - ], + "$ref": "#/definitions/ImportExportResponseProperties", "x-ms-client-flatten": true } }, + "allOf": [{ + "$ref": "./sql.core.json#/definitions/ProxyResource" + }], "description": "Response for Import/Export Get operation." }, - "ImportExportOperationResponseProperties": { + "ImportExportResponseProperties": { "properties": { "requestType": { "type": "string", @@ -432,7 +276,7 @@ }, "description": "Response for Import/Export Status operation." }, - "ImportRequestParameters": { + "ImportRequest": { "properties": { "databaseName": { "type": "string", @@ -440,11 +284,48 @@ }, "edition": { "type": "string", - "description": "The edition for the database being created." + "description": "The edition for the database being created.", + "enum": [ + "Web", + "Business", + "Basic", + "Standard", + "Premium", + "Free", + "Stretch", + "DataWarehouse", + "System", + "System2" + ], + "x-ms-enum": { + "name": "DatabaseEdition", + "modelAsString": true + } }, "serviceObjectiveName": { "type": "string", - "description": "The name of the service objective to assign to the database." + "description": "The name of the service objective to assign to the database.", + "enum": [ + "Basic", + "S0", + "S1", + "S2", + "S3", + "P1", + "P2", + "P3", + "P4", + "P6", + "P11", + "P15", + "System", + "System2", + "ElasticPool" + ], + "x-ms-enum": { + "modelAsString": true, + "name": "ServiceObjectiveName" + } }, "maxSizeBytes": { "type": "string", @@ -453,13 +334,13 @@ }, "allOf": [ { - "$ref": "#/definitions/ExportRequestParameters" + "$ref": "#/definitions/ExportRequest" } ], "required":["databaseName","edition","serviceObjectiveName","maxSizeBytes"], "description": "Import database parameters." }, - "ExportRequestParameters": { + "ExportRequest": { "properties": { "storageKeyType": { "type": "string", @@ -487,11 +368,12 @@ }, "authenticationType": { "type": "string", - "description": "The authentication type - if not specified, will default to SQL.", + "description": "The authentication type.", "enum": ["SQL","ADPassword"], "x-ms-enum":{ "name": "AuthenticationType" - } + }, + "default": "SQL" } }, "required":["storageKeyType","storageKey","storageUri","administratorLogin","administratorLoginPassword"], diff --git a/arm-sql/2014-04-01/swagger/replicationLinks.json b/arm-sql/2014-04-01/swagger/replicationLinks.json index 32c640b1c726..9b859f1d6e18 100644 --- a/arm-sql/2014-04-01/swagger/replicationLinks.json +++ b/arm-sql/2014-04-01/swagger/replicationLinks.json @@ -358,7 +358,7 @@ }, "allOf": [ { - "$ref": "#/definitions/SqlSubResource" + "$ref": "./sql.core.json#/definitions/SubResource" } ], "description": "Represents a database replication link." @@ -374,21 +374,6 @@ } }, "description": "Represents the response to a List database replication link request." - }, - "SqlSubResource": { - "description": "Subresource properties", - "properties": { - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name" - }, - "id": { - "readOnly": true, - "type": "string", - "description": "The resource ID." - } - } } }, "parameters": { diff --git a/arm-sql/2014-04-01/swagger/sql.core.json b/arm-sql/2014-04-01/swagger/sql.core.json index 4e8e7bb6d5cc..b77f74b58f3a 100644 --- a/arm-sql/2014-04-01/swagger/sql.core.json +++ b/arm-sql/2014-04-01/swagger/sql.core.json @@ -21,7 +21,7 @@ "tags": [ "DatabaseActivation" ], - "operationId": "Databases_PauseDataWarehouse", + "operationId": "Databases_Pause", "description": "Pauses a data warehouse.", "parameters": [ { @@ -60,7 +60,7 @@ "tags": [ "DatabaseActivation" ], - "operationId": "Databases_ResumeDataWarehouse", + "operationId": "Databases_Resume", "description": "Resumes a data warehouse.", "parameters": [ { @@ -271,11 +271,7 @@ "description": "The name of the database to be retrieved." }, { - "name": "$expand", - "in": "query", - "required": false, - "type": "string", - "description": "A comma separated list of child objects to expand in the response. Possible properties: serviceTierAdvisors, upgradeHint, transparentDataEncryption." + "$ref": "#/parameters/DatabaseExpandParameter" } ], "responses": { @@ -312,6 +308,9 @@ { "$ref": "#/parameters/ServerNameParameter" }, + { + "$ref": "#/parameters/DatabaseExpandParameter" + }, { "name": "$filter", "in": "query", @@ -493,7 +492,7 @@ "tags": [ "Servers" ], - "operationId": "Servers_GetByResourceGroup", + "operationId": "Servers_Get", "description": "Gets a server.", "x-ms-examples": { "Get Server": { "$ref": "../examples/ServerGet.json" } @@ -1033,7 +1032,7 @@ "tags": [ "RecommendedElasticPools" ], - "operationId": "RecommendedElasticPools_List", + "operationId": "RecommendedElasticPools_ListByServer", "description": "Returns recommended elastic pools.", "parameters": [ { @@ -1456,6 +1455,68 @@ } }, "definitions": { + "Resource":{ + "description":"ARM resource.", + "properties":{ + "id":{ + "readOnly":true, + "type":"string", + "description":"Resource ID." + }, + "name":{ + "readOnly":true, + "type":"string", + "description":"Resource name." + }, + "type":{ + "readOnly":true, + "type":"string", + "description":"Resource type." + } + }, + "x-ms-azure-resource": true + }, + "TrackedResource":{ + "description":"ARM tracked top level resource.", + "properties":{ + "tags":{ + "type":"object", + "additionalProperties":{ + "type":"string" + }, + "x-ms-mutability":[ + "read", + "create", + "update" + ], + "description":"Resource tags." + }, + "location":{ + "type":"string", + "x-ms-mutability":[ + "read", + "create" + ], + "description":"Resource location." + } + }, + "required":[ + "location" + ], + "allOf":[ + { + "$ref":"#/definitions/Resource" + } + ] + }, + "ProxyResource":{ + "description":"ARM proxy resource.", + "allOf":[ + { + "$ref":"#/definitions/Resource" + } + ] + }, "RecommendedElasticPoolMetric": { "properties": { "dateTime": { @@ -1481,14 +1542,14 @@ "databaseEdition": { "readOnly": true, "type": "string", - "description": "The edition of the recommended elastic pool. The ElasticPoolEditions enumeration contains all the valid editions.", + "description": "The edition of the recommended elastic pool. The ElasticPoolEdition enumeration contains all the valid editions.", "enum": [ "Basic", "Standard", "Premium" ], "x-ms-enum": { - "name": "ElasticPoolEditions", + "name": "ElasticPoolEdition", "modelAsString": true } }, @@ -1565,7 +1626,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyResource" } ], "description": "Represents a recommented elastic pool." @@ -1623,7 +1684,7 @@ "Premium" ], "x-ms-enum": { - "name": "ElasticPoolEditions", + "name": "ElasticPoolEdition", "modelAsString": true }, "x-ms-mutability": [ "create", "read" ] @@ -1666,7 +1727,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/TrackedResource" } ], "description": "Represents a database elastic pool." @@ -1804,6 +1865,14 @@ }, "ElasticPoolActivity": { "properties": { + "location":{ + "type":"string", + "x-ms-mutability":[ + "read", + "create" + ], + "description":"The geo-location where the resource lives" + }, "properties": { "$ref": "#/definitions/ElasticPoolActivityProperties", "description": "The properties representing the resource.", @@ -1812,7 +1881,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyResource" } ], "description": "Represents the activity on an elastic pool." @@ -1868,6 +1937,7 @@ "operationId": { "readOnly": true, "type": "string", + "format": "uuid", "description": "The unique operation ID." }, "percentComplete": { @@ -1917,6 +1987,14 @@ }, "ElasticPoolDatabaseActivity": { "properties": { + "location":{ + "type":"string", + "x-ms-mutability":[ + "read", + "create" + ], + "description":"The geo-location where the resource lives" + }, "properties": { "$ref": "#/definitions/ElasticPoolDatabaseActivityProperties", "description": "The properties representing the resource.", @@ -1925,7 +2003,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyResource" } ], "description": "Represents the activity on an elastic pool." @@ -2007,7 +2085,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/TrackedResource" } ], "description": "Represents a server." @@ -2025,55 +2103,6 @@ "required": ["value"], "description": "Represents the response to a get server request." }, - "UpgradeRecommendedElasticPoolProperties": { - "properties": { - "Name": { - "type": "string", - "description": "The name of the recommended elastic pool being upgraded." - }, - "Edition": { - "type": "string", - "enum": ["Basic", "Standard", "Premium"], - "description": "The target edition for the recommended elastic pool being upgraded.", - "x-ms-enum": { - "name": "TargetElasticPoolEditions" - } - }, - "Dtu": { - "type": "integer", - "format": "int32", - "description": "The DTU guarantee for the recommended elastic pool being upgraded." - }, - "StorageMb": { - "type": "integer", - "format": "int32", - "description": "The storage limit in MB for the recommended elastic pool being upgraded." - }, - "DatabaseDtuMin": { - "type": "integer", - "format": "int32", - "description": "The DTU guarantee for database for the recommended elastic pool being upgraded." - }, - "DatabaseDtuMax": { - "type": "integer", - "format": "int32", - "description": "The DTU cap for database for the recommended elastic pool being upgraded." - }, - "DatabaseCollection": { - "type": "array", - "items": { - "type": "string" - }, - "description": "The list of database names to be put in the recommended elastic pool being upgraded." - }, - "IncludeAllDatabases": { - "type": "boolean", - "description": "Gets or sets whether all databases to be put in the recommended elastic pool being upgraded." - } - }, - "required": ["Name", "Edition"], - "description": "Represents the properties of a recommended elastic pool being upgraded." - }, "RecommendedIndexProperties": { "properties": { "action": { @@ -2086,7 +2115,7 @@ ], "description": "The proposed index action. You can create a missing index, drop an unused index, or rebuild an existing index to improve its performance.", "x-ms-enum": { - "name": "RecommendedIndexActions" + "name": "RecommendedIndexAction" } }, "state": { @@ -2107,7 +2136,7 @@ "type": "string", "description": "The current recommendation state.", "x-ms-enum": { - "name": "RecommendedIndexStates" + "name": "RecommendedIndexState" } }, "created": { @@ -2133,7 +2162,7 @@ "type": "string", "description": "The type of index (CLUSTERED, NONCLUSTERED, COLUMNSTORE, CLUSTERED COLUMNSTORE)", "x-ms-enum": { - "name": "RecommendedIndexTypes" + "name": "RecommendedIndexType" } }, "schema": { @@ -2197,7 +2226,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyResource" } ], "description": "Represents a database recommended index." @@ -2212,7 +2241,7 @@ "Disabled" ], "x-ms-enum": { - "name": "TransparentDataEncryptionStates" + "name": "TransparentDataEncryptionStatus" } } }, @@ -2228,7 +2257,7 @@ }, "allOf": [ { - "$ref": "#/definitions/SqlSubResource" + "$ref": "#/definitions/SubResource" } ], "description": "Represents a database transparent data encryption ." @@ -2333,7 +2362,7 @@ }, "edition": { "type": "string", - "description": "The edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_List.\"", + "description": "The edition of the database. The DatabaseEditions enumeration contains all the valid editions. If createMode is NonReadableSecondary or OnlineSecondary, this value is ignored. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_ListByLocation.\"", "enum": [ "Web", "Business", @@ -2343,16 +2372,17 @@ "Free", "Stretch", "DataWarehouse", - "System" + "System", + "System2" ], "x-ms-enum": { - "name": "DatabaseEditions", + "name": "DatabaseEdition", "modelAsString": true } }, "maxSizeBytes": { "type": "string", - "description": "The max size of the database expressed in bytes. If createMode is not Default, this value is ignored. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_List.\"" + "description": "The max size of the database expressed in bytes. If createMode is not Default, this value is ignored. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_ListByLocation.\"" }, "requestedServiceObjectiveId": { "type": "string", @@ -2373,7 +2403,7 @@ "33d0db1f-6893-4210-99f9-463fb9b496a4", "da24338c-a6c9-46c2-a4bf-4ac95b496ae4" ], - "description": "The configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_List.\"", + "description": "The configured service level objective ID of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of currentServiceObjectiveId property. If requestedServiceObjectiveId and requestedServiceObjectiveName are both updated, the value of requestedServiceObjectiveId overrides the value of requestedServiceObjectiveName. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_ListByLocation.\"", "x-ms-enum": { "modelAsString": true, "name": "ServiceObjectiveId" @@ -2395,13 +2425,14 @@ "P11", "P15", "System", + "System2", "ElasticPool" ], "x-ms-enum": { "modelAsString": true, "name": "ServiceObjectiveName" }, - "description": "The name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_List.\"" + "description": "The name of the configured service level objective of the database. This is the service level objective that is in the process of being applied to the database. Once successfully updated, it will match the value of serviceLevelObjective property. To see possible values, query the capabilities API (/subscriptions/{subscriptionId}/providers/Microsoft.Sql/locations/{locationID}/capabilities) referred to by operationId: \"Capabilities_ListByLocation.\"" }, "serviceLevelObjective": { "readOnly": true, @@ -2420,6 +2451,7 @@ "P11", "P15", "System", + "System2", "ElasticPool" ], "x-ms-enum": { @@ -2450,14 +2482,6 @@ }, "description": "The list of service tier advisors for this database. Expanded property" }, - "schemas": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/Schema" - }, - "description": "The schemas from this database." - }, "transparentDataEncryption": { "readOnly": true, "type": "array", @@ -2521,7 +2545,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/TrackedResource" } ], "description": "Represents a database." @@ -2666,7 +2690,7 @@ }, "allOf": [ { - "$ref": "#/definitions/SqlSubResource" + "$ref": "#/definitions/SubResource" } ], "description": "Represents a Service Tier Advisor." @@ -2690,6 +2714,7 @@ "P11", "P15", "System", + "System2", "ElasticPool" ], "x-ms-enum": { @@ -2730,63 +2755,6 @@ }, "description": "Represents a Slo Usage Metric." }, - "UpgradeHint": { - "properties": { - "targetServiceLevelObjective": { - "type": "string", - "description": "TargetServiceLevelObjective for upgrade hint." - }, - "targetServiceLevelObjectiveId": { - "type": "string", - "format": "uuid", - "description": "TargetServiceLevelObjectiveId for upgrade hint." - } - }, - "description": "Represents a Upgrade Hint." - }, - "TableProperties": { - "properties": { - "tableType": { - "readOnly": true, - "type": "string", - "description": "The type of database table.", - "enum": [ - "BaseTable", - "View" - ], - "x-ms-enum": { - "name": "TableType" - } - }, - "columns": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/Column" - }, - "description": "The columns from this table." - }, - "recommendedIndexes": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/RecommendedIndex" - }, - "description": "The recommended indices for this table." - } - }, - "description": "Represents the properties of a database table." - }, - "ColumnProperties": { - "properties": { - "columnType": { - "readOnly": true, - "type": "string", - "description": "The type of database table column." - } - }, - "description": "Represents the properties of a database table column." - }, "OperationImpact": { "properties": { "name": { @@ -2814,64 +2782,6 @@ }, "description": "Represents impact of an operation, both in absolute and relative terms." }, - "Column": { - "properties": { - "properties": { - "$ref": "#/definitions/ColumnProperties", - "description": "The properties representing the resource.", - "x-ms-client-flatten": true - } - }, - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "description": "Represents a database table column." - }, - "Table": { - "properties": { - "properties": { - "$ref": "#/definitions/TableProperties", - "description": "The properties representing the resource.", - "x-ms-client-flatten": true - } - }, - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "description": "Represents a database table." - }, - "SchemaProperties": { - "properties": { - "tables": { - "readOnly": true, - "type": "array", - "items": { - "$ref": "#/definitions/Table" - }, - "description": "The tables from this database." - } - }, - "description": "Represents the properties of a database schema." - }, - "Schema": { - "properties": { - "properties": { - "$ref": "#/definitions/SchemaProperties", - "description": "The properties representing the resource.", - "x-ms-client-flatten": true - } - }, - "allOf": [ - { - "$ref": "#/definitions/Resource" - } - ], - "description": "Represents a database schema." - }, "RestorePointProperties": { "properties": { "restorePointType": { @@ -2911,7 +2821,7 @@ }, "allOf": [ { - "$ref": "#/definitions/Resource" + "$ref": "#/definitions/ProxyResource" } ], "description": "Represents a database restore point." @@ -2968,7 +2878,7 @@ "description": "Represents database metrics.", "allOf": [ { - "$ref": "#/definitions/SqlSubResource" + "$ref": "#/definitions/SubResource" } ] }, @@ -3094,7 +3004,7 @@ }, "allOf": [ { - "$ref": "#/definitions/SqlSubResource" + "$ref": "#/definitions/SubResource" } ], "description": "Represents a database service objective." @@ -3123,7 +3033,7 @@ "Decrypting" ], "x-ms-enum": { - "name": "TransparentDataEncryptionActivityStates", + "name": "TransparentDataEncryptionActivityStatus", "modelAsString": true } }, @@ -3146,7 +3056,7 @@ }, "allOf": [ { - "$ref": "#/definitions/SqlSubResource" + "$ref": "#/definitions/SubResource" } ], "description": "Represents a database transparent data encryption Scan." @@ -3164,42 +3074,7 @@ "required": ["value"], "description": "Represents the response to a list database transparent data encryption activity request." }, - "Resource": { - "description": "Resource properties", - "properties": { - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name" - }, - "id": { - "readOnly": true, - "type": "string", - "description": "Resource ID" - }, - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type" - }, - "location": { - "type": "string", - "description": "Resource location" - }, - "tags": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "Resource tags" - } - }, - "required": [ - "location" - ], - "x-ms-azure-resource": true - }, - "SqlSubResource": { + "SubResource": { "description": "Subresource properties", "properties": { "name": { @@ -3214,21 +3089,6 @@ } } }, - "SqlTypedSubResource": { - "description": "Subresource properties", - "properties": { - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type" - } - }, - "allOf": [ - { - "$ref": "#/definitions/SqlSubResource" - } - ] - }, "OperationListResult": { "description": "Result of the request to list SQL operations. It contains a list of operations and a URL link to get the next set of results.", "properties": { @@ -3303,6 +3163,14 @@ "type": "string", "description": "The name of the server.", "x-ms-parameter-location": "method" + }, + "DatabaseExpandParameter": { + "name": "$expand", + "in": "query", + "required": false, + "type": "string", + "description": "A comma separated list of child objects to expand in the response. Possible properties: serviceTierAdvisors, transparentDataEncryption.", + "x-ms-parameter-location": "method" } } } diff --git a/arm-sql/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMax.json b/arm-sql/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMax.json index 7b8a95331620..e3e2f98eb8c0 100644 --- a/arm-sql/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMax.json +++ b/arm-sql/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMax.json @@ -6,7 +6,7 @@ "databaseName": "testdb", "blobAuditingPolicyName": "Default", "api-version": "2015-05-01-preview", - "databaseBlobAuditingPolicy": { + "parameters": { "properties": { "state": "Enabled", "storageAccountAccessKey": "sdlfkjabc+sdlfkjsdlkfsjdfLDKFTERLKFDFKLjsdfksjdflsdkfD2342309432849328476458/3RSD==", @@ -28,7 +28,7 @@ "properties": { "state":"Enabled", "storageEndpoint": "https://mystorage.blob.core.windows.net", - "storageAccountAccessKey": "sdlfkjabc+sdlfkjsdlkfsjdfLDKFTERLKFDFKLjsdfksjdflsdkfD2342309432849328476458/3RSD==", + "storageAccountAccessKey": "", "retentionDays": 0, "storageAccountSubscriptionId": "00000000-1234-0000-5678-000000000000", "isStorageSecondaryKeyInUse": false, @@ -45,7 +45,7 @@ "properties": { "state":"Enabled", "storageEndpoint": "https://mystorage.blob.core.windows.net", - "storageAccountAccessKey": "sdlfkjabc+sdlfkjsdlkfsjdfLDKFTERLKFDFKLjsdfksjdflsdkfD2342309432849328476458/3RSD==", + "storageAccountAccessKey": "", "retentionDays": 0, "storageAccountSubscriptionId": "00000000-1234-0000-5678-000000000000", "isStorageSecondaryKeyInUse": false, diff --git a/arm-sql/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMin.json b/arm-sql/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMin.json index cd66aea60708..d74e832027fd 100644 --- a/arm-sql/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMin.json +++ b/arm-sql/2015-05-01-preview/examples/DatabaseBlobAuditingCreateMin.json @@ -6,7 +6,7 @@ "databaseName": "testdb", "blobAuditingPolicyName": "Default", "api-version": "2015-05-01-preview", - "databaseBlobAuditingPolicy": { + "parameters": { "properties": { "state": "Enabled", "storageAccountAccessKey": "sdlfkjabc+sdlfkjsdlkfsjdfLDKFTERLKFDFKLjsdfksjdflsdkfD2342309432849328476458/3RSD==", @@ -24,7 +24,7 @@ "properties": { "state":"Enabled", "storageEndpoint": "https://mystorage.blob.core.windows.net", - "storageAccountAccessKey": "sdlfkjabc+sdlfkjsdlkfsjdfLDKFTERLKFDFKLjsdfksjdflsdkfD2342309432849328476458/3RSD==", + "storageAccountAccessKey": "", "retentionDays": 0, "storageAccountSubscriptionId": "00000000-0000-0000-0000-000000000000", "isStorageSecondaryKeyInUse": false, @@ -41,7 +41,7 @@ "properties": { "state":"Enabled", "storageEndpoint": "https://mystorage.blob.core.windows.net", - "storageAccountAccessKey": "sdlfkjabc+sdlfkjsdlkfsjdfLDKFTERLKFDFKLjsdfksjdflsdkfD2342309432849328476458/3RSD==", + "storageAccountAccessKey": "", "retentionDays": 0, "storageAccountSubscriptionId": "00000000-0000-0000-0000-000000000000", "isStorageSecondaryKeyInUse": false, diff --git a/arm-sql/2015-05-01-preview/swagger/blobAuditingPolicies.json b/arm-sql/2015-05-01-preview/swagger/blobAuditingPolicies.json index d900933acb0c..c7b73f877a91 100644 --- a/arm-sql/2015-05-01-preview/swagger/blobAuditingPolicies.json +++ b/arm-sql/2015-05-01-preview/swagger/blobAuditingPolicies.json @@ -21,8 +21,8 @@ "tags": [ "DatabaseBlobAuditingPolicies" ], - "description": "Gets a blob auditing policy associated with a database.", - "operationId": "DatabaseBlobAuditingPolicies_Get", + "description": "Gets a database's blob auditing policy.", + "operationId": "Databases_GetBlobAuditingPolicy", "x-ms-examples": { "Get database blob auditing policy": { "$ref": "../examples/DatabaseBlobAuditingGet.json" } }, @@ -63,8 +63,8 @@ "tags": [ "DatabaseBlobAuditingPolicies" ], - "description": "Creates or updates a blob auditing policy for a database.", - "operationId": "DatabaseBlobAuditingPolicies_CreateOrUpdate", + "description": "Creates or updates a database's blob auditing policy.", + "operationId": "Databases_CreateOrUpdateBlobAuditingPolicy", "x-ms-examples": { "Create database blob auditing policy min": { "$ref": "../examples/DatabaseBlobAuditingCreateMin.json" }, "Create database blob auditing policy max": { "$ref": "../examples/DatabaseBlobAuditingCreateMax.json" } @@ -87,13 +87,13 @@ "type": "string" }, { - "name": "databaseBlobAuditingPolicy", + "name": "parameters", "in": "body", "required": true, "schema": { "$ref": "#/definitions/DatabaseBlobAuditingPolicy" }, - "description": "The name of the database blob auditing policy." + "description": "The database blob auditing policy." }, { "$ref": "#/parameters/ApiVersionParameter" @@ -120,47 +120,30 @@ } }, "definitions": { - "SqlSubResource": { - "description": "Subresource properties", - "properties": { - "name": { - "readOnly": true, - "type": "string", - "description": "Resource name" - }, - "id": { - "readOnly": true, - "type": "string", - "description": "The resource ID." - } - } - }, - "SqlTypedSubResource": { - "description": "Subresource properties", - "properties": { - "type": { - "readOnly": true, - "type": "string", - "description": "Resource type" - } - }, - "allOf": [ - { - "$ref": "#/definitions/SqlSubResource" - } - ] - }, "DatabaseBlobAuditingPolicy": { "description": "Contains information about a database Blob Auditing policy.", "type": "object", "properties": { + "location":{ + "type":"string", + "x-ms-mutability":[ + "read", + "create" + ], + "description":"The geo-location where the resource lives" + }, + "kind": { + "readOnly": true, + "type": "string", + "description": "Resource kind." + }, "properties": { "$ref": "#/definitions/DatabaseBlobAuditingPolicyProperties", "x-ms-client-flatten": true } }, "allOf": [ - { "$ref": "#/definitions/SqlTypedSubResource" } + { "$ref": "../../2014-04-01/swagger/sql.core.json#/definitions/ProxyResource" } ] }, "DatabaseBlobAuditingPolicyProperties": { @@ -184,7 +167,10 @@ }, "storageAccountAccessKey": { "description": "Specifies the identifier key of the auditing storage account. If state is Enabled, storageAccountAccessKey is required.", - "type": "string" + "type": "string", + "x-ms-mutability": [ + "create", "update" + ] }, "retentionDays": { "format": "int32",