Skip to content

Commit dc0d025

Browse files
author
msftbot[bot]
authored
[ReleasePR mysql] Flexible MySQL: add APIs for AAD administrator (#2504)
Create to sync Azure/azure-rest-api-specs#19949 [ReCreate this PR](https://github.com/azure-resource-manager-schemas/compare/main...azure-sdk:sdkAuto/mysql?expand=1)
2 parents e2de1ff + 91f61c1 commit dc0d025

File tree

2 files changed

+131
-0
lines changed

2 files changed

+131
-0
lines changed

schemas/2021-12-01-preview/Microsoft.DBforMySQL.json

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
},
5656
{
5757
"$ref": "#/definitions/flexibleServers_firewallRules_childResource"
58+
},
59+
{
60+
"$ref": "#/definitions/flexibleServers_administrators_childResource"
5861
}
5962
]
6063
}
@@ -101,6 +104,53 @@
101104
],
102105
"description": "Microsoft.DBforMySQL/flexibleServers"
103106
},
107+
"flexibleServers_administrators": {
108+
"type": "object",
109+
"properties": {
110+
"apiVersion": {
111+
"type": "string",
112+
"enum": [
113+
"2021-12-01-preview"
114+
]
115+
},
116+
"name": {
117+
"oneOf": [
118+
{
119+
"type": "string",
120+
"pattern": "^.*/ActiveDirectory$"
121+
},
122+
{
123+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
124+
}
125+
],
126+
"description": "The name of the Azure AD Administrator."
127+
},
128+
"properties": {
129+
"oneOf": [
130+
{
131+
"$ref": "#/definitions/AdministratorProperties"
132+
},
133+
{
134+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
135+
}
136+
],
137+
"description": "The properties of an administrator."
138+
},
139+
"type": {
140+
"type": "string",
141+
"enum": [
142+
"Microsoft.DBforMySQL/flexibleServers/administrators"
143+
]
144+
}
145+
},
146+
"required": [
147+
"apiVersion",
148+
"name",
149+
"properties",
150+
"type"
151+
],
152+
"description": "Microsoft.DBforMySQL/flexibleServers/administrators"
153+
},
104154
"flexibleServers_backups": {
105155
"type": "object",
106156
"properties": {
@@ -208,6 +258,42 @@
208258
}
209259
},
210260
"definitions": {
261+
"AdministratorProperties": {
262+
"type": "object",
263+
"properties": {
264+
"administratorType": {
265+
"oneOf": [
266+
{
267+
"type": "string",
268+
"enum": [
269+
"ActiveDirectory"
270+
]
271+
},
272+
{
273+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
274+
}
275+
],
276+
"description": "Type of the sever administrator."
277+
},
278+
"identityResourceId": {
279+
"type": "string",
280+
"description": "The resource id of the identity used for AAD Authentication."
281+
},
282+
"login": {
283+
"type": "string",
284+
"description": "Login name of the server administrator."
285+
},
286+
"sid": {
287+
"type": "string",
288+
"description": "SID (object ID) of the server administrator."
289+
},
290+
"tenantId": {
291+
"type": "string",
292+
"description": "Tenant ID of the administrator."
293+
}
294+
},
295+
"description": "The properties of an administrator."
296+
},
211297
"Backup": {
212298
"type": "object",
213299
"properties": {
@@ -325,6 +411,48 @@
325411
],
326412
"description": "The properties of a server firewall rule."
327413
},
414+
"flexibleServers_administrators_childResource": {
415+
"type": "object",
416+
"properties": {
417+
"apiVersion": {
418+
"type": "string",
419+
"enum": [
420+
"2021-12-01-preview"
421+
]
422+
},
423+
"name": {
424+
"type": "string",
425+
"enum": [
426+
"ActiveDirectory"
427+
],
428+
"description": "The name of the Azure AD Administrator."
429+
},
430+
"properties": {
431+
"oneOf": [
432+
{
433+
"$ref": "#/definitions/AdministratorProperties"
434+
},
435+
{
436+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
437+
}
438+
],
439+
"description": "The properties of an administrator."
440+
},
441+
"type": {
442+
"type": "string",
443+
"enum": [
444+
"administrators"
445+
]
446+
}
447+
},
448+
"required": [
449+
"apiVersion",
450+
"name",
451+
"properties",
452+
"type"
453+
],
454+
"description": "Microsoft.DBforMySQL/flexibleServers/administrators"
455+
},
328456
"flexibleServers_backups_childResource": {
329457
"type": "object",
330458
"properties": {

schemas/common/autogeneratedResources.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6508,6 +6508,9 @@
65086508
{
65096509
"$ref": "https://schema.management.azure.com/schemas/2021-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/flexibleServers"
65106510
},
6511+
{
6512+
"$ref": "https://schema.management.azure.com/schemas/2021-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/flexibleServers_administrators"
6513+
},
65116514
{
65126515
"$ref": "https://schema.management.azure.com/schemas/2021-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/flexibleServers_backups"
65136516
},

0 commit comments

Comments
 (0)