Skip to content

Swagger changes for Azure PostgreSQL, MySQL and MariaDB for feature parity #8511

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

Merged
allenjzhang merged 29 commits into from
Mar 12, 2020
Merged

Swagger changes for Azure PostgreSQL, MySQL and MariaDB for feature parity #8511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
e27df26
Change for Azure Postgres and MySQL Swagger to include M2 requirements
shinilm Feb 20, 2020
4968b42
Merge branch 'master' into orcas-feature-parity
shinilm Feb 24, 2020
17f86b4
MySQL AAD changes
shinilm Feb 25, 2020
a438082
Private Connection related changes
shinilm Feb 25, 2020
a6d1ae6
TLS rleated changes
shinilm Feb 25, 2020
ce751cf
Swagger changes for Azure PostgreSQL, MySQL and MariaDB
shinilm Feb 25, 2020
f35d5f7
Fixing the spelling and prettier check issues
shinilm Feb 25, 2020
b9cf312
Fixing LintDiff
shinilm Feb 25, 2020
4dceabc
Fixing Semantic Validation errors
shinilm Feb 26, 2020
804e5e9
Fixing Semantic Validation errors
shinilm Feb 26, 2020
872a5d7
Updating readme.md
shinilm Feb 26, 2020
f3dd3f9
Updating readme.md
shinilm Feb 26, 2020
a726fb0
Incroporating review coments
shinilm Feb 26, 2020
42f6bd1
Incroporating review coments
shinilm Feb 28, 2020
94d7f41
Fixing review coments
shinilm Feb 28, 2020
46f9655
Fixing review coments
shinilm Feb 28, 2020
bdf71e3
Adressing review comments
shinilm Mar 5, 2020
a9b1289
Adressing review comments
shinilm Mar 5, 2020
305059a
Adressing review comments
shinilm Mar 5, 2020
c39b963
Adressing review comments
shinilm Mar 5, 2020
af3a143
Adressing PrettierCheck errors
shinilm Mar 5, 2020
51faa4f
Adressing modal validation errors
shinilm Mar 5, 2020
57a297f
Adressing modal validation errors
shinilm Mar 5, 2020
ef3c8df
Updating descriptions
shinilm Mar 5, 2020
33bfacf
Updating descriptions
shinilm Mar 6, 2020
8cd2f70
Updating descriptions
shinilm Mar 7, 2020
7a7b97d
Updating the review comments
shinilm Mar 11, 2020
a6b26da
Updating the review comments
shinilm Mar 11, 2020
5423794
Updating the review comments
shinilm Mar 11, 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
19 changes: 18 additions & 1 deletion ...mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,24 @@
"earliestRestoreDate": "2018-03-14T18:02:41.577+00:00",
"replicationRole": "None",
"masterServerId": "",
"replicaCapacity": 5
"replicaCapacity": 5,
"publicNetworkAccess": "Enabled",
"privateEndpointConnections": [
{
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtestsvc4/privateEndpointConnections/private-endpoint-name-00000000-1111-2222-3333-444444444444",
"properties": {
"provisioningState": "Ready",
"privateEndpoint": {
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/Default-Network/providers/Microsoft.Network/privateEndpoints/private-endpoint-name"
},
"privateLinkServiceConnectionState": {
"status": "Approved",
"description": "Auto-approved",
"actionsRequired": "None"
}
}
}
]
},
"location": "westus",
"tags": {
Expand Down
42 changes: 39 additions & 3 deletions ...ariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
"sslEnforcement": "Enabled",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mariadbtestsvc1.mariadb.database.azure.com",
"earliestRestoreDate": "2018-02-28T23:56:02.627+00:00"
"earliestRestoreDate": "2018-02-28T23:56:02.627+00:00",
"publicNetworkAccess": "Enabled",
"privateEndpointConnections": []
},
"location": "westus",
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtestsvc1",
Expand All @@ -50,7 +52,24 @@
"sslEnforcement": "Enabled",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mariadbtstsvc2.mariadb.database.azure.com",
"earliestRestoreDate": "2018-02-28T23:56:54.3+00:00"
"earliestRestoreDate": "2018-02-28T23:56:54.3+00:00",
"publicNetworkAccess": "Enabled",
"privateEndpointConnections": [
{
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtstsvc2/privateEndpointConnections/private-endpoint-name-00000000-1111-2222-3333-444444444444",
"properties": {
"provisioningState": "Ready",
"privateEndpoint": {
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/Default-Network/providers/Microsoft.Network/privateEndpoints/private-endpoint-name"
},
"privateLinkServiceConnectionState": {
"status": "Approved",
"description": "Auto-approved",
"actionsRequired": "None"
}
}
}
]
},
"location": "westus",
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtstsvc2",
Expand All @@ -75,7 +94,24 @@
"sslEnforcement": "Enabled",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mariadbtestsvc3.mariadb.database.azure.com",
"earliestRestoreDate": "2018-02-28T23:59:44.847+00:00"
"earliestRestoreDate": "2018-02-28T23:59:44.847+00:00",
"publicNetworkAccess": "Enabled",
"privateEndpointConnections": [
{
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtestsvc3/privateEndpointConnections/private-endpoint-name-00000000-1111-2222-3333-444444444444",
"properties": {
"provisioningState": "Ready",
"privateEndpoint": {
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/Default-Network/providers/Microsoft.Network/privateEndpoints/private-endpoint-name"
},
"privateLinkServiceConnectionState": {
"status": "Approved",
"description": "Auto-approved",
"actionsRequired": "None"
}
}
}
]
},
"location": "westus",
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg1/providers/Microsoft.DBforMariaDB/servers/mariadbtestsvc3",
Expand Down
23 changes: 21 additions & 2 deletions ...-manager/Microsoft.DBforMariaDB/stable/2018-06-01/examples/ServerListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@
"sslEnforcement": "Enabled",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mariadbtestsvc1.mariadb.database.azure.com",
"earliestRestoreDate": "2018-03-07T18:17:35.729321+00:00"
"earliestRestoreDate": "2018-03-07T18:17:35.729321+00:00",
"publicNetworkAccess": "Enabled",
"privateEndpointConnections": []
},
"location": "westus",
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtestsvc1",
Expand All @@ -51,7 +53,24 @@
"sslEnforcement": "Enabled",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mariadbtstsvc2.mariadb.database.azure.com",
"earliestRestoreDate": "2018-03-07T18:17:35.729321+00:00"
"earliestRestoreDate": "2018-03-07T18:17:35.729321+00:00",
"publicNetworkAccess": "Enabled",
"privateEndpointConnections": [
{
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtstsvc2/privateEndpointConnections/private-endpoint-name-00000000-1111-2222-3333-444444444444",
"properties": {
"provisioningState": "Ready",
"privateEndpoint": {
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/Default-Network/providers/Microsoft.Network/privateEndpoints/private-endpoint-name"
},
"privateLinkServiceConnectionState": {
"status": "Approved",
"description": "Auto-approved",
"actionsRequired": "None"
}
}
}
]
},
"location": "westus",
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMariaDB/servers/mariadbtstsvc2",
Expand Down
115 changes: 115 additions & 0 deletions specification/mariadb/resource-manager/Microsoft.DBforMariaDB/stable/2018-06-01/mariadb.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,6 +1320,101 @@
"modelAsString": false
}
},
"ServerPrivateEndpointConnection": {
"description": "A private endpoint connection under a server",
"type": "object",
"properties": {
"id": {
"description": "Resource Id of the private endpoint connection.",
"type": "string",
"readOnly": true
},
"properties": {
"$ref": "#/definitions/ServerPrivateEndpointConnectionProperties",
"description": "Private endpoint connection properties",
"readOnly": true
}
}
},
"ServerPrivateEndpointConnectionProperties": {
"description": "Properties of a private endpoint connection.",
"type": "object",
"properties": {
"privateEndpoint": {
"$ref": "#/definitions/PrivateEndpointProperty",
"description": "Private endpoint which the connection belongs to."
},
"privateLinkServiceConnectionState": {
"$ref": "#/definitions/ServerPrivateLinkServiceConnectionStateProperty",
"description": "Connection state of the private endpoint connection."
},
"provisioningState": {
"description": "State of the private endpoint connection.",
"enum": [
"Approving",
"Ready",
"Dropping",
"Failed",
"Rejecting"
],
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "PrivateEndpointProvisioningState",
"modelAsString": true
}
}
}
},
"PrivateEndpointProperty": {
"type": "object",
"properties": {
"id": {
"description": "Resource id of the private endpoint.",
"type": "string"
}
},
"x-ms-azure-resource": true
},
"ServerPrivateLinkServiceConnectionStateProperty": {
"required": [
"status",
"description"
],
"type": "object",
"properties": {
"status": {
"description": "The private link service connection status.",
"enum": [
"Approved",
"Pending",
"Rejected",
"Disconnected"
],
"type": "string",
"x-ms-enum": {
"name": "PrivateLinkServiceConnectionStateStatus",
"modelAsString": true
}
},
"description": {
"description": "The private link service connection description.",
"type": "string"
},
"actionsRequired": {
"description": "The actions required for private link service connection.",
"enum": [
"None"
],
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "PrivateLinkServiceConnectionStateActionsRequire",
"modelAsString": true
}
}
}
},
"TrackedResource": {
"description": "Resource properties including location and tags for track resources.",
"properties": {
Expand Down Expand Up @@ -1401,6 +1496,26 @@
"format": "int32",
"minimum": 0,
"description": "The maximum number of replicas that a master server can have."
},
"publicNetworkAccess": {
"type": "string",
"description": "Whether or not public endpoint access is allowed for this server. Value is optional but if passed in, must be 'Enabled' or 'Disabled'",
"enum": [
"Enabled",
"Disabled"
],
"x-ms-enum": {
"name": "PublicNetworkAccessEnum",
"modelAsString": true
}
},
"privateEndpointConnections": {
"description": "List of private endpoint connections on a server",
"type": "array",
"items": {
"$ref": "#/definitions/ServerPrivateEndpointConnection"
},
"readOnly": true
}
},
"description": "The properties of a server."
Expand Down
12 changes: 11 additions & 1 deletion ...ger/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerAdminCreateUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,17 @@
}
},
"202": {
"body": "Accepted"
"body": {
"id": "/subscriptions/ffffffff-ffff-ffff-ffff-ffffffffffff/resourceGroups/testrg/providers/Microsoft.DBforMySQL/servers/mysqltestsvc4/administrators/activeDirectory",
"name": "activeDirectory",
"type": "Microsoft.DBforMySQL/servers/administrators",
"properties": {
"administratorType": "ActiveDirectory",
"login": "bob@contoso.com",
"sid": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c",
"tenantId": "c6b82b90-a647-49cb-8a62-0d2d3cb7ac7c"
}
}
}
}
}
12 changes: 3 additions & 9 deletions ...e-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerAdminDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,8 @@
"api-version": "2017-12-01-preview"
},
"responses": {
"200": {
"body": "OK"
},
"202": {
"body": "Accepted"
},
"204": {
"body": "No Content"
}
"200": {},
"202": {},
"204": {}
}
}
2 changes: 2 additions & 0 deletions ...source-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"administratorLogin": "cloudsa",
"administratorLoginPassword": "pass$w0rd",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_2",
"storageProfile": {
"storageMB": 128000,
"backupRetentionDays": 7,
Expand Down Expand Up @@ -46,6 +47,7 @@
},
"version": "5.7",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_2",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com",
"earliestRestoreDate": "2018-03-14T18:02:41.577+00:00"
Expand Down
1 change: 1 addition & 0 deletions .../resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
},
"version": "5.7",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_0",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mysqltestsvc4.mysql.database.azure.com",
"earliestRestoreDate": "2018-03-14T18:02:41.577+00:00",
Expand Down
3 changes: 3 additions & 0 deletions ...resource-manager/Microsoft.DBforMySQL/preview/2017-12-01-preview/examples/ServerList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
},
"version": "5.7",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_2",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mysqltestsvc1.mysql.database.azure.com",
"earliestRestoreDate": "2018-02-28T23:56:02.627+00:00"
Expand All @@ -48,6 +49,7 @@
},
"version": "5.7",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_1",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mysqltstsvc2.mysql.database.azure.com",
"earliestRestoreDate": "2018-02-28T23:56:54.3+00:00"
Expand All @@ -73,6 +75,7 @@
},
"version": "5.7",
"sslEnforcement": "Enabled",
"minimalTlsVersion": "TLS1_0",
"userVisibleState": "Ready",
"fullyQualifiedDomainName": "mysqltestsvc3.mysql.database.azure.com",
"earliestRestoreDate": "2018-02-28T23:59:44.847+00:00"
Expand Down
Loading