Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a new api and add 2020-02-02-preview versions #9710

Merged
merged 12 commits into from
Jul 25, 2020
Merged

Add a new api and add 2020-02-02-preview versions #9710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
bb740c9
Add a new api and add 2020-02-02-preview versions
amolagar5 Jun 4, 2020
23e3fc4
Fix get and list example files.
amolagar5 Jun 4, 2020
1384f76
Merge branch 'master' of https://github.com/azure/azure-rest-api-spec…
amolagar5 Jul 1, 2020
ff0596e
Remove 2019 api version from composite and update examples to 2020 ap…
amolagar5 Jul 2, 2020
3e1539d
Merge branch 'master' of https://github.com/azure/azure-rest-api-spec…
amolagar5 Jul 22, 2020
d8487a0
Create a new AzureADOnlyAuthentications api and remove enable\disable…
amolagar5 Jul 23, 2020
20e05b1
update readme file.
amolagar5 Jul 23, 2020
65f3c07
remove blank line and other azureADOnlyAuthentication parameter from …
amolagar5 Jul 23, 2020
35b2bdb
Add missing curly braces and parameters.
amolagar5 Jul 23, 2020
26ce1d9
fix typo
amolagar5 Jul 23, 2020
fdb8ea2
Prettier fixes
amolagar5 Jul 23, 2020
1f49571
Fix more prettier issues.
amolagar5 Jul 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 30 additions & 47 deletions ...esource-manager/Microsoft.Sql/preview/2019-06-01-preview/ServerAzureADAdministrators.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@
{
"name": "administratorName",
"in": "path",
"description": "The name of server active directory administrator.",
"required": true,
"type": "string",
"enum": [
Expand All @@ -103,7 +104,7 @@
{
"name": "parameters",
"in": "body",
"description": "The required parameters for creating or updating an Active Directory Administrator.",
"description": "The requested Azure Active Directory administrator Resource state.",
"required": true,
"schema": {
"$ref": "#/definitions/ServerAzureADAdministrator"
Expand All @@ -118,7 +119,7 @@
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidServerAzureADOnlyAuthenticationParameter - User tried to set AzureADOnlyAuthentication parameter to false which is not allowed, please use disableAzureADOnlyAuthentication API instead.\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."
"description": "*** Error Responses: ***\n\n * 400 InvalidServerAzureADOnlyAuthenticationParameter - User tried to set AzureADOnlyAuthentication parameter to false which is not allowed, please use azureADOnlyAuthentications API instead.\n\n * 400 InvalidServerAzureADAdminDeleteOperation - User tried to delete server Azure Active Azure admin when AzureADOnlyAuthentication is set, please use azureADOnlyAuthentications API first.\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"
Expand Down Expand Up @@ -176,7 +177,7 @@
"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."
"description": "*** Error Responses: ***\n\n * 400 InvalidServerAzureADOnlyAuthenticationParameter - User tried to set AzureADOnlyAuthentication parameter to false which is not allowed, please use azureADOnlyAuthentications API instead.\n\n * 400 InvalidServerAzureADAdminDeleteOperation - User tried to delete server Azure Active Azure admin when AzureADOnlyAuthentication is set, please use azureADOnlyAuthentications API first.\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"
Expand Down Expand Up @@ -234,49 +235,6 @@
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/disableAzureADOnlyAuthentication": {
amolagar5 marked this conversation as resolved.
Show resolved Hide resolved
"post": {
"tags": [
"ServerAzureADAdministrators"
],
"description": "Disables Azure Active Directory only authentication on logical Server.",
"operationId": "ServerAzureADAdministrators_DisableAzureADOnlyAuthentication",
"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": "Successfully disabled Azure Active Directory only authentication on logical server.",
"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"
}
},
"x-ms-long-running-operation": true,
"x-ms-examples": {
"Disables Azure Active Directory only authentication on logical server.": {
"$ref": "./examples/DisableAzureADOnlyAuthUpdate.json"
}
}
}
}
},
"definitions": {
Expand Down Expand Up @@ -316,7 +274,8 @@
},
"azureADOnlyAuthentication": {
"description": "Azure Active Directory only Authentication enabled.",
"type": "boolean"
"type": "boolean",
"readOnly": true
}
}
},
Expand Down Expand Up @@ -447,6 +406,30 @@
"required": true,
"type": "string",
"x-ms-parameter-location": "method"
},
"WorkspaceNameParameter": {
"name": "workspaceName",
"in": "path",
"description": "The name of the workspace.",
"required": true,
"type": "string",
"x-ms-parameter-location": "method"
},
"SqlPoolNameParameter": {
"name": "sqlPoolName",
"in": "path",
"description": "The name of the sql pool.",
"required": true,
"type": "string",
"x-ms-parameter-location": "method"
},
"SqlDatabaseNameParameter": {
"name": "sqlDatabaseName",
"in": "path",
"description": "The name of the sql database.",
"required": true,
"type": "string",
"x-ms-parameter-location": "method"
}
},
"securityDefinitions": {
Expand Down
9 changes: 3 additions & 6 deletions ...anager/Microsoft.Sql/preview/2019-06-01-preview/examples/AdministratorCreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"administratorType": "ActiveDirectory",
"login": "bob@contoso.com",
"sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
"tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
"azureADOnlyAuthentication": true
"tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c"
}
}
},
Expand All @@ -26,8 +25,7 @@
"administratorType": "ActiveDirectory",
"login": "bob@contoso.com",
"sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
"tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
"azureADOnlyAuthentication": true
"tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c"
}
}
},
Expand All @@ -40,8 +38,7 @@
"administratorType": "ActiveDirectory",
"login": "bob@contoso.com",
"sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
"tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
"azureADOnlyAuthentication": true
"tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c"
}
}
},
Expand Down
3 changes: 1 addition & 2 deletions .../resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/AdministratorGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
"administratorType": "ActiveDirectory",
"login": "bob@contoso.com",
"sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
"tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
"azureADOnlyAuthentication": true
"tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...resource-manager/Microsoft.Sql/preview/2019-06-01-preview/examples/AdministratorList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"administratorType": "ActiveDirectory",
"login": "bob@contoso.com",
"sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
"tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
"azureADOnlyAuthentication": true
"tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c"
}
}
]
Expand Down
26 changes: 0 additions & 26 deletions ...nager/Microsoft.Sql/preview/2019-06-01-preview/examples/DisableAzureADOnlyAuthUpdate.json
View file
Open in desktop

This file was deleted.

Loading