From 91f61c1d1649b3f03fda9b01ee034795622d0862 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 2 Aug 2022 09:23:39 +0000 Subject: [PATCH] CodeGen from PR 19949 in Azure/azure-rest-api-specs Flexible MySQL: add APIs for AAD administrator (#19949) * Flexible MySQL server: add APIs for AAD administrator * Fix LintDiff error * Fix LintDiff check --- .../Microsoft.DBforMySQL.json | 128 ++++++++++++++++++ schemas/common/autogeneratedResources.json | 3 + 2 files changed, 131 insertions(+) diff --git a/schemas/2021-12-01-preview/Microsoft.DBforMySQL.json b/schemas/2021-12-01-preview/Microsoft.DBforMySQL.json index 60531f6a29..b9aec7e574 100644 --- a/schemas/2021-12-01-preview/Microsoft.DBforMySQL.json +++ b/schemas/2021-12-01-preview/Microsoft.DBforMySQL.json @@ -55,6 +55,9 @@ }, { "$ref": "#/definitions/flexibleServers_firewallRules_childResource" + }, + { + "$ref": "#/definitions/flexibleServers_administrators_childResource" } ] } @@ -101,6 +104,53 @@ ], "description": "Microsoft.DBforMySQL/flexibleServers" }, + "flexibleServers_administrators": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2021-12-01-preview" + ] + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^.*/ActiveDirectory$" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The name of the Azure AD Administrator." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/AdministratorProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The properties of an administrator." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.DBforMySQL/flexibleServers/administrators" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.DBforMySQL/flexibleServers/administrators" + }, "flexibleServers_backups": { "type": "object", "properties": { @@ -208,6 +258,42 @@ } }, "definitions": { + "AdministratorProperties": { + "type": "object", + "properties": { + "administratorType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "ActiveDirectory" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Type of the sever administrator." + }, + "identityResourceId": { + "type": "string", + "description": "The resource id of the identity used for AAD Authentication." + }, + "login": { + "type": "string", + "description": "Login name of the server administrator." + }, + "sid": { + "type": "string", + "description": "SID (object ID) of the server administrator." + }, + "tenantId": { + "type": "string", + "description": "Tenant ID of the administrator." + } + }, + "description": "The properties of an administrator." + }, "Backup": { "type": "object", "properties": { @@ -325,6 +411,48 @@ ], "description": "The properties of a server firewall rule." }, + "flexibleServers_administrators_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2021-12-01-preview" + ] + }, + "name": { + "type": "string", + "enum": [ + "ActiveDirectory" + ], + "description": "The name of the Azure AD Administrator." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/AdministratorProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The properties of an administrator." + }, + "type": { + "type": "string", + "enum": [ + "administrators" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.DBforMySQL/flexibleServers/administrators" + }, "flexibleServers_backups_childResource": { "type": "object", "properties": { diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index 24dd0993f7..f8890bfed7 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -6508,6 +6508,9 @@ { "$ref": "https://schema.management.azure.com/schemas/2021-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/flexibleServers" }, + { + "$ref": "https://schema.management.azure.com/schemas/2021-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/flexibleServers_administrators" + }, { "$ref": "https://schema.management.azure.com/schemas/2021-12-01-preview/Microsoft.DBforMySQL.json#/resourceDefinitions/flexibleServers_backups" },