From e1d82fb9b22382652090b82d2d125c858ecbc680 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 28 Oct 2019 14:14:50 -0700 Subject: [PATCH 01/42] Add new API for Server AAD Admin --- .../2018-06-01-preview/administrators.json | 326 ++++++++++++++++++ .../examples/AdministratorCreateOrUpdate.json | 48 +++ .../examples/AdministratorDelete.json | 15 + .../examples/AdministratorGet.json | 21 ++ .../examples/AdministratorList.json | 21 ++ 5 files changed, 431 insertions(+) create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/administrators.json create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/administrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/administrators.json new file mode 100644 index 000000000000..3d88947914bb --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/administrators.json @@ -0,0 +1,326 @@ +{ + "swagger": "2.0", + "info": { + "version": "2018-06-01-preview", + "title": "SqlManagementClient", + "description": "The Azure SQL Database management API provides a RESTful set of web APIs that interact with Azure SQL Database services to manage your databases. The API enables users to create, retrieve, update, and delete databases, servers, and other entities." + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": + { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { + "get": { + "tags": [ + "ServerAzureADAdministrators" + ], + "description": "Gets a Azure Active Directory administrator.", + "operationId": "ServerAzureADAdministrators_Get", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "name": "administratorName", + "in": "path", + "description": "The name of server active directory administrator.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved a specified Azure Active Directory administrator.", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 ResourceNotFound - The requested resource was not found." + } + }, + "x-ms-examples": { + "Gets a Azure Active Directory administrator.": { + "$ref": "./examples/AdministratorGet.json" + } + } + }, + "put": { + "tags": [ + "ServerAzureADAdministrators" + ], + "description": "Creates or updates an existing Azure Active Directory administrator.", + "operationId": "ServerAzureADAdministrators_CreateOrUpdate", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "name": "administratorName", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "parameters", + "in": "body", + "description": "The requested Azure Active Directory administrator Resource state.", + "required": true, + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully updated a Azure Active Directory administrator.", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation." + }, + "202": { + "description": "Accepted" + }, + "201": { + "description": "Successfully created a Azure Active Directory administrator.", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Creates or updates an existing Azure Active Directory administrator.": { + "$ref": "./examples/AdministratorCreateOrUpdate.json" + } + } + }, + "delete": { + "tags": [ + "ServerAzureADAdministrators" + ], + "description": "Deletes the Azure Active Directory administrator with the given name.", + "operationId": "ServerAzureADAdministrators_Delete", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "name": "administratorName", + "in": "path", + "description": "The name of server active directory administrator.", + "required": true, + "type": "string" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully deleted the Azure Active Directory administrator." + }, + "default": { + "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 OperationIdNotFound - The operation with Id does not exist.\n\n * 409 OperationCancelled - The operation has been cancelled by user.\n\n * 409 OperationInterrupted - The operation on the resource could not be completed because it was interrupted by another operation on the same resource.\n\n * 500 OperationTimedOut - The operation timed out and automatically rolled back. Please retry the operation." + }, + "202": { + "description": "Accepted" + }, + "204": { + "description": "The specified Azure Active Directory administrator does not exist." + } + }, + "x-ms-long-running-operation": true, + "x-ms-examples": { + "Delete Azure Active Directory administrator.": { + "$ref": "./examples/AdministratorDelete.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators": { + "get": { + "tags": [ + "ServerAzureADAdministrators" + ], + "description": "Gets a list of Azure Active Directory administrators in a server.", + "operationId": "ServerAzureADAdministrators_ListByServer", + "parameters": [ + { + "$ref": "#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved the list of Azure Active Directory administrators.", + "schema": { + "$ref": "#/definitions/AdministratorListResult" + } + }, + "default": { + "description": "*** Error Responses: ***\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 ResourceNotFound - The requested resource was not found." + } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + }, + "x-ms-examples": { + "Gets a list of Azure Active Directory administrator.": { + "$ref": "./examples/AdministratorList.json" + } + } + } + } + }, + "definitions": { + "AdministratorProperties": { + "description": "Properties of a active directory administrator.", + "required": [ + "administratorType", + "login", + "sid" + ], + "type": "object", + "properties": { + "administratorType": { + "description": "Type of the sever administrator.", + "enum": [ + "ActiveDirectory" + ], + "type": "string", + "x-ms-enum": { + "name": "AdministratorType", + "modelAsString": true + } + }, + "login": { + "description": "Login name of the server administrator.", + "type": "string" + }, + "sid": { + "format": "uuid", + "description": "SID (object ID) of the server administrator.", + "type": "string" + }, + "tenantId": { + "format": "uuid", + "description": "Tenant ID of the administrator.", + "type": "string" + } + } + }, + "ServerAzureADAdministrator": { + "description": "Azure Active Directory administrator.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/ProxyResource" + } + ], + "properties": { + "properties": { + "$ref": "#/definitions/AdministratorProperties", + "description": "Resource properties.", + "x-ms-client-flatten": true + } + } + }, + "AdministratorListResult": { + "description": "A list of active directory administrators.", + "type": "object", + "properties": { + "value": { + "description": "Array of results.", + "type": "array", + "items": { + "$ref": "#/definitions/ServerAzureADAdministrator" + }, + "readOnly": true + }, + "nextLink": { + "description": "Link to retrieve next page of results.", + "type": "string", + "readOnly": true + } + } + } + }, + "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", + "description": "The name of the server.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + } +} \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json new file mode 100644 index 000000000000..d2f36eb921eb --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -0,0 +1,48 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "Default", + "serverName": "serverName", + "administratorName": "ActiveDirectory", + "api-version": "2018-06-01-preview", + "parameters": { + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "44444444-3333-2222-1111-000000000000", + "tenantId": "55555555-4444-3333-2222-111111111111" + } + } + }, + "responses": { + "200": { + "body": { + "location": "southeastasia", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/serverName/administrators/ActiveDirectory", + "name": "ActiveDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "44444444-3333-2222-1111-000000000000", + "tenantId": "55555555-4444-3333-2222-111111111111" + }, + "type": "Microsoft.Sql/servers/administrators" + } + }, + "201": { + "body": { + "location": "southeastasia", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/serverName/administrators/ActiveDirectory", + "name": "ActiveDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "44444444-3333-2222-1111-000000000000", + "tenantId": "55555555-4444-3333-2222-111111111111" + }, + "type": "Microsoft.Sql/servers/administrators" + } + }, + "202": {} + } +} \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json new file mode 100644 index 000000000000..5e17398854b0 --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json @@ -0,0 +1,15 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "Default-SQL-SouthEastAsia", + "serverName": "serverName", + "administratorName": "ActiveDirectory", + "api-version": "2018-06-01-preview" + }, + "responses" : { + "200" : { + "body" : "" + }, + "202" : {} + } +} diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json new file mode 100644 index 000000000000..7844d32aef37 --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "Test1", + "serverName": "serverName", + "administratorName": "ActiveDirectory", + "api-version": "2018-06-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "lastAvailableBackupDate": "2019-08-03T01:06:29.78Z" + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/serverName/administrators/ActiveDirectory", + "name": "ActiveDirectory", + "type": "Microsoft.Sql/servers/administrators" + } + } + } +} diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json new file mode 100644 index 000000000000..7844d32aef37 --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json @@ -0,0 +1,21 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "Test1", + "serverName": "serverName", + "administratorName": "ActiveDirectory", + "api-version": "2018-06-01-preview" + }, + "responses": { + "200": { + "body": { + "properties": { + "lastAvailableBackupDate": "2019-08-03T01:06:29.78Z" + }, + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/serverName/administrators/ActiveDirectory", + "name": "ActiveDirectory", + "type": "Microsoft.Sql/servers/administrators" + } + } + } +} From 5f829028ce264d38fb46e902ab51278d68fd7ac7 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 28 Oct 2019 16:12:59 -0700 Subject: [PATCH 02/42] Add new Serer AAD Admin API version --- specification/sql/resource-manager/readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 01b866a42ea2..9dd0d05b7df1 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -220,6 +220,7 @@ input-file: - Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - Microsoft.Sql/preview/2018-06-01-preview/PrivateLinkResources.json +- Microsoft.Sql/preview/2018-06-01-preview/administrators.json # Needed when there is more than one input file override-info: @@ -309,6 +310,7 @@ input-file: - Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - Microsoft.Sql/preview/2018-06-01-preview/PrivateLinkResources.json +- Microsoft.Sql/preview/2018-06-01-preview/administrators.json # Needed when there is more than one input file override-info: @@ -480,6 +482,7 @@ input-file: - ./Microsoft.Sql/preview/2018-06-01-preview/FailoverDatabases.json - ./Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - ./Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json + - ./Microsoft.Sql/preview/2018-06-01-preview/administrators.json # Needed when there is more than one input file override-info: @@ -841,6 +844,7 @@ input-file: - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/FailoverDatabases.json - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json + - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/administrators.json - $(this-folder)/./Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json - $(this-folder)/./Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json - $(this-folder)/./Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json From 5f3cc4f5a3df04b1dbddc4f3460ac6a1760b4c6f Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Tue, 29 Oct 2019 09:11:54 -0700 Subject: [PATCH 03/42] Add new API version to Server AAD Admin API --- ....json => ServerAzureADAdministrators.json} | 97 ++++++++++++++++++- 1 file changed, 95 insertions(+), 2 deletions(-) rename specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/{administrators.json => ServerAzureADAdministrators.json} (81%) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/administrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json similarity index 81% rename from specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/administrators.json rename to specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index 3d88947914bb..f578f728332c 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/administrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -15,8 +15,7 @@ "produces": [ "application/json" ], - "paths": - { + "paths": { "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { "get": { "tags": [ @@ -253,6 +252,38 @@ } } }, + "Resource": { + "description": "ARM resource.", + "type": "object", + "properties": { + "id": { + "description": "Resource ID.", + "type": "string", + "readOnly": true + }, + "name": { + "description": "Resource name.", + "type": "string", + "readOnly": true + }, + "type": { + "description": "Resource type.", + "type": "string", + "readOnly": true + } + }, + "x-ms-azure-resource": true + }, + "ProxyResource": { + "description": "ARM proxy resource.", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": {} + }, "ServerAzureADAdministrator": { "description": "Azure Active Directory administrator.", "type": "object", @@ -321,6 +352,68 @@ "required": true, "type": "string", "x-ms-parameter-location": "method" + }, + "ManagedInstanceNameParameter": { + "name": "managedInstanceName", + "in": "path", + "description": "The name of the managed instance.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "DatabaseNameParameter": { + "name": "databaseName", + "in": "path", + "description": "The name of the database.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "BlobAuditingPolicyNameParameter": { + "name": "blobAuditingPolicyName", + "in": "path", + "description": "The name of the blob auditing policy.", + "required": true, + "type": "string", + "enum": [ + "default" + ], + "x-ms-parameter-location": "method" + }, + "SqlVirtualMachineInstanceNameParameter": { + "name": "sqlVirtualMachineInstanceName", + "in": "path", + "description": "The name of the SqlVirtualMachineInstance.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "SqlVirtualMachineContainerNameParameter": { + "name": "sqlVirtualMachineContainerName", + "in": "path", + "description": "The name of the SqlVirtualMachineContainer.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + }, + "VirtualClusterNameParameter": { + "name": "virtualClusterName", + "in": "path", + "description": "The name of the virtual cluster.", + "required": true, + "type": "string", + "x-ms-parameter-location": "method" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "description": "Azure Active Directory OAuth2 Flow", + "flow": "implicit", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "scopes": { + "user_impersonation": "impersonate your user account" + } } } } \ No newline at end of file From d642f8aebef667cc0195c5e8247230b9714ee915 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Tue, 29 Oct 2019 09:56:02 -0700 Subject: [PATCH 04/42] Add new API version to Server AAD Admin API --- specification/sql/resource-manager/readme.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 9dd0d05b7df1..5cce0a554d7b 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -125,6 +125,7 @@ input-file: - Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - Microsoft.Sql/preview/2018-06-01-preview/PrivateLinkResources.json +- Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json # Needed when there is more than one input file override-info: @@ -220,7 +221,7 @@ input-file: - Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - Microsoft.Sql/preview/2018-06-01-preview/PrivateLinkResources.json -- Microsoft.Sql/preview/2018-06-01-preview/administrators.json +- Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json # Needed when there is more than one input file override-info: @@ -310,7 +311,7 @@ input-file: - Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - Microsoft.Sql/preview/2018-06-01-preview/PrivateLinkResources.json -- Microsoft.Sql/preview/2018-06-01-preview/administrators.json +- Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json # Needed when there is more than one input file override-info: @@ -482,7 +483,7 @@ input-file: - ./Microsoft.Sql/preview/2018-06-01-preview/FailoverDatabases.json - ./Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - ./Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - - ./Microsoft.Sql/preview/2018-06-01-preview/administrators.json + - ./Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json # Needed when there is more than one input file override-info: @@ -844,7 +845,7 @@ input-file: - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/FailoverDatabases.json - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/administrators.json + - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json - $(this-folder)/./Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json - $(this-folder)/./Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json - $(this-folder)/./Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json From ac7a5a508e1f5779decabe48ef9e6371ffa429e1 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 15:00:36 -0700 Subject: [PATCH 05/42] New Server AAD Admin API --- .../examples/AdministratorCreateOrUpdate.json | 45 ++++++++----------- .../examples/AdministratorDelete.json | 23 ++++++---- .../examples/AdministratorGet.json | 20 +++++---- .../examples/AdministratorList.json | 20 +++++---- 4 files changed, 54 insertions(+), 54 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index d2f36eb921eb..00910bd242d2 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -1,48 +1,39 @@ { "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "Default", - "serverName": "serverName", - "administratorName": "ActiveDirectory", - "api-version": "2018-06-01-preview", - "parameters": { + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "administratorName": "activeDirectory", + "api-version": "2014-04-01", + "properties": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", "properties": { "administratorType": "ActiveDirectory", "login": "bob@contoso.com", - "sid": "44444444-3333-2222-1111-000000000000", - "tenantId": "55555555-4444-3333-2222-111111111111" + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" } } }, "responses": { "200": { "body": { - "location": "southeastasia", - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/serverName/administrators/ActiveDirectory", - "name": "ActiveDirectory", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", "properties": { "administratorType": "ActiveDirectory", "login": "bob@contoso.com", - "sid": "44444444-3333-2222-1111-000000000000", - "tenantId": "55555555-4444-3333-2222-111111111111" - }, - "type": "Microsoft.Sql/servers/administrators" + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } } }, "201": { - "body": { - "location": "southeastasia", - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/serverName/administrators/ActiveDirectory", - "name": "ActiveDirectory", - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "44444444-3333-2222-1111-000000000000", - "tenantId": "55555555-4444-3333-2222-111111111111" - }, - "type": "Microsoft.Sql/servers/administrators" - } + "body": "Created" }, - "202": {} + "202": { + "body": "Accepted" + } } } \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json index 5e17398854b0..1b74f8c9c490 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json @@ -1,15 +1,20 @@ { "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "Default-SQL-SouthEastAsia", - "serverName": "serverName", - "administratorName": "ActiveDirectory", + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "administratorName": "activeDirectory", "api-version": "2018-06-01-preview" }, - "responses" : { - "200" : { - "body" : "" - }, - "202" : {} + "responses": { + "200": { + "body": "OK" + }, + "202": { + "body": "Accepted" + }, + "204": { + "body": "No Content" } -} + } +} \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json index 7844d32aef37..c17a66ea55c5 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json @@ -1,21 +1,23 @@ { "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "Test1", - "serverName": "serverName", - "administratorName": "ActiveDirectory", + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "administratorName": "activeDirectory", "api-version": "2018-06-01-preview" }, "responses": { "200": { "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", "properties": { - "lastAvailableBackupDate": "2019-08-03T01:06:29.78Z" - }, - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/serverName/administrators/ActiveDirectory", - "name": "ActiveDirectory", - "type": "Microsoft.Sql/servers/administrators" + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } } } } -} +} \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json index 7844d32aef37..c17a66ea55c5 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json @@ -1,21 +1,23 @@ { "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "Test1", - "serverName": "serverName", - "administratorName": "ActiveDirectory", + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "administratorName": "activeDirectory", "api-version": "2018-06-01-preview" }, "responses": { "200": { "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", "properties": { - "lastAvailableBackupDate": "2019-08-03T01:06:29.78Z" - }, - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/Default-SQL-SouthEastAsia/providers/Microsoft.Sql/servers/serverName/administrators/ActiveDirectory", - "name": "ActiveDirectory", - "type": "Microsoft.Sql/servers/administrators" + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } } } } -} +} \ No newline at end of file From 9c60c6550d8496b92527bc8db83ace5ee95768c6 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 16:16:27 -0700 Subject: [PATCH 06/42] fix examples --- .../examples/AdministratorCreateOrUpdate.json | 12 +++++++----- .../examples/AdministratorDelete.json | 3 --- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index 00910bd242d2..f692a719d909 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -8,11 +8,13 @@ "properties": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", "name": "activeDirectory", - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + "parameters": { + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } } } }, diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json index 1b74f8c9c490..214d9b42aa82 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json @@ -8,13 +8,10 @@ }, "responses": { "200": { - "body": "OK" }, "202": { - "body": "Accepted" }, "204": { - "body": "No Content" } } } \ No newline at end of file From 1ef6181f9768b3fa194d2c18a04fc25f909a3a83 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 16:25:01 -0700 Subject: [PATCH 07/42] fix AAD example errors --- .../examples/AdministratorCreateOrUpdate.json | 24 ++++++++----------- .../examples/AdministratorDelete.json | 11 ++++----- .../examples/AdministratorGet.json | 2 +- .../examples/AdministratorList.json | 23 ++++++++++-------- 4 files changed, 28 insertions(+), 32 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index f692a719d909..35ad6852242f 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -1,4 +1,4 @@ -{ +{ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", @@ -8,13 +8,13 @@ "properties": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", "name": "activeDirectory", - "parameters": { - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } + "parameters": { + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } } } }, @@ -31,11 +31,7 @@ } } }, - "201": { - "body": "Created" - }, - "202": { - "body": "Accepted" - } + "201": {}, + "202": {} } } \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json index 214d9b42aa82..469acae11a8f 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json @@ -1,4 +1,4 @@ -{ +{ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", @@ -7,11 +7,8 @@ "api-version": "2018-06-01-preview" }, "responses": { - "200": { - }, - "202": { - }, - "204": { - } + "200": {}, + "202": {}, + "204": {} } } \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json index c17a66ea55c5..d07177fbd011 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json @@ -1,4 +1,4 @@ -{ +{ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json index c17a66ea55c5..333f35b545a5 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json @@ -1,22 +1,25 @@ -{ +{ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "activeDirectory", "api-version": "2018-06-01-preview" }, "responses": { "200": { "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "activeDirectory", - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/providers/Microsoft.Sql/administrators/ActiveDirectory", + "name": "ActiveDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "DSEngAll", + "sid": "5e90ef3b-9b42-4777-819b-25c36961ea4d", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47" + } + } + ] } } } From 636dd7fc8e959e8cbac5c50ecfdaaa52f3c9f5bb Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 16:34:35 -0700 Subject: [PATCH 08/42] fix AAD example errors --- .../examples/AdministratorCreateOrUpdate.json | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index 35ad6852242f..81c69a3a77ff 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -17,7 +17,7 @@ } } } - }, + }, "responses": { "200": { "body": { @@ -31,7 +31,18 @@ } } }, - "201": {}, + "201": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } + } + }, "202": {} } } \ No newline at end of file From ab05fc7a242b3e8ca9088ecfe04aec6b9f864c1d Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 16:46:59 -0700 Subject: [PATCH 09/42] fix AAD example errors 2 --- .../examples/AdministratorCreateOrUpdate.json | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index 81c69a3a77ff..83c74dd86f7a 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -5,17 +5,14 @@ "serverName": "sqlcrudtest-6440", "administratorName": "activeDirectory", "api-version": "2014-04-01", - "properties": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "activeDirectory", - "parameters": { - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } - } + "name": "activeDirectory", + "parameters": { + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } } }, "responses": { From 99a659e8e4e6e136f2434c381939bdf3b24f8036 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 18:04:56 -0700 Subject: [PATCH 10/42] fix AAD json --- .../ServerAzureADAdministrators.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index f578f728332c..b9fe2b1cb6c7 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -19,10 +19,10 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { "get": { "tags": [ - "ServerAzureADAdministrators" + "Administrators" ], "description": "Gets a Azure Active Directory administrator.", - "operationId": "ServerAzureADAdministrators_Get", + "operationId": "Administrators_Get", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" @@ -63,10 +63,10 @@ }, "put": { "tags": [ - "ServerAzureADAdministrators" + "Administrators" ], "description": "Creates or updates an existing Azure Active Directory administrator.", - "operationId": "ServerAzureADAdministrators_CreateOrUpdate", + "operationId": "Administrators_CreateOrUpdate", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" @@ -125,10 +125,10 @@ }, "delete": { "tags": [ - "ServerAzureADAdministrators" + "Administrators" ], "description": "Deletes the Azure Active Directory administrator with the given name.", - "operationId": "ServerAzureADAdministrators_Delete", + "operationId": "Administrators_Delete", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" @@ -175,10 +175,10 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators": { "get": { "tags": [ - "ServerAzureADAdministrators" + "Administrators" ], "description": "Gets a list of Azure Active Directory administrators in a server.", - "operationId": "ServerAzureADAdministrators_ListByServer", + "operationId": "Administrators_ListByServer", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" From ccd51ccb71e98035c0dc4ce622f7919c999b56fb Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 18:28:34 -0700 Subject: [PATCH 11/42] fix tags in json --- .../2018-06-01-preview/ServerAzureADAdministrators.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index b9fe2b1cb6c7..52bbaddd9e82 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -19,7 +19,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { "get": { "tags": [ - "Administrators" + "ServerAdministrators" ], "description": "Gets a Azure Active Directory administrator.", "operationId": "Administrators_Get", @@ -63,7 +63,7 @@ }, "put": { "tags": [ - "Administrators" + "ServerAdministrators" ], "description": "Creates or updates an existing Azure Active Directory administrator.", "operationId": "Administrators_CreateOrUpdate", @@ -125,7 +125,7 @@ }, "delete": { "tags": [ - "Administrators" + "ServerAdministrators" ], "description": "Deletes the Azure Active Directory administrator with the given name.", "operationId": "Administrators_Delete", @@ -175,7 +175,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators": { "get": { "tags": [ - "Administrators" + "ServerAdministrators" ], "description": "Gets a list of Azure Active Directory administrators in a server.", "operationId": "Administrators_ListByServer", From d04b8df26bd24ce07abea5ac29a238141f8aa5b8 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 18:41:01 -0700 Subject: [PATCH 12/42] update json --- .../2018-06-01-preview/ServerAzureADAdministrators.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index 52bbaddd9e82..b6b1df25ed36 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -22,7 +22,7 @@ "ServerAdministrators" ], "description": "Gets a Azure Active Directory administrator.", - "operationId": "Administrators_Get", + "operationId": "ServerAdministrators_Get", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" @@ -66,7 +66,7 @@ "ServerAdministrators" ], "description": "Creates or updates an existing Azure Active Directory administrator.", - "operationId": "Administrators_CreateOrUpdate", + "operationId": "ServerAdministrators_CreateOrUpdate", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" @@ -128,7 +128,7 @@ "ServerAdministrators" ], "description": "Deletes the Azure Active Directory administrator with the given name.", - "operationId": "Administrators_Delete", + "operationId": "ServerAdministrators_Delete", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" @@ -178,7 +178,7 @@ "ServerAdministrators" ], "description": "Gets a list of Azure Active Directory administrators in a server.", - "operationId": "Administrators_ListByServer", + "operationId": "ServerAdministrators_ListByServer", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" From 48163caeae0aac216442ffce2141a0d6d38a3ca6 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 19:04:22 -0700 Subject: [PATCH 13/42] update server admin jsons --- .../ServerAzureADAdministrators.json | 16 ++++++++-------- .../2014-04-01/serverAzureADAdministrators.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index b6b1df25ed36..f578f728332c 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -19,10 +19,10 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { "get": { "tags": [ - "ServerAdministrators" + "ServerAzureADAdministrators" ], "description": "Gets a Azure Active Directory administrator.", - "operationId": "ServerAdministrators_Get", + "operationId": "ServerAzureADAdministrators_Get", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" @@ -63,10 +63,10 @@ }, "put": { "tags": [ - "ServerAdministrators" + "ServerAzureADAdministrators" ], "description": "Creates or updates an existing Azure Active Directory administrator.", - "operationId": "ServerAdministrators_CreateOrUpdate", + "operationId": "ServerAzureADAdministrators_CreateOrUpdate", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" @@ -125,10 +125,10 @@ }, "delete": { "tags": [ - "ServerAdministrators" + "ServerAzureADAdministrators" ], "description": "Deletes the Azure Active Directory administrator with the given name.", - "operationId": "ServerAdministrators_Delete", + "operationId": "ServerAzureADAdministrators_Delete", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" @@ -175,10 +175,10 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators": { "get": { "tags": [ - "ServerAdministrators" + "ServerAzureADAdministrators" ], "description": "Gets a list of Azure Active Directory administrators in a server.", - "operationId": "ServerAdministrators_ListByServer", + "operationId": "ServerAzureADAdministrators_ListByServer", "parameters": [ { "$ref": "#/parameters/ResourceGroupParameter" diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json index 97bdd63a54ef..4ad2c9948f58 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json @@ -19,7 +19,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { "put": { "tags": [ - "ServerAdministrators" + "ServerAzureADAdministrators" ], "operationId": "ServerAzureADAdministrators_CreateOrUpdate", "description": "Creates a new Server Active Directory Administrator or updates an existing server Active Directory Administrator.", From 9e6b0d79b3962f9168bf9d66dd1d34430f9fe465 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 20:24:52 -0700 Subject: [PATCH 14/42] update server admin jsons --- .../2014-04-01/examples/ServerAdminCreateUpdate.json | 11 +++-------- .../2014-04-01/examples/ServerAdminDelete.json | 12 +++--------- .../2014-04-01/serverAzureADAdministrators.json | 4 ++-- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json index 03a3edcadb99..49c470c3a93c 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json @@ -5,8 +5,7 @@ "serverName": "sqlcrudtest-6440", "administratorName": "activeDirectory", "api-version": "2014-04-01", - "properties": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "parameters": { "name": "activeDirectory", "properties": { "administratorType": "ActiveDirectory", @@ -29,11 +28,7 @@ } } }, - "201": { - "body": "Created" - }, - "202": { - "body": "Accepted" - } + "201": {}, + "202": {} } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json index dfe1c958a22d..624e5994fc14 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json @@ -7,14 +7,8 @@ "api-version": "2014-04-01" }, "responses": { - "200": { - "body": "OK" - }, - "202": { - "body": "Accepted" - }, - "204": { - "body": "No Content" - } + "200": {}, + "202": {}, + "204": {} } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json index 4ad2c9948f58..a316ac8ad2f4 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json @@ -131,7 +131,7 @@ "ServerAdministrators" ], "operationId": "ServerAzureADAdministrators_Get", - "description": "Returns an server Administrator.", + "description": "Gets an server Administrator.", "x-ms-examples": { "Get the Active Directory Administrator": { "$ref": "./examples/ServerAdminGet.json" @@ -170,7 +170,7 @@ "ServerAdministrators" ], "operationId": "ServerAzureADAdministrators_ListByServer", - "description": "Returns a list of server Administrators.", + "description": "Gets a list of server Administrators.", "x-ms-examples": { "get a list of server administrators": { "$ref": "./examples/ServerAdminList.json" From 5bd4b2bbb1a11ffbc03e68e3e29c42d7ec36b56c Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 20:40:45 -0700 Subject: [PATCH 15/42] updates --- .../ServerAzureADAdministrators.json | 8 ++++---- .../examples/ServerAdminCreateUpdate.json | 2 +- .../2014-04-01/serverAzureADAdministrators.json | 17 +++-------------- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index f578f728332c..9e254c816723 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -21,7 +21,7 @@ "tags": [ "ServerAzureADAdministrators" ], - "description": "Gets a Azure Active Directory administrator.", + "description": "Gets a server Administrator.", "operationId": "ServerAzureADAdministrators_Get", "parameters": [ { @@ -65,7 +65,7 @@ "tags": [ "ServerAzureADAdministrators" ], - "description": "Creates or updates an existing Azure Active Directory administrator.", + "description": "Creates a new Server Active Directory Administrator or updates an existing server Active Directory Administrator", "operationId": "ServerAzureADAdministrators_CreateOrUpdate", "parameters": [ { @@ -127,7 +127,7 @@ "tags": [ "ServerAzureADAdministrators" ], - "description": "Deletes the Azure Active Directory administrator with the given name.", + "description": "Deletes an existing server Active Directory Administrator.", "operationId": "ServerAzureADAdministrators_Delete", "parameters": [ { @@ -177,7 +177,7 @@ "tags": [ "ServerAzureADAdministrators" ], - "description": "Gets a list of Azure Active Directory administrators in a server.", + "description": "Gets a list of server Administrators.", "operationId": "ServerAzureADAdministrators_ListByServer", "parameters": [ { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json index 49c470c3a93c..f52a22e1ed1c 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json @@ -28,7 +28,7 @@ } } }, - "201": {}, + "201": {}, "202": {} } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json index a316ac8ad2f4..2457153fc4bb 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json @@ -63,22 +63,17 @@ }, "201": { "description": "Created", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" } }, "202": { "description": "Accepted", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } } }, "x-ms-long-running-operation": true }, "delete": { "tags": [ - "ServerAdministrators" + "ServerAzureADAdministrators" ], "operationId": "ServerAzureADAdministrators_Delete", "description": "Deletes an existing server Active Directory Administrator.", @@ -107,20 +102,14 @@ "responses": { "202": { "description": "Accepted", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" } }, "204": { "description": "No Content", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" } }, "200": { "description": "OK", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" } } }, @@ -131,7 +120,7 @@ "ServerAdministrators" ], "operationId": "ServerAzureADAdministrators_Get", - "description": "Gets an server Administrator.", + "description": "Gets a server Administrator.", "x-ms-examples": { "Get the Active Directory Administrator": { "$ref": "./examples/ServerAdminGet.json" @@ -167,7 +156,7 @@ "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators": { "get": { "tags": [ - "ServerAdministrators" + "ServerAzureADAdministrators" ], "operationId": "ServerAzureADAdministrators_ListByServer", "description": "Gets a list of server Administrators.", From a9d558e768cbc668544e181d18f9b2e7dd25dd99 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 21:02:17 -0700 Subject: [PATCH 16/42] fix 2014 AAD Admin json --- .../2014-04-01/serverAzureADAdministrators.json | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json index 2457153fc4bb..c65ade601436 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json @@ -62,11 +62,10 @@ } }, "201": { - "description": "Created", - } + "description": "Created" }, "202": { - "description": "Accepted", + "description": "Accepted" } }, "x-ms-long-running-operation": true @@ -101,15 +100,13 @@ ], "responses": { "202": { - "description": "Accepted", - } + "description": "Accepted" }, "204": { - "description": "No Content", - } + "description": "No Content" }, "200": { - "description": "OK", + "description": "OK" } } }, From f6bdfae762c3b5268e2d160ca3157dd363f9fecd Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 21:23:04 -0700 Subject: [PATCH 17/42] fix 2014 AAD Admin json --- .../stable/2014-04-01/serverAzureADAdministrators.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json index c65ade601436..e53e174bfbec 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json @@ -108,8 +108,7 @@ "200": { "description": "OK" } - } - }, + }, "x-ms-long-running-operation": true }, "get": { From 81327cae766c3f41e5bc09dc4a8db77777386b36 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 21:38:51 -0700 Subject: [PATCH 18/42] fix AAD Admin json --- .../ServerAzureADAdministrators.json | 4 ++-- .../examples/AdministratorCreateOrUpdate.json | 10 +++++----- .../2014-04-01/serverAzureADAdministrators.json | 12 +++++++++--- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index 9e254c816723..3b10d509e8ac 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -65,7 +65,7 @@ "tags": [ "ServerAzureADAdministrators" ], - "description": "Creates a new Server Active Directory Administrator or updates an existing server Active Directory Administrator", + "description": "Creates a new Server Active Directory Administrator or updates an existing server Active Directory Administrator.", "operationId": "ServerAzureADAdministrators_CreateOrUpdate", "parameters": [ { @@ -83,7 +83,7 @@ { "name": "parameters", "in": "body", - "description": "The requested Azure Active Directory administrator Resource state.", + "description": "The required parameters for creating or updating an Active Directory Administrator.", "required": true, "schema": { "$ref": "#/definitions/ServerAzureADAdministrator" diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index 83c74dd86f7a..52819bbd7900 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -8,11 +8,11 @@ "name": "activeDirectory", "parameters": { "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } } }, "responses": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json index e53e174bfbec..edda2f5aabad 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json @@ -45,13 +45,19 @@ "$ref": "#/parameters/AdministratorNameParameter" }, { - "name": "properties", + "name": "administratorName", + "in": "path", + "required": true, + "type": "string" + }, + { + "name": "parameters", "in": "body", + "description": "The required parameters for creating or updating an Active Directory Administrator.", "required": true, "schema": { "$ref": "#/definitions/ServerAzureADAdministrator" - }, - "description": "The required parameters for creating or updating an Active Directory Administrator." + } } ], "responses": { From 93f8532c2c8bada7aefd9619547ca07e510bf830 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 21:53:52 -0700 Subject: [PATCH 19/42] fix AAD Admin json --- .../examples/AdministratorCreateOrUpdate.json | 2 +- .../stable/2014-04-01/serverAzureADAdministrators.json | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index 52819bbd7900..1091eb928381 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -4,7 +4,7 @@ "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", "administratorName": "activeDirectory", - "api-version": "2014-04-01", + "api-version": "2018-06-01-preview", "name": "activeDirectory", "parameters": { "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json index edda2f5aabad..bdda81826fe8 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json @@ -44,12 +44,6 @@ { "$ref": "#/parameters/AdministratorNameParameter" }, - { - "name": "administratorName", - "in": "path", - "required": true, - "type": "string" - }, { "name": "parameters", "in": "body", @@ -283,7 +277,7 @@ "required": true, "type": "string", "enum": [ - "activeDirectory" + "ActiveDirectory" ], "x-ms-enum": { "name": "ServerAdministratorName" From be0b82e6fcdb16d5df932696bf6d3a0563684660 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Fri, 1 Nov 2019 22:03:01 -0700 Subject: [PATCH 20/42] fix AAD Admin json --- .../examples/AdministratorCreateOrUpdate.json | 4 ++-- .../2018-06-01-preview/examples/AdministratorDelete.json | 2 +- .../stable/2014-04-01/examples/ServerAdminCreateUpdate.json | 2 +- .../stable/2014-04-01/examples/ServerAdminDelete.json | 2 +- .../stable/2014-04-01/examples/ServerAdminGet.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index 1091eb928381..d40630b95713 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -3,9 +3,9 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "activeDirectory", + "administratorName": "ActiveDirectory", "api-version": "2018-06-01-preview", - "name": "activeDirectory", + "name": "ActiveDirectory", "parameters": { "properties": { "administratorType": "ActiveDirectory", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json index 469acae11a8f..795315c3078d 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "activeDirectory", + "administratorName": "ActiveDirectory", "api-version": "2018-06-01-preview" }, "responses": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json index f52a22e1ed1c..9df578baed69 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "activeDirectory", + "administratorName": "ActiveDirectory", "api-version": "2014-04-01", "parameters": { "name": "activeDirectory", diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json index 624e5994fc14..f00b8fb90d85 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "activeDirectory", + "administratorName": "ActiveDirectory", "api-version": "2014-04-01" }, "responses": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json index 64c6647f119e..e6cdf119932a 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "activeDirectory", + "administratorName": "ActiveDirectory", "api-version": "2014-04-01" }, "responses": { From 499cd53afa8cb0079049eef4d061637e730c9f0c Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 4 Nov 2019 10:59:41 -0800 Subject: [PATCH 21/42] fix create example --- .../stable/2014-04-01/examples/ServerAdminCreateUpdate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json index 9df578baed69..3d59da71e182 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json @@ -5,8 +5,8 @@ "serverName": "sqlcrudtest-6440", "administratorName": "ActiveDirectory", "api-version": "2014-04-01", + "name":"ActiveDirectory", "parameters": { - "name": "activeDirectory", "properties": { "administratorType": "ActiveDirectory", "login": "bob@contoso.com", From 2dc90c6a293d6aceb4c132fa5943665f73bbefe5 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 4 Nov 2019 11:12:57 -0800 Subject: [PATCH 22/42] remove new example files. --- .../examples/AdministratorCreateOrUpdate.json | 45 ------------------- .../examples/AdministratorDelete.json | 14 ------ .../examples/AdministratorGet.json | 23 ---------- .../examples/AdministratorList.json | 26 ----------- 4 files changed, 108 deletions(-) delete mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json delete mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json delete mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json delete mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json deleted file mode 100644 index d40630b95713..000000000000 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-4799", - "serverName": "sqlcrudtest-6440", - "administratorName": "ActiveDirectory", - "api-version": "2018-06-01-preview", - "name": "ActiveDirectory", - "parameters": { - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "activeDirectory", - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } - } - }, - "201": { - "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "activeDirectory", - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } - } - }, - "202": {} - } -} \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json deleted file mode 100644 index 795315c3078d..000000000000 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-4799", - "serverName": "sqlcrudtest-6440", - "administratorName": "ActiveDirectory", - "api-version": "2018-06-01-preview" - }, - "responses": { - "200": {}, - "202": {}, - "204": {} - } -} \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json deleted file mode 100644 index d07177fbd011..000000000000 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-4799", - "serverName": "sqlcrudtest-6440", - "administratorName": "activeDirectory", - "api-version": "2018-06-01-preview" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "activeDirectory", - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } - } - } - } -} \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json deleted file mode 100644 index 333f35b545a5..000000000000 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-4799", - "serverName": "sqlcrudtest-6440", - "api-version": "2018-06-01-preview" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/providers/Microsoft.Sql/administrators/ActiveDirectory", - "name": "ActiveDirectory", - "properties": { - "administratorType": "ActiveDirectory", - "login": "DSEngAll", - "sid": "5e90ef3b-9b42-4777-819b-25c36961ea4d", - "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47" - } - } - ] - } - } - } -} \ No newline at end of file From 37d3a032075c0169b43ac284298abc686c772924 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 4 Nov 2019 11:13:50 -0800 Subject: [PATCH 23/42] add back new example files. --- .../examples/AdministratorCreateOrUpdate.json | 45 +++++++++++++++++++ .../examples/AdministratorDelete.json | 14 ++++++ .../examples/AdministratorGet.json | 23 ++++++++++ .../examples/AdministratorList.json | 26 +++++++++++ 4 files changed, 108 insertions(+) create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json create mode 100644 specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json new file mode 100644 index 000000000000..d40630b95713 --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -0,0 +1,45 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "administratorName": "ActiveDirectory", + "api-version": "2018-06-01-preview", + "name": "ActiveDirectory", + "parameters": { + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } + } + }, + "202": {} + } +} \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json new file mode 100644 index 000000000000..795315c3078d --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json @@ -0,0 +1,14 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "administratorName": "ActiveDirectory", + "api-version": "2018-06-01-preview" + }, + "responses": { + "200": {}, + "202": {}, + "204": {} + } +} \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json new file mode 100644 index 000000000000..d07177fbd011 --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "administratorName": "activeDirectory", + "api-version": "2018-06-01-preview" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } + } + } + } +} \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json new file mode 100644 index 000000000000..333f35b545a5 --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "api-version": "2018-06-01-preview" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/providers/Microsoft.Sql/administrators/ActiveDirectory", + "name": "ActiveDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "DSEngAll", + "sid": "5e90ef3b-9b42-4777-819b-25c36961ea4d", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47" + } + } + ] + } + } + } +} \ No newline at end of file From 301e6f65805bbbbca61343fc49347075b18279ad Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 4 Nov 2019 11:39:58 -0800 Subject: [PATCH 24/42] add back new example files. --- .../examples/AdministratorCreateOrUpdate.json | 29 ++++++------------- .../examples/AdministratorDelete.json | 4 +-- .../examples/AdministratorGet.json | 2 +- .../examples/AdministratorList.json | 23 +++++++-------- 4 files changed, 22 insertions(+), 36 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index d40630b95713..4bb87271eae1 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -1,34 +1,22 @@ -{ +{ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "ActiveDirectory", + "administratorName": "activeDirectory", "api-version": "2018-06-01-preview", - "name": "ActiveDirectory", + "name": "activeDirectory", "parameters": { - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "activeDirectory", - "properties": { + "properties": { "administratorType": "ActiveDirectory", "login": "bob@contoso.com", "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" } - } - }, - "201": { + } + }, + "responses": { + "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", "name": "activeDirectory", @@ -40,6 +28,7 @@ } } }, + "201": {}, "202": {} } } \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json index 795315c3078d..ea02df646603 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json @@ -1,9 +1,9 @@ -{ +{ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "ActiveDirectory", + "administratorName": "activeDirectory", "api-version": "2018-06-01-preview" }, "responses": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json index d07177fbd011..c17a66ea55c5 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json @@ -1,4 +1,4 @@ -{ +{ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json index 333f35b545a5..c17a66ea55c5 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json @@ -1,25 +1,22 @@ -{ +{ "parameters": { "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", + "administratorName": "activeDirectory", "api-version": "2018-06-01-preview" }, "responses": { "200": { "body": { - "value": [ - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/providers/Microsoft.Sql/administrators/ActiveDirectory", - "name": "ActiveDirectory", - "properties": { - "administratorType": "ActiveDirectory", - "login": "DSEngAll", - "sid": "5e90ef3b-9b42-4777-819b-25c36961ea4d", - "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47" - } - } - ] + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } } } } From c70cb9c4646ca9837e322ecd1afea4b15aa6e90e Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 4 Nov 2019 12:00:26 -0800 Subject: [PATCH 25/42] add back new example files. --- .../examples/AdministratorCreateOrUpdate.json | 1 + .../2018-06-01-preview/examples/AdministratorGet.json | 1 + .../2018-06-01-preview/examples/AdministratorList.json | 5 +++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index 4bb87271eae1..3c9b79b6cf83 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -20,6 +20,7 @@ "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", "name": "activeDirectory", + "type": "Microsoft.Sql/servers/administrators", "properties": { "administratorType": "ActiveDirectory", "login": "bob@contoso.com", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json index c17a66ea55c5..fa164814f27e 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json @@ -11,6 +11,7 @@ "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", "name": "activeDirectory", + "type": "Microsoft.Sql/servers/administrators", "properties": { "administratorType": "ActiveDirectory", "login": "bob@contoso.com", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json index c17a66ea55c5..7c4530367631 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json @@ -3,14 +3,15 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "activeDirectory", + "administratorName": "ActiveDirectory", "api-version": "2018-06-01-preview" }, "responses": { "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "activeDirectory", + "name": "ActiveDirectory", + "type": "Microsoft.Sql/servers/administrators", "properties": { "administratorType": "ActiveDirectory", "login": "bob@contoso.com", From f9a115120b3cc5954a9af2e77be3ef499a7781da Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 4 Nov 2019 15:23:56 -0800 Subject: [PATCH 26/42] fixing example files --- .../examples/AdministratorCreateOrUpdate.json | 14 +++++++++++- .../examples/AdministratorList.json | 22 +++++++++++-------- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index 3c9b79b6cf83..ab255d7a3884 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -29,7 +29,19 @@ } } }, - "201": {}, + "201": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", + "type": "Microsoft.Sql/servers/administrators", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } + } + }, "202": {} } } \ No newline at end of file diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json index 7c4530367631..c20c86e19f79 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json @@ -9,15 +9,19 @@ "responses": { "200": { "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "ActiveDirectory", - "type": "Microsoft.Sql/servers/administrators", - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "ActiveDirectory", + "type": "Microsoft.Sql/servers/administrators", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } + } + ] } } } From 53b658109bb79b792f74ebcb3f146482a2857b60 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 4 Nov 2019 19:01:34 -0800 Subject: [PATCH 27/42] fix tag in old Server AAD Admin json --- .../serverAzureADAdministrators.json | 76 +++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json index bdda81826fe8..6a102906bdb2 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json @@ -17,6 +17,43 @@ ], "paths": { "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { + "get": { + "tags": [ + "ServerAzureADAdministrators" + ], + "operationId": "ServerAzureADAdministrators_Get", + "description": "Gets a server Administrator.", + "x-ms-examples": { + "Get the Active Directory Administrator": { + "$ref": "./examples/ServerAdminGet.json" + } + }, + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/AdministratorNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + } + } + }, "put": { "tags": [ "ServerAzureADAdministrators" @@ -110,44 +147,7 @@ } }, "x-ms-long-running-operation": true - }, - "get": { - "tags": [ - "ServerAdministrators" - ], - "operationId": "ServerAzureADAdministrators_Get", - "description": "Gets a server Administrator.", - "x-ms-examples": { - "Get the Active Directory Administrator": { - "$ref": "./examples/ServerAdminGet.json" - } - }, - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "$ref": "#/parameters/AdministratorNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } - } - } - } + } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators": { "get": { From c350b2778e31905e6e64f9a0adb6b4da0f4df813 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 4 Nov 2019 19:45:00 -0800 Subject: [PATCH 28/42] use common values --- .../ServerAzureADAdministrators.json | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index 3b10d509e8ac..2db3446e3c57 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -69,11 +69,20 @@ "operationId": "ServerAzureADAdministrators_CreateOrUpdate", "parameters": [ { - "$ref": "#/parameters/ResourceGroupParameter" + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" }, { "$ref": "#/parameters/ServerNameParameter" }, + { + "$ref": "#/parameters/AdministratorNameParameter" + }, { "name": "administratorName", "in": "path", @@ -88,12 +97,6 @@ "schema": { "$ref": "#/definitions/ServerAzureADAdministrator" } - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" } ], "responses": { From f510743583e1c890286dca787420796c88bcefc4 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 4 Nov 2019 19:54:11 -0800 Subject: [PATCH 29/42] remove extra value --- .../2018-06-01-preview/ServerAzureADAdministrators.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index 2db3446e3c57..debb28f32301 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -80,9 +80,6 @@ { "$ref": "#/parameters/ServerNameParameter" }, - { - "$ref": "#/parameters/AdministratorNameParameter" - }, { "name": "administratorName", "in": "path", From 72eb4ab70bc06d25d8aa57340616a3c8bb124c65 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 4 Nov 2019 20:04:52 -0800 Subject: [PATCH 30/42] use common values --- .../ServerAzureADAdministrators.json | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index debb28f32301..4a39da092b0f 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -17,7 +17,7 @@ ], "paths": { "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { - "get": { + "`": { "tags": [ "ServerAzureADAdministrators" ], @@ -25,7 +25,13 @@ "operationId": "ServerAzureADAdministrators_Get", "parameters": [ { - "$ref": "#/parameters/ResourceGroupParameter" + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" }, { "$ref": "#/parameters/ServerNameParameter" @@ -36,13 +42,7 @@ "description": "The name of server active directory administrator.", "required": true, "type": "string" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" - } + } ], "responses": { "200": { @@ -131,7 +131,13 @@ "operationId": "ServerAzureADAdministrators_Delete", "parameters": [ { - "$ref": "#/parameters/ResourceGroupParameter" + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" }, { "$ref": "#/parameters/ServerNameParameter" @@ -142,12 +148,6 @@ "description": "The name of server active directory administrator.", "required": true, "type": "string" - }, - { - "$ref": "#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "#/parameters/ApiVersionParameter" } ], "responses": { @@ -181,17 +181,17 @@ "operationId": "ServerAzureADAdministrators_ListByServer", "parameters": [ { - "$ref": "#/parameters/ResourceGroupParameter" + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" }, { - "$ref": "#/parameters/ServerNameParameter" + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/SubscriptionIdParameter" + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" }, { - "$ref": "#/parameters/ApiVersionParameter" - } + "$ref": "#/parameters/ServerNameParameter" + }, ], "responses": { "200": { From 1f2a3c7872a38a4422064ce76ab03db94564a5a6 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Mon, 4 Nov 2019 20:12:18 -0800 Subject: [PATCH 31/42] use common values --- .../ServerAzureADAdministrators.json | 28 ++----------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index 4a39da092b0f..8881779992e5 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -17,7 +17,7 @@ ], "paths": { "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { - "`": { + "get": { "tags": [ "ServerAzureADAdministrators" ], @@ -191,7 +191,7 @@ }, { "$ref": "#/parameters/ServerNameParameter" - }, + } ], "responses": { "200": { @@ -321,30 +321,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", From 7a3ea88d6d6d255fc99f506829217a670d3b7f32 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Tue, 5 Nov 2019 12:10:30 -0800 Subject: [PATCH 32/42] remove old api version docs --- .../examples/ServerAdminCreateUpdate.json | 34 -- .../examples/ServerAdminDelete.json | 14 - .../2014-04-01/examples/ServerAdminGet.json | 23 -- .../2014-04-01/examples/ServerAdminList.json | 26 -- .../serverAzureADAdministrators.json | 299 ------------------ 5 files changed, 396 deletions(-) delete mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json delete mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json delete mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json delete mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminList.json delete mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json deleted file mode 100644 index 3d59da71e182..000000000000 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-4799", - "serverName": "sqlcrudtest-6440", - "administratorName": "ActiveDirectory", - "api-version": "2014-04-01", - "name":"ActiveDirectory", - "parameters": { - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } - } - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "activeDirectory", - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } - } - }, - "201": {}, - "202": {} - } -} diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json deleted file mode 100644 index f00b8fb90d85..000000000000 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-4799", - "serverName": "sqlcrudtest-6440", - "administratorName": "ActiveDirectory", - "api-version": "2014-04-01" - }, - "responses": { - "200": {}, - "202": {}, - "204": {} - } -} diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json deleted file mode 100644 index e6cdf119932a..000000000000 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-4799", - "serverName": "sqlcrudtest-6440", - "administratorName": "ActiveDirectory", - "api-version": "2014-04-01" - }, - "responses": { - "200": { - "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "activeDirectory", - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } - } - } - } -} diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminList.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminList.json deleted file mode 100644 index f8cc4bd25a3b..000000000000 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminList.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "parameters": { - "subscriptionId": "00000000-1111-2222-3333-444444444444", - "resourceGroupName": "sqlcrudtest-4799", - "serverName": "sqlcrudtest-6440", - "api-version": "2014-04-01" - }, - "responses": { - "200": { - "body": { - "value": [ - { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/providers/Microsoft.Sql/administrators/ActiveDirectory", - "name": "ActiveDirectory", - "properties": { - "administratorType": "ActiveDirectory", - "login": "DSEngAll", - "sid": "5e90ef3b-9b42-4777-819b-25c36961ea4d", - "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47" - } - } - ] - } - } - } -} diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json deleted file mode 100644 index 6a102906bdb2..000000000000 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json +++ /dev/null @@ -1,299 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "Azure SQL Database API spec", - "description": "The Azure SQL Database management API provides a RESTful set of web services that interact with Azure SQL Database services to manage your external server administrators.", - "version": "2014-04-01" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { - "get": { - "tags": [ - "ServerAzureADAdministrators" - ], - "operationId": "ServerAzureADAdministrators_Get", - "description": "Gets a server Administrator.", - "x-ms-examples": { - "Get the Active Directory Administrator": { - "$ref": "./examples/ServerAdminGet.json" - } - }, - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "$ref": "#/parameters/AdministratorNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } - } - } - }, - "put": { - "tags": [ - "ServerAzureADAdministrators" - ], - "operationId": "ServerAzureADAdministrators_CreateOrUpdate", - "description": "Creates a new Server Active Directory Administrator or updates an existing server Active Directory Administrator.", - "x-ms-examples": { - "Create/Update a server administrator": { - "$ref": "./examples/ServerAdminCreateUpdate.json" - } - }, - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "$ref": "#/parameters/AdministratorNameParameter" - }, - { - "name": "parameters", - "in": "body", - "description": "The required parameters for creating or updating an Active Directory Administrator.", - "required": true, - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } - }, - "201": { - "description": "Created" - }, - "202": { - "description": "Accepted" - } - }, - "x-ms-long-running-operation": true - }, - "delete": { - "tags": [ - "ServerAzureADAdministrators" - ], - "operationId": "ServerAzureADAdministrators_Delete", - "description": "Deletes an existing server Active Directory Administrator.", - "x-ms-examples": { - "Delete a server administrator": { - "$ref": "./examples/ServerAdminDelete.json" - } - }, - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "$ref": "#/parameters/AdministratorNameParameter" - } - ], - "responses": { - "202": { - "description": "Accepted" - }, - "204": { - "description": "No Content" - }, - "200": { - "description": "OK" - } - }, - "x-ms-long-running-operation": true - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators": { - "get": { - "tags": [ - "ServerAzureADAdministrators" - ], - "operationId": "ServerAzureADAdministrators_ListByServer", - "description": "Gets a list of server Administrators.", - "x-ms-examples": { - "get a list of server administrators": { - "$ref": "./examples/ServerAdminList.json" - } - }, - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ServerAdministratorListResult" - } - } - }, - "x-ms-pageable": { - "nextLinkName": null - } - } - } - }, - "definitions": { - "ServerAdministratorProperties": { - "properties": { - "administratorType": { - "type": "string", - "description": "The type of administrator.", - "enum": [ - "ActiveDirectory" - ], - "x-ms-enum": { - "name": "AdministratorType" - } - }, - "login": { - "type": "string", - "description": "The server administrator login value." - }, - "sid": { - "type": "string", - "description": "The server administrator Sid (Secure ID).", - "format": "uuid" - }, - "tenantId": { - "type": "string", - "description": "The server Active Directory Administrator tenant id.", - "format": "uuid" - } - }, - "required": [ - "tenantId", - "administratorType", - "login", - "sid" - ], - "description": "The properties of an server Administrator." - }, - "ServerAzureADAdministrator": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/ServerAdministratorProperties", - "description": "The properties of the resource." - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" - } - ], - "description": "An server Active Directory Administrator." - }, - "ServerAdministratorListResult": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/ServerAzureADAdministrator" - }, - "description": "The list of server Active Directory Administrators for the server." - } - }, - "description": "The response to a list Active Directory Administrators request." - } - }, - "parameters": { - "ServerNameParameter": { - "name": "serverName", - "in": "path", - "required": true, - "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" - }, - "AdministratorNameParameter": { - "name": "administratorName", - "in": "path", - "description": "Name of the server administrator resource.", - "required": true, - "type": "string", - "enum": [ - "ActiveDirectory" - ], - "x-ms-enum": { - "name": "ServerAdministratorName" - }, - "x-ms-parameter-location": "method" - } - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "description": "Azure Active Directory OAuth2 Flow", - "flow": "implicit", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - } -} From 086a38bd61a696513c30be4310992fda6071b1bb Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Tue, 5 Nov 2019 12:44:17 -0800 Subject: [PATCH 33/42] adding new serverAzureADADministrator.json --- specification/sql/resource-manager/readme.md | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 5cce0a554d7b..c7736723c63e 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -65,7 +65,6 @@ input-file: - Microsoft.Sql/stable/2014-04-01/metrics.json - Microsoft.Sql/stable/2014-04-01/recommendedElasticPoolsDecoupled.json - Microsoft.Sql/stable/2014-04-01/replicationLinks.json -- Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - Microsoft.Sql/stable/2014-04-01/serviceObjectives.json - Microsoft.Sql/stable/2014-04-01/sql.core.json @@ -163,7 +162,6 @@ input-file: - Microsoft.Sql/stable/2014-04-01/metrics.json - Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json - Microsoft.Sql/stable/2014-04-01/replicationLinks.json -- Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - Microsoft.Sql/stable/2014-04-01/serviceObjectives.json - Microsoft.Sql/stable/2014-04-01/sql.core.json @@ -254,7 +252,6 @@ input-file: - Microsoft.Sql/stable/2014-04-01/metrics.json - Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json - Microsoft.Sql/stable/2014-04-01/replicationLinks.json -- Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - Microsoft.Sql/stable/2014-04-01/serviceObjectives.json - Microsoft.Sql/stable/2014-04-01/sql.core.json @@ -343,7 +340,6 @@ input-file: - Microsoft.Sql/stable/2014-04-01/importExport.json - Microsoft.Sql/stable/2014-04-01/metrics.json - Microsoft.Sql/stable/2014-04-01/replicationLinks.json -- Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - Microsoft.Sql/stable/2014-04-01/serviceObjectives.json - Microsoft.Sql/stable/2014-04-01/sql.core.json @@ -408,7 +404,6 @@ input-file: - Microsoft.Sql/stable/2014-04-01/importExport.json - Microsoft.Sql/stable/2014-04-01/metrics.json - Microsoft.Sql/stable/2014-04-01/replicationLinks.json -- Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - Microsoft.Sql/stable/2014-04-01/serviceObjectives.json - Microsoft.Sql/stable/2014-04-01/sql.core.json @@ -483,8 +478,7 @@ input-file: - ./Microsoft.Sql/preview/2018-06-01-preview/FailoverDatabases.json - ./Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - ./Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - - ./Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json - + # Needed when there is more than one input file override-info: title: SqlManagementClient @@ -631,7 +625,6 @@ input-file: - ./Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json - ./Microsoft.Sql/stable/2014-04-01/replicationLinks.json - ./Microsoft.Sql/stable/2014-04-01/restorePoints.json - - ./Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - ./Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - ./Microsoft.Sql/stable/2014-04-01/servers.json - ./Microsoft.Sql/stable/2014-04-01/serviceObjectives.json @@ -760,7 +753,6 @@ input-file: - $(this-folder)/Microsoft.Sql/stable/2014-04-01/metrics.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/recommendedElasticPoolsDecoupled.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/replicationLinks.json - - $(this-folder)/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/serviceObjectives.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/sql.core.json @@ -820,6 +812,7 @@ input-file: - $(this-folder)/Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - $(this-folder)/Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - $(this-folder)/Microsoft.Sql/preview/2018-06-01-preview/PrivateLinkResources.json + - $(this-folder)Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/capabilities.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/databases.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/elasticPools.json @@ -845,7 +838,6 @@ input-file: - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/FailoverDatabases.json - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - - $(this-folder)/./Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json - $(this-folder)/./Microsoft.Sql/preview/2017-10-01-preview/cancelOperations.json - $(this-folder)/./Microsoft.Sql/preview/2017-10-01-preview/cancelPoolOperations.json - $(this-folder)/./Microsoft.Sql/preview/2017-10-01-preview/databaseVulnerabilityAssessmentScans.json @@ -921,7 +913,6 @@ input-file: - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/replicationLinks.json - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/restorePoints.json - - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/servers.json - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/serviceObjectives.json From 70478db42a86712bce9a0b7749edc939e6a2e5f7 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Tue, 5 Nov 2019 16:31:00 -0800 Subject: [PATCH 34/42] adding new serverAzureADADministrator.json --- specification/sql/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index c7736723c63e..4524a375116f 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -812,7 +812,7 @@ input-file: - $(this-folder)/Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - $(this-folder)/Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - $(this-folder)/Microsoft.Sql/preview/2018-06-01-preview/PrivateLinkResources.json - - $(this-folder)Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json + - $(this-folder)/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/capabilities.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/databases.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/elasticPools.json From a9bef7df13898459f57f31f21ac8cdf0e1c07065 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Thu, 7 Nov 2019 16:24:38 -0800 Subject: [PATCH 35/42] Doing Prettier fixes --- .../ServerAzureADAdministrators.json | 4 ++-- .../examples/AdministratorCreateOrUpdate.json | 14 +++++++------- .../examples/AdministratorDelete.json | 2 +- .../examples/AdministratorGet.json | 2 +- .../examples/AdministratorList.json | 16 ++++++++-------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index 8881779992e5..3f155caed1b9 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -42,7 +42,7 @@ "description": "The name of server active directory administrator.", "required": true, "type": "string" - } + } ], "responses": { "200": { @@ -392,4 +392,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index ab255d7a3884..7675dc9c72e1 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -7,12 +7,12 @@ "api-version": "2018-06-01-preview", "name": "activeDirectory", "parameters": { - "properties": { - "administratorType": "ActiveDirectory", - "login": "bob@contoso.com", - "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", - "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } } }, "responses": { @@ -44,4 +44,4 @@ }, "202": {} } -} \ No newline at end of file +} diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json index ea02df646603..6b9716f4aa04 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json @@ -11,4 +11,4 @@ "202": {}, "204": {} } -} \ No newline at end of file +} diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json index fa164814f27e..f4df9ed8ddb0 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json @@ -21,4 +21,4 @@ } } } -} \ No newline at end of file +} diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json index c20c86e19f79..2cf361b53a9e 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json @@ -11,18 +11,18 @@ "body": { "value": [ { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "ActiveDirectory", - "type": "Microsoft.Sql/servers/administrators", - "properties": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "ActiveDirectory", + "type": "Microsoft.Sql/servers/administrators", + "properties": { "administratorType": "ActiveDirectory", "login": "bob@contoso.com", "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" - } - } - ] + } + } + ] } } } -} \ No newline at end of file +} From 1341d31e62a39db5c3de411fb59ef25082858ca0 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Tue, 19 Nov 2019 12:31:46 -0800 Subject: [PATCH 36/42] Make administratorName an enum. as ActiveDirectory is constant. --- .../ServerAzureADAdministrators.json | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index 3f155caed1b9..b6d7214248d2 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -41,7 +41,14 @@ "in": "path", "description": "The name of server active directory administrator.", "required": true, - "type": "string" + "type": "string", + "enum": [ + "ActiveDirectory" + ], + "x-ms-enum": { + "name": "AdministratorName", + "modelAsString": true + } } ], "responses": { @@ -84,7 +91,14 @@ "name": "administratorName", "in": "path", "required": true, - "type": "string" + "type": "string", + "enum": [ + "ActiveDirectory" + ], + "x-ms-enum": { + "name": "AdministratorName", + "modelAsString": true + } }, { "name": "parameters", @@ -148,6 +162,13 @@ "description": "The name of server active directory administrator.", "required": true, "type": "string" + "enum": [ + "ActiveDirectory" + ], + "x-ms-enum": { + "name": "AdministratorName", + "modelAsString": true + } } ], "responses": { From 68d2f52c7a60a115acb80bab04a994c527d72dec Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Tue, 19 Nov 2019 12:37:37 -0800 Subject: [PATCH 37/42] fixing syntax --- .../preview/2018-06-01-preview/ServerAzureADAdministrators.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json index b6d7214248d2..83fde462cb68 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json @@ -161,7 +161,7 @@ "in": "path", "description": "The name of server active directory administrator.", "required": true, - "type": "string" + "type": "string", "enum": [ "ActiveDirectory" ], From a38306893f3aba80c2ccb4125a347605c19a825a Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Tue, 19 Nov 2019 12:46:35 -0800 Subject: [PATCH 38/42] update example files with right casing for ActiveDirectory enum --- .../examples/AdministratorCreateOrUpdate.json | 12 ++++++------ .../examples/AdministratorDelete.json | 2 +- .../examples/AdministratorGet.json | 4 ++-- .../examples/AdministratorList.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json index 7675dc9c72e1..d1da856f62c0 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorCreateOrUpdate.json @@ -3,9 +3,9 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "activeDirectory", + "administratorName": "ActiveDirectory", "api-version": "2018-06-01-preview", - "name": "activeDirectory", + "name": "ActiveDirectory", "parameters": { "properties": { "administratorType": "ActiveDirectory", @@ -18,8 +18,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "activeDirectory", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/ActiveDirectory", + "name": "ActiveDirectory", "type": "Microsoft.Sql/servers/administrators", "properties": { "administratorType": "ActiveDirectory", @@ -31,8 +31,8 @@ }, "201": { "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", - "name": "activeDirectory", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/ActiveDirectory", + "name": "ActiveDirectory", "type": "Microsoft.Sql/servers/administrators", "properties": { "administratorType": "ActiveDirectory", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json index 6b9716f4aa04..d3210177c4c1 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorDelete.json @@ -3,7 +3,7 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "activeDirectory", + "administratorName": "ActiveDirectory", "api-version": "2018-06-01-preview" }, "responses": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json index f4df9ed8ddb0..ee56b46faa84 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorGet.json @@ -3,13 +3,13 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "sqlcrudtest-4799", "serverName": "sqlcrudtest-6440", - "administratorName": "activeDirectory", + "administratorName": "ActiveDirectory", "api-version": "2018-06-01-preview" }, "responses": { "200": { "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/ActiveDirectory", "name": "activeDirectory", "type": "Microsoft.Sql/servers/administrators", "properties": { diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json index 2cf361b53a9e..136f2644e33d 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2018-06-01-preview/examples/AdministratorList.json @@ -11,7 +11,7 @@ "body": { "value": [ { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/ActiveDirectory", "name": "ActiveDirectory", "type": "Microsoft.Sql/servers/administrators", "properties": { From 870344bdfc67a2874d2ddbda183a16cc5c9cb43e Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Wed, 20 Nov 2019 11:38:38 -0800 Subject: [PATCH 39/42] add backing 2014 version files and updating readme.md --- .../examples/ServerAdminCreateUpdate.json | 39 +++ .../examples/ServerAdminDelete.json | 20 ++ .../2014-04-01/examples/ServerAdminGet.json | 23 ++ .../2014-04-01/examples/ServerAdminList.json | 26 ++ .../serverAzureADAdministrators.json.json | 314 ++++++++++++++++++ specification/sql/resource-manager/readme.md | 6 +- 6 files changed, 427 insertions(+), 1 deletion(-) create mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json create mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json create mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json create mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminList.json create mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json.json diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json new file mode 100644 index 000000000000..03a3edcadb99 --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminCreateUpdate.json @@ -0,0 +1,39 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "administratorName": "activeDirectory", + "api-version": "2014-04-01", + "properties": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } + } + }, + "201": { + "body": "Created" + }, + "202": { + "body": "Accepted" + } + } +} diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json new file mode 100644 index 000000000000..dfe1c958a22d --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminDelete.json @@ -0,0 +1,20 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "administratorName": "activeDirectory", + "api-version": "2014-04-01" + }, + "responses": { + "200": { + "body": "OK" + }, + "202": { + "body": "Accepted" + }, + "204": { + "body": "No Content" + } + } +} diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json new file mode 100644 index 000000000000..64c6647f119e --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminGet.json @@ -0,0 +1,23 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "administratorName": "activeDirectory", + "api-version": "2014-04-01" + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/administrators/activeDirectory", + "name": "activeDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "bob@contoso.com", + "sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c", + "tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c" + } + } + } + } +} diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminList.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminList.json new file mode 100644 index 000000000000..f8cc4bd25a3b --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/examples/ServerAdminList.json @@ -0,0 +1,26 @@ +{ + "parameters": { + "subscriptionId": "00000000-1111-2222-3333-444444444444", + "resourceGroupName": "sqlcrudtest-4799", + "serverName": "sqlcrudtest-6440", + "api-version": "2014-04-01" + }, + "responses": { + "200": { + "body": { + "value": [ + { + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/sqlcrudtest-4799/providers/Microsoft.Sql/servers/sqlcrudtest-6440/providers/Microsoft.Sql/administrators/ActiveDirectory", + "name": "ActiveDirectory", + "properties": { + "administratorType": "ActiveDirectory", + "login": "DSEngAll", + "sid": "5e90ef3b-9b42-4777-819b-25c36961ea4d", + "tenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47" + } + } + ] + } + } + } +} diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json.json new file mode 100644 index 000000000000..97bdd63a54ef --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json.json @@ -0,0 +1,314 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure SQL Database API spec", + "description": "The Azure SQL Database management API provides a RESTful set of web services that interact with Azure SQL Database services to manage your external server administrators.", + "version": "2014-04-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { + "put": { + "tags": [ + "ServerAdministrators" + ], + "operationId": "ServerAzureADAdministrators_CreateOrUpdate", + "description": "Creates a new Server Active Directory Administrator or updates an existing server Active Directory Administrator.", + "x-ms-examples": { + "Create/Update a server administrator": { + "$ref": "./examples/ServerAdminCreateUpdate.json" + } + }, + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/AdministratorNameParameter" + }, + { + "name": "properties", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + }, + "description": "The required parameters for creating or updating an Active Directory Administrator." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + } + }, + "x-ms-long-running-operation": true + }, + "delete": { + "tags": [ + "ServerAdministrators" + ], + "operationId": "ServerAzureADAdministrators_Delete", + "description": "Deletes an existing server Active Directory Administrator.", + "x-ms-examples": { + "Delete a server administrator": { + "$ref": "./examples/ServerAdminDelete.json" + } + }, + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/AdministratorNameParameter" + } + ], + "responses": { + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + }, + "204": { + "description": "No Content", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + }, + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + } + }, + "x-ms-long-running-operation": true + }, + "get": { + "tags": [ + "ServerAdministrators" + ], + "operationId": "ServerAzureADAdministrators_Get", + "description": "Returns an server Administrator.", + "x-ms-examples": { + "Get the Active Directory Administrator": { + "$ref": "./examples/ServerAdminGet.json" + } + }, + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/AdministratorNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators": { + "get": { + "tags": [ + "ServerAdministrators" + ], + "operationId": "ServerAzureADAdministrators_ListByServer", + "description": "Returns a list of server Administrators.", + "x-ms-examples": { + "get a list of server administrators": { + "$ref": "./examples/ServerAdminList.json" + } + }, + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerAdministratorListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + } + }, + "definitions": { + "ServerAdministratorProperties": { + "properties": { + "administratorType": { + "type": "string", + "description": "The type of administrator.", + "enum": [ + "ActiveDirectory" + ], + "x-ms-enum": { + "name": "AdministratorType" + } + }, + "login": { + "type": "string", + "description": "The server administrator login value." + }, + "sid": { + "type": "string", + "description": "The server administrator Sid (Secure ID).", + "format": "uuid" + }, + "tenantId": { + "type": "string", + "description": "The server Active Directory Administrator tenant id.", + "format": "uuid" + } + }, + "required": [ + "tenantId", + "administratorType", + "login", + "sid" + ], + "description": "The properties of an server Administrator." + }, + "ServerAzureADAdministrator": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ServerAdministratorProperties", + "description": "The properties of the resource." + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" + } + ], + "description": "An server Active Directory Administrator." + }, + "ServerAdministratorListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ServerAzureADAdministrator" + }, + "description": "The list of server Active Directory Administrators for the server." + } + }, + "description": "The response to a list Active Directory Administrators request." + } + }, + "parameters": { + "ServerNameParameter": { + "name": "serverName", + "in": "path", + "required": true, + "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" + }, + "AdministratorNameParameter": { + "name": "administratorName", + "in": "path", + "description": "Name of the server administrator resource.", + "required": true, + "type": "string", + "enum": [ + "activeDirectory" + ], + "x-ms-enum": { + "name": "ServerAdministratorName" + }, + "x-ms-parameter-location": "method" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "description": "Azure Active Directory OAuth2 Flow", + "flow": "implicit", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + } +} diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 2dc5df657535..3f2a5fa726ab 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -340,6 +340,7 @@ input-file: - Microsoft.Sql/stable/2014-04-01/importExport.json - Microsoft.Sql/stable/2014-04-01/metrics.json - Microsoft.Sql/stable/2014-04-01/replicationLinks.json +- Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - Microsoft.Sql/stable/2014-04-01/serviceObjectives.json - Microsoft.Sql/stable/2014-04-01/sql.core.json @@ -404,6 +405,7 @@ input-file: - Microsoft.Sql/stable/2014-04-01/importExport.json - Microsoft.Sql/stable/2014-04-01/metrics.json - Microsoft.Sql/stable/2014-04-01/replicationLinks.json +- Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - Microsoft.Sql/stable/2014-04-01/serviceObjectives.json - Microsoft.Sql/stable/2014-04-01/sql.core.json @@ -647,6 +649,7 @@ input-file: - ./Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json - ./Microsoft.Sql/stable/2014-04-01/replicationLinks.json - ./Microsoft.Sql/stable/2014-04-01/restorePoints.json +- ./Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - ./Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - ./Microsoft.Sql/stable/2014-04-01/servers.json - ./Microsoft.Sql/stable/2014-04-01/serviceObjectives.json @@ -775,6 +778,7 @@ input-file: - $(this-folder)/Microsoft.Sql/stable/2014-04-01/metrics.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/recommendedElasticPoolsDecoupled.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/replicationLinks.json + - $(this-folder)/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/serviceObjectives.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/sql.core.json @@ -834,7 +838,6 @@ input-file: - $(this-folder)/Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - $(this-folder)/Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json - $(this-folder)/Microsoft.Sql/preview/2018-06-01-preview/PrivateLinkResources.json - - $(this-folder)/Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/capabilities.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/databases.json - $(this-folder)/Microsoft.Sql/stable/2014-04-01/elasticPools.json @@ -939,6 +942,7 @@ input-file: - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/replicationLinks.json - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/restorePoints.json + - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/servers.json - $(this-folder)/./Microsoft.Sql/stable/2014-04-01/serviceObjectives.json From 778c1bb4ded991f8da0dea9d3933745ce8a73a19 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Wed, 20 Nov 2019 11:56:05 -0800 Subject: [PATCH 40/42] fix a few things. --- .../serverAzureADAdministrators.json.json | 314 ------------------ specification/sql/resource-manager/readme.md | 2 +- 2 files changed, 1 insertion(+), 315 deletions(-) delete mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json.json diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json.json deleted file mode 100644 index 97bdd63a54ef..000000000000 --- a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json.json +++ /dev/null @@ -1,314 +0,0 @@ -{ - "swagger": "2.0", - "info": { - "title": "Azure SQL Database API spec", - "description": "The Azure SQL Database management API provides a RESTful set of web services that interact with Azure SQL Database services to manage your external server administrators.", - "version": "2014-04-01" - }, - "host": "management.azure.com", - "schemes": [ - "https" - ], - "consumes": [ - "application/json" - ], - "produces": [ - "application/json" - ], - "paths": { - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { - "put": { - "tags": [ - "ServerAdministrators" - ], - "operationId": "ServerAzureADAdministrators_CreateOrUpdate", - "description": "Creates a new Server Active Directory Administrator or updates an existing server Active Directory Administrator.", - "x-ms-examples": { - "Create/Update a server administrator": { - "$ref": "./examples/ServerAdminCreateUpdate.json" - } - }, - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "$ref": "#/parameters/AdministratorNameParameter" - }, - { - "name": "properties", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - }, - "description": "The required parameters for creating or updating an Active Directory Administrator." - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } - }, - "201": { - "description": "Created", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } - }, - "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } - } - }, - "x-ms-long-running-operation": true - }, - "delete": { - "tags": [ - "ServerAdministrators" - ], - "operationId": "ServerAzureADAdministrators_Delete", - "description": "Deletes an existing server Active Directory Administrator.", - "x-ms-examples": { - "Delete a server administrator": { - "$ref": "./examples/ServerAdminDelete.json" - } - }, - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "$ref": "#/parameters/AdministratorNameParameter" - } - ], - "responses": { - "202": { - "description": "Accepted", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } - }, - "204": { - "description": "No Content", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } - }, - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } - } - }, - "x-ms-long-running-operation": true - }, - "get": { - "tags": [ - "ServerAdministrators" - ], - "operationId": "ServerAzureADAdministrators_Get", - "description": "Returns an server Administrator.", - "x-ms-examples": { - "Get the Active Directory Administrator": { - "$ref": "./examples/ServerAdminGet.json" - } - }, - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - }, - { - "$ref": "#/parameters/AdministratorNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ServerAzureADAdministrator" - } - } - } - } - }, - "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators": { - "get": { - "tags": [ - "ServerAdministrators" - ], - "operationId": "ServerAzureADAdministrators_ListByServer", - "description": "Returns a list of server Administrators.", - "x-ms-examples": { - "get a list of server administrators": { - "$ref": "./examples/ServerAdminList.json" - } - }, - "parameters": [ - { - "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" - }, - { - "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" - }, - { - "$ref": "#/parameters/ServerNameParameter" - } - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/ServerAdministratorListResult" - } - } - }, - "x-ms-pageable": { - "nextLinkName": null - } - } - } - }, - "definitions": { - "ServerAdministratorProperties": { - "properties": { - "administratorType": { - "type": "string", - "description": "The type of administrator.", - "enum": [ - "ActiveDirectory" - ], - "x-ms-enum": { - "name": "AdministratorType" - } - }, - "login": { - "type": "string", - "description": "The server administrator login value." - }, - "sid": { - "type": "string", - "description": "The server administrator Sid (Secure ID).", - "format": "uuid" - }, - "tenantId": { - "type": "string", - "description": "The server Active Directory Administrator tenant id.", - "format": "uuid" - } - }, - "required": [ - "tenantId", - "administratorType", - "login", - "sid" - ], - "description": "The properties of an server Administrator." - }, - "ServerAzureADAdministrator": { - "properties": { - "properties": { - "x-ms-client-flatten": true, - "$ref": "#/definitions/ServerAdministratorProperties", - "description": "The properties of the resource." - } - }, - "allOf": [ - { - "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" - } - ], - "description": "An server Active Directory Administrator." - }, - "ServerAdministratorListResult": { - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/ServerAzureADAdministrator" - }, - "description": "The list of server Active Directory Administrators for the server." - } - }, - "description": "The response to a list Active Directory Administrators request." - } - }, - "parameters": { - "ServerNameParameter": { - "name": "serverName", - "in": "path", - "required": true, - "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" - }, - "AdministratorNameParameter": { - "name": "administratorName", - "in": "path", - "description": "Name of the server administrator resource.", - "required": true, - "type": "string", - "enum": [ - "activeDirectory" - ], - "x-ms-enum": { - "name": "ServerAdministratorName" - }, - "x-ms-parameter-location": "method" - } - }, - "securityDefinitions": { - "azure_auth": { - "type": "oauth2", - "description": "Azure Active Directory OAuth2 Flow", - "flow": "implicit", - "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", - "scopes": { - "user_impersonation": "impersonate your user account" - } - } - } -} diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 3f2a5fa726ab..38bcd3945ee6 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -649,7 +649,7 @@ input-file: - ./Microsoft.Sql/stable/2014-04-01/recommendedElasticPools.json - ./Microsoft.Sql/stable/2014-04-01/replicationLinks.json - ./Microsoft.Sql/stable/2014-04-01/restorePoints.json -- ./Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json + - ./Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json - ./Microsoft.Sql/stable/2014-04-01/serverCommunicationLinks.json - ./Microsoft.Sql/stable/2014-04-01/servers.json - ./Microsoft.Sql/stable/2014-04-01/serviceObjectives.json From d0d9cd0173446561b0197a71f3f51f3344ff2b30 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Wed, 20 Nov 2019 12:01:37 -0800 Subject: [PATCH 41/42] extra spaces. --- specification/sql/resource-manager/readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 38bcd3945ee6..270a66e23a16 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -959,4 +959,3 @@ uncomment the `exclude-file` section below and add the file paths. #exclude-file: # - $(this-folder)/Microsoft.Example/stable/2010-01-01/somefile.json ``` - From aef733a1c9dae5135eccd687941bc8c6d6e1f050 Mon Sep 17 00:00:00 2001 From: Amol Agarwal Date: Wed, 20 Nov 2019 12:36:54 -0800 Subject: [PATCH 42/42] Add back json and update readme.md --- .../serverAzureADAdministrators.json | 314 ++++++++++++++++++ specification/sql/resource-manager/readme.md | 1 + 2 files changed, 315 insertions(+) create mode 100644 specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json diff --git a/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json new file mode 100644 index 000000000000..97bdd63a54ef --- /dev/null +++ b/specification/sql/resource-manager/Microsoft.Sql/stable/2014-04-01/serverAzureADAdministrators.json @@ -0,0 +1,314 @@ +{ + "swagger": "2.0", + "info": { + "title": "Azure SQL Database API spec", + "description": "The Azure SQL Database management API provides a RESTful set of web services that interact with Azure SQL Database services to manage your external server administrators.", + "version": "2014-04-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators/{administratorName}": { + "put": { + "tags": [ + "ServerAdministrators" + ], + "operationId": "ServerAzureADAdministrators_CreateOrUpdate", + "description": "Creates a new Server Active Directory Administrator or updates an existing server Active Directory Administrator.", + "x-ms-examples": { + "Create/Update a server administrator": { + "$ref": "./examples/ServerAdminCreateUpdate.json" + } + }, + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/AdministratorNameParameter" + }, + { + "name": "properties", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + }, + "description": "The required parameters for creating or updating an Active Directory Administrator." + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + }, + "201": { + "description": "Created", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + }, + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + } + }, + "x-ms-long-running-operation": true + }, + "delete": { + "tags": [ + "ServerAdministrators" + ], + "operationId": "ServerAzureADAdministrators_Delete", + "description": "Deletes an existing server Active Directory Administrator.", + "x-ms-examples": { + "Delete a server administrator": { + "$ref": "./examples/ServerAdminDelete.json" + } + }, + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/AdministratorNameParameter" + } + ], + "responses": { + "202": { + "description": "Accepted", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + }, + "204": { + "description": "No Content", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + }, + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + } + }, + "x-ms-long-running-operation": true + }, + "get": { + "tags": [ + "ServerAdministrators" + ], + "operationId": "ServerAzureADAdministrators_Get", + "description": "Returns an server Administrator.", + "x-ms-examples": { + "Get the Active Directory Administrator": { + "$ref": "./examples/ServerAdminGet.json" + } + }, + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + }, + { + "$ref": "#/parameters/AdministratorNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerAzureADAdministrator" + } + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/administrators": { + "get": { + "tags": [ + "ServerAdministrators" + ], + "operationId": "ServerAzureADAdministrators_ListByServer", + "description": "Returns a list of server Administrators.", + "x-ms-examples": { + "get a list of server administrators": { + "$ref": "./examples/ServerAdminList.json" + } + }, + "parameters": [ + { + "$ref": "../../../common/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" + }, + { + "$ref": "#/parameters/ServerNameParameter" + } + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/ServerAdministratorListResult" + } + } + }, + "x-ms-pageable": { + "nextLinkName": null + } + } + } + }, + "definitions": { + "ServerAdministratorProperties": { + "properties": { + "administratorType": { + "type": "string", + "description": "The type of administrator.", + "enum": [ + "ActiveDirectory" + ], + "x-ms-enum": { + "name": "AdministratorType" + } + }, + "login": { + "type": "string", + "description": "The server administrator login value." + }, + "sid": { + "type": "string", + "description": "The server administrator Sid (Secure ID).", + "format": "uuid" + }, + "tenantId": { + "type": "string", + "description": "The server Active Directory Administrator tenant id.", + "format": "uuid" + } + }, + "required": [ + "tenantId", + "administratorType", + "login", + "sid" + ], + "description": "The properties of an server Administrator." + }, + "ServerAzureADAdministrator": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ServerAdministratorProperties", + "description": "The properties of the resource." + } + }, + "allOf": [ + { + "$ref": "../../../common/v1/types.json#/definitions/ProxyResource" + } + ], + "description": "An server Active Directory Administrator." + }, + "ServerAdministratorListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/ServerAzureADAdministrator" + }, + "description": "The list of server Active Directory Administrators for the server." + } + }, + "description": "The response to a list Active Directory Administrators request." + } + }, + "parameters": { + "ServerNameParameter": { + "name": "serverName", + "in": "path", + "required": true, + "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" + }, + "AdministratorNameParameter": { + "name": "administratorName", + "in": "path", + "description": "Name of the server administrator resource.", + "required": true, + "type": "string", + "enum": [ + "activeDirectory" + ], + "x-ms-enum": { + "name": "ServerAdministratorName" + }, + "x-ms-parameter-location": "method" + } + }, + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "description": "Azure Active Directory OAuth2 Flow", + "flow": "implicit", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + } +} diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 270a66e23a16..7200c9216dc8 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -502,6 +502,7 @@ input-file: - ./Microsoft.Sql/preview/2018-06-01-preview/FailoverDatabases.json - ./Microsoft.Sql/preview/2018-06-01-preview/FailoverElasticPools.json - ./Microsoft.Sql/preview/2018-06-01-preview/PrivateEndpointConnections.json + - ./Microsoft.Sql/preview/2018-06-01-preview/ServerAzureADAdministrators.json # Needed when there is more than one input file override-info: