Skip to content

Commit

Permalink
Add a new api and add 2020-02-02-preview versions (Azure#9710)
Browse files Browse the repository at this point in the history
* Add a new api and add 2020-02-02-preview versions

* Fix get and list example files.

* Remove 2019 api version from composite and update examples to 2020 api version.

* Create a new AzureADOnlyAuthentications api and remove enable\disable apis.

* update readme file.

* remove blank line and other azureADOnlyAuthentication parameter from aad admin api.

* Add missing curly braces and parameters.

* fix typo

* Prettier fixes

* Fix more prettier issues.

Co-authored-by: Amol Agarwal <amagarwa@microsoft.com>
  • Loading branch information
2 people authored and 00Kai0 committed Oct 12, 2020
1 parent 9e300b5 commit c30a24b
Show file tree
Hide file tree
Showing 11 changed files with 557 additions and 84 deletions.
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": {
"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
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
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
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

This file was deleted.

Loading

0 comments on commit c30a24b

Please sign in to comment.