From 91dc6ee2ca9bf5b03b7a57ba6fb848d89181d057 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 29 Apr 2022 08:46:38 +0000 Subject: [PATCH] CodeGen from PR 18751 in Azure/azure-rest-api-specs Update ManagedServerDnsAliases API definition (#18751) * Update managed server dns alias api definition * Update example files --- schemas/2020-11-01-preview/Microsoft.Sql.json | 24 ++++++------ schemas/2021-05-01-preview/Microsoft.Sql.json | 6 +-- schemas/2021-08-01-preview/Microsoft.Sql.json | 37 ------------------- schemas/2021-11-01-preview/Microsoft.Sql.json | 37 ------------------- 4 files changed, 15 insertions(+), 89 deletions(-) diff --git a/schemas/2020-11-01-preview/Microsoft.Sql.json b/schemas/2020-11-01-preview/Microsoft.Sql.json index 2e90f6bab7..0b0b952c45 100644 --- a/schemas/2020-11-01-preview/Microsoft.Sql.json +++ b/schemas/2020-11-01-preview/Microsoft.Sql.json @@ -1120,12 +1120,6 @@ "type": "array", "items": { "oneOf": [ - { - "$ref": "#/definitions/servers_extendedAuditingSettings_childResource" - }, - { - "$ref": "#/definitions/servers_auditingSettings_childResource" - }, { "$ref": "#/definitions/servers_encryptionProtector_childResource" }, @@ -1171,6 +1165,12 @@ { "$ref": "#/definitions/servers_databases_childResource" }, + { + "$ref": "#/definitions/servers_extendedAuditingSettings_childResource" + }, + { + "$ref": "#/definitions/servers_auditingSettings_childResource" + }, { "$ref": "#/definitions/servers_elasticPools_childResource" } @@ -1381,12 +1381,6 @@ "type": "array", "items": { "oneOf": [ - { - "$ref": "#/definitions/servers_databases_extendedAuditingSettings_childResource" - }, - { - "$ref": "#/definitions/servers_databases_auditingSettings_childResource" - }, { "$ref": "#/definitions/servers_databases_securityAlertPolicies_childResource" }, @@ -1408,6 +1402,12 @@ { "$ref": "#/definitions/servers_databases_backupShortTermRetentionPolicies_childResource" }, + { + "$ref": "#/definitions/servers_databases_extendedAuditingSettings_childResource" + }, + { + "$ref": "#/definitions/servers_databases_auditingSettings_childResource" + }, { "$ref": "#/definitions/servers_databases_extensions_childResource" }, diff --git a/schemas/2021-05-01-preview/Microsoft.Sql.json b/schemas/2021-05-01-preview/Microsoft.Sql.json index a994476133..8641ea631b 100644 --- a/schemas/2021-05-01-preview/Microsoft.Sql.json +++ b/schemas/2021-05-01-preview/Microsoft.Sql.json @@ -198,9 +198,6 @@ { "$ref": "#/definitions/managedInstances_distributedAvailabilityGroups_childResource" }, - { - "$ref": "#/definitions/managedInstances_serverTrustCertificates_childResource" - }, { "$ref": "#/definitions/managedInstances_databases_childResource" }, @@ -225,6 +222,9 @@ { "$ref": "#/definitions/managedInstances_securityAlertPolicies_childResource" }, + { + "$ref": "#/definitions/managedInstances_serverTrustCertificates_childResource" + }, { "$ref": "#/definitions/managedInstances_sqlAgent_childResource" } diff --git a/schemas/2021-08-01-preview/Microsoft.Sql.json b/schemas/2021-08-01-preview/Microsoft.Sql.json index 53a5c132a6..dfefa65c6c 100644 --- a/schemas/2021-08-01-preview/Microsoft.Sql.json +++ b/schemas/2021-08-01-preview/Microsoft.Sql.json @@ -3599,21 +3599,6 @@ "DatabaseIdentity": { "type": "object", "properties": { - "delegatedResources": { - "oneOf": [ - { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/Delegation" - }, - "properties": {} - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Resources delegated to the database - Internal Use Only" - }, "type": { "oneOf": [ { @@ -3786,18 +3771,6 @@ ], "description": "Minimal capacity that database will always have allocated, if not paused" }, - "primaryDelegatedIdentityClientId": { - "oneOf": [ - { - "type": "string", - "pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The Primary Delegated Identity Client id used for per database CMK - for internal use only" - }, "readScale": { "oneOf": [ { @@ -3985,16 +3958,6 @@ ], "description": "Properties of a database Vulnerability Assessment rule baseline." }, - "Delegation": { - "type": "object", - "properties": { - "resourceId": { - "type": "string", - "description": "The resource id of the source resource - Internal Use Only" - } - }, - "description": "Delegated Resource Properties - Internal Use Only" - }, "DistributedAvailabilityGroupProperties": { "type": "object", "properties": { diff --git a/schemas/2021-11-01-preview/Microsoft.Sql.json b/schemas/2021-11-01-preview/Microsoft.Sql.json index 530e4fd980..0bbecb208b 100644 --- a/schemas/2021-11-01-preview/Microsoft.Sql.json +++ b/schemas/2021-11-01-preview/Microsoft.Sql.json @@ -3784,21 +3784,6 @@ "DatabaseIdentity": { "type": "object", "properties": { - "delegatedResources": { - "oneOf": [ - { - "type": "object", - "additionalProperties": { - "$ref": "#/definitions/Delegation" - }, - "properties": {} - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "Resources delegated to the database - Internal Use Only" - }, "type": { "oneOf": [ { @@ -3971,18 +3956,6 @@ ], "description": "Minimal capacity that database will always have allocated, if not paused" }, - "primaryDelegatedIdentityClientId": { - "oneOf": [ - { - "type": "string", - "pattern": "^[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}$" - }, - { - "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" - } - ], - "description": "The Primary Delegated Identity Client id used for per database CMK - for internal use only" - }, "readScale": { "oneOf": [ { @@ -4170,16 +4143,6 @@ ], "description": "Properties of a database Vulnerability Assessment rule baseline." }, - "Delegation": { - "type": "object", - "properties": { - "resourceId": { - "type": "string", - "description": "The resource id of the source resource - Internal Use Only" - } - }, - "description": "Delegated Resource Properties - Internal Use Only" - }, "DistributedAvailabilityGroupProperties": { "type": "object", "properties": {