From 89d56a8826733a328ae2ef9234d6dd5df825e9d3 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Wed, 2 Sep 2020 20:15:39 +0000 Subject: [PATCH] Generated from ba10ad3eff472aea928c189c4f9293702cd7dad7 Merge branch 'master' into dev/ayang/backupStorageRedundancy --- schemas/2014-04-01/Microsoft.Sql.json | 35 +- schemas/2015-05-01-preview/Microsoft.Sql.json | 12 +- schemas/2017-03-01-preview/Microsoft.Sql.json | 15 +- schemas/2017-10-01-preview/Microsoft.Sql.json | 13 +- schemas/2019-06-01-preview/Microsoft.Sql.json | 19 +- schemas/2020-02-02-preview/Microsoft.Sql.json | 584 ++++++++++++++++++ schemas/common/autogeneratedResources.json | 9 + 7 files changed, 636 insertions(+), 51 deletions(-) diff --git a/schemas/2014-04-01/Microsoft.Sql.json b/schemas/2014-04-01/Microsoft.Sql.json index 046df89586..ffec89f5ec 100644 --- a/schemas/2014-04-01/Microsoft.Sql.json +++ b/schemas/2014-04-01/Microsoft.Sql.json @@ -24,7 +24,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/ServerPropertiesModel" + "$ref": "#/definitions/ServerProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -160,7 +160,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/AdvisorPropertiesModel" + "$ref": "#/definitions/AdvisorProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -422,7 +422,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/AdvisorPropertiesModel" + "$ref": "#/definitions/AdvisorProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -874,7 +874,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/ElasticPoolPropertiesModel" + "$ref": "#/definitions/ElasticPoolProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -954,7 +954,7 @@ } }, "definitions": { - "AdvisorPropertiesModel": { + "AdvisorProperties": { "type": "object", "properties": { "autoExecuteValue": { @@ -1032,10 +1032,7 @@ "PointInTimeRestore", "Recovery", "Restore", - "RestoreLongTermRetentionBackup", - "Secondary", - "RestoreExternalBackup", - "RestoreExternalBackupSecondary" + "RestoreLongTermRetentionBackup" ] }, { @@ -1191,16 +1188,14 @@ "restorePointInTime": { "type": "string", "format": "date-time", - "description": "Specifies the point in time (ISO8601 format) of the source database that will be restored to create the new database." + "description": "Conditional. If createMode is PointInTimeRestore, this value is required. If createMode is Restore, this value is optional. Specifies the point in time (ISO8601 format) of the source database that will be restored to create the new database. Must be greater than or equal to the source database's earliestRestoreDate value." }, "sampleName": { "oneOf": [ { "type": "string", "enum": [ - "AdventureWorksLT", - "WideWorldImportersStd", - "WideWorldImportersFull" + "AdventureWorksLT" ] }, { @@ -1212,11 +1207,11 @@ "sourceDatabaseDeletionDate": { "type": "string", "format": "date-time", - "description": "Specifies the time that the database was deleted." + "description": "Conditional. If createMode is Restore and sourceDatabaseId is the deleted database's original resource id when it existed (as opposed to its current restorable dropped database id), then this value is required. Specifies the time that the database was deleted." }, "sourceDatabaseId": { "type": "string", - "description": "The resource identifier of the source database associated with create operation of this database." + "description": "Conditional. If createMode is Copy, NonReadableSecondary, OnlineSecondary, PointInTimeRestore, Recovery, or Restore, then this value is required. Specifies the resource ID of the source database. If createMode is NonReadableSecondary or OnlineSecondary, the name of the source database must be the same as the new database being created." }, "zoneRedundant": { "oneOf": [ @@ -1486,7 +1481,7 @@ ], "description": "The properties of a database data masking rule." }, - "ElasticPoolPropertiesModel": { + "ElasticPoolProperties": { "type": "object", "properties": { "databaseDtuMax": { @@ -1773,7 +1768,7 @@ ], "description": "The properties of a server secure connection policy." }, - "ServerPropertiesModel": { + "ServerProperties": { "type": "object", "properties": { "administratorLogin": { @@ -1860,7 +1855,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/AdvisorPropertiesModel" + "$ref": "#/definitions/AdvisorProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -2022,7 +2017,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/AdvisorPropertiesModel" + "$ref": "#/definitions/AdvisorProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -2488,7 +2483,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/ElasticPoolPropertiesModel" + "$ref": "#/definitions/ElasticPoolProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" diff --git a/schemas/2015-05-01-preview/Microsoft.Sql.json b/schemas/2015-05-01-preview/Microsoft.Sql.json index b0d4ffc0d7..b8e76f058b 100644 --- a/schemas/2015-05-01-preview/Microsoft.Sql.json +++ b/schemas/2015-05-01-preview/Microsoft.Sql.json @@ -243,7 +243,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/SyncGroupPropertiesModel" + "$ref": "#/definitions/SyncGroupProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -292,7 +292,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/SyncMemberPropertiesModel" + "$ref": "#/definitions/SyncMemberProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -824,7 +824,7 @@ ], "description": "Read-write endpoint of the failover group instance." }, - "FirewallRuleModel": { + "FirewallRule": { "type": "object", "properties": { "name": { @@ -1093,7 +1093,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/SyncMemberPropertiesModel" + "$ref": "#/definitions/SyncMemberProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -1418,7 +1418,7 @@ }, "description": "Properties of an Azure SQL Database sync agent." }, - "SyncGroupPropertiesModel": { + "SyncGroupProperties": { "type": "object", "properties": { "conflictResolutionPolicy": { @@ -1539,7 +1539,7 @@ }, "description": "Properties of column in sync group table." }, - "SyncMemberPropertiesModel": { + "SyncMemberProperties": { "type": "object", "properties": { "databaseName": { diff --git a/schemas/2017-03-01-preview/Microsoft.Sql.json b/schemas/2017-03-01-preview/Microsoft.Sql.json index 19b22c572d..4c10346eba 100644 --- a/schemas/2017-03-01-preview/Microsoft.Sql.json +++ b/schemas/2017-03-01-preview/Microsoft.Sql.json @@ -378,7 +378,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/DatabasePropertiesModel" + "$ref": "#/definitions/DatabaseProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -1247,7 +1247,7 @@ ], "description": "Properties of a database blob auditing policy." }, - "DatabasePropertiesModel": { + "DatabaseProperties": { "type": "object", "properties": { "catalogCollation": { @@ -1274,17 +1274,16 @@ { "type": "string", "enum": [ - "Copy", "Default", - "NonReadableSecondary", + "Copy", + "Secondary", "OnlineSecondary", "PointInTimeRestore", - "Recovery", "Restore", - "RestoreLongTermRetentionBackup", - "Secondary", + "Recovery", "RestoreExternalBackup", - "RestoreExternalBackupSecondary" + "RestoreExternalBackupSecondary", + "RestoreLongTermRetentionBackup" ] }, { diff --git a/schemas/2017-10-01-preview/Microsoft.Sql.json b/schemas/2017-10-01-preview/Microsoft.Sql.json index 86f5bf98f7..e48b3afc45 100644 --- a/schemas/2017-10-01-preview/Microsoft.Sql.json +++ b/schemas/2017-10-01-preview/Microsoft.Sql.json @@ -480,17 +480,16 @@ { "type": "string", "enum": [ - "Copy", "Default", - "NonReadableSecondary", - "OnlineSecondary", + "Copy", + "Secondary", "PointInTimeRestore", - "Recovery", "Restore", - "RestoreLongTermRetentionBackup", - "Secondary", + "Recovery", "RestoreExternalBackup", - "RestoreExternalBackupSecondary" + "RestoreExternalBackupSecondary", + "RestoreLongTermRetentionBackup", + "OnlineSecondary" ] }, { diff --git a/schemas/2019-06-01-preview/Microsoft.Sql.json b/schemas/2019-06-01-preview/Microsoft.Sql.json index 6fd77337fe..20e055e042 100644 --- a/schemas/2019-06-01-preview/Microsoft.Sql.json +++ b/schemas/2019-06-01-preview/Microsoft.Sql.json @@ -213,7 +213,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/DatabasePropertiesModel" + "$ref": "#/definitions/DatabaseProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" @@ -507,7 +507,7 @@ ], "description": "Properties of a active directory administrator." }, - "DatabasePropertiesModel": { + "DatabaseProperties": { "type": "object", "properties": { "autoPauseDelay": { @@ -545,17 +545,16 @@ { "type": "string", "enum": [ - "Copy", "Default", - "NonReadableSecondary", - "OnlineSecondary", + "Copy", + "Secondary", "PointInTimeRestore", - "Recovery", "Restore", - "RestoreLongTermRetentionBackup", - "Secondary", + "Recovery", "RestoreExternalBackup", - "RestoreExternalBackupSecondary" + "RestoreExternalBackupSecondary", + "RestoreLongTermRetentionBackup", + "OnlineSecondary" ] }, { @@ -898,7 +897,7 @@ "properties": { "oneOf": [ { - "$ref": "#/definitions/DatabasePropertiesModel" + "$ref": "#/definitions/DatabaseProperties" }, { "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" diff --git a/schemas/2020-02-02-preview/Microsoft.Sql.json b/schemas/2020-02-02-preview/Microsoft.Sql.json index 99d4ec337b..ba8107539c 100644 --- a/schemas/2020-02-02-preview/Microsoft.Sql.json +++ b/schemas/2020-02-02-preview/Microsoft.Sql.json @@ -4,6 +4,150 @@ "title": "Microsoft.Sql", "description": "Microsoft Sql Resource Types", "resourceDefinitions": { + "managedInstances": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-02-02-preview" + ] + }, + "identity": { + "oneOf": [ + { + "$ref": "#/definitions/ResourceIdentity" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Azure Active Directory identity configuration for a resource." + }, + "location": { + "type": "string", + "description": "Resource location." + }, + "name": { + "type": "string", + "description": "The name of the managed instance." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/ManagedInstanceProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The properties of a managed instance." + }, + "resources": { + "type": "array", + "items": { + "oneOf": [ + { + "$ref": "#/definitions/managedInstances_databases_childResource" + }, + { + "$ref": "#/definitions/managedInstances_azureADOnlyAuthentications_childResource" + }, + { + "$ref": "#/definitions/managedInstances_securityAlertPolicies_childResource" + } + ] + } + }, + "sku": { + "oneOf": [ + { + "$ref": "#/definitions/Sku" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "An ARM Resource SKU." + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Sql/managedInstances" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.Sql/managedInstances" + }, + "managedInstances_azureADOnlyAuthentications": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-02-02-preview" + ] + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^.*/Default$" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The name of server azure active directory only authentication." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/ManagedInstanceAzureADOnlyAuthProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of a active directory only authentication for Managed Instance." + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Sql/managedInstances/azureADOnlyAuthentications" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Sql/managedInstances/azureADOnlyAuthentications" + }, "managedInstances_databases": { "type": "object", "properties": { @@ -157,6 +301,53 @@ ], "description": "Microsoft.Sql/servers/azureADOnlyAuthentications" }, + "servers_databases_backupShortTermRetentionPolicies": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-02-02-preview" + ] + }, + "name": { + "oneOf": [ + { + "type": "string", + "pattern": "^.*/default$" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The policy name. Should always be \"default\"." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/BackupShortTermRetentionPolicyProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of a short term retention policy" + }, + "type": { + "type": "string", + "enum": [ + "Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies" + }, "servers_databases_securityAlertPolicies": { "type": "object", "properties": { @@ -273,6 +464,34 @@ ], "description": "Properties of a active directory only authentication." }, + "BackupShortTermRetentionPolicyProperties": { + "type": "object", + "properties": { + "diffBackupIntervalInHours": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The differential backup interval in hours. This is how many interval hours between each differential backup will be supported. This is only applicable to live databases but not dropped databases." + }, + "retentionDays": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The backup retention period in days. This is how many days Point-in-Time Restore will be supported." + } + }, + "description": "Properties of a short term retention policy" + }, "ManagedDatabaseProperties": { "type": "object", "properties": { @@ -360,6 +579,335 @@ }, "description": "The managed database's properties." }, + "ManagedInstanceAzureADOnlyAuthProperties": { + "type": "object", + "properties": { + "azureADOnlyAuthentication": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Azure Active Directory only Authentication enabled." + } + }, + "required": [ + "azureADOnlyAuthentication" + ], + "description": "Properties of a active directory only authentication for Managed Instance." + }, + "ManagedInstanceProperties": { + "type": "object", + "properties": { + "administratorLogin": { + "type": "string", + "description": "Administrator username for the managed instance. Can only be specified when the managed instance is being created (and is required for creation)." + }, + "administratorLoginPassword": { + "type": "string", + "description": "The administrator login password (required for managed instance creation)." + }, + "collation": { + "type": "string", + "description": "Collation of the managed instance." + }, + "dnsZonePartner": { + "type": "string", + "description": "The resource id of another managed instance whose DNS zone this managed instance will share after creation." + }, + "instancePoolId": { + "type": "string", + "description": "The Id of the instance pool this managed server belongs to." + }, + "licenseType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "LicenseIncluded", + "BasePrice" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The license type. Possible values are 'LicenseIncluded' (regular price inclusive of a new SQL license) and 'BasePrice' (discounted AHB price for bringing your own SQL licenses)." + }, + "maintenanceConfigurationId": { + "type": "string", + "description": "Specifies maintenance configuration id to apply to this managed instance." + }, + "managedInstanceCreateMode": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Default", + "PointInTimeRestore" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Specifies the mode of database creation.\r\n\r\nDefault: Regular instance creation.\r\n\r\nRestore: Creates an instance by restoring a set of backups to specific point in time. RestorePointInTime and SourceManagedInstanceId must be specified." + }, + "minimalTlsVersion": { + "type": "string", + "description": "Minimal TLS version. Allowed values: 'None', '1.0', '1.1', '1.2'" + }, + "proxyOverride": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Proxy", + "Redirect", + "Default" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Connection type used for connecting to the instance." + }, + "publicDataEndpointEnabled": { + "oneOf": [ + { + "type": "boolean" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Whether or not the public data endpoint is enabled." + }, + "restorePointInTime": { + "type": "string", + "format": "date-time", + "description": "Specifies the point in time (ISO8601 format) of the source database that will be restored to create the new database." + }, + "sourceManagedInstanceId": { + "type": "string", + "description": "The resource identifier of the source managed instance associated with create operation of this instance." + }, + "storageAccountType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "GRS", + "LRS", + "ZRS" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The storage account type used to store backups for this instance. The options are LRS (LocallyRedundantStorage), ZRS (ZoneRedundantStorage) and GRS (GeoRedundantStorage)." + }, + "storageSizeInGB": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Storage size in GB. Minimum value: 32. Maximum value: 8192. Increments of 32 GB allowed only." + }, + "subnetId": { + "type": "string", + "description": "Subnet resource ID for the managed instance." + }, + "timezoneId": { + "type": "string", + "description": "Id of the timezone. Allowed values are timezones supported by Windows.\r\nWindows keeps details on supported timezones, including the id, in registry under\r\nKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones.\r\nYou can get those registry values via SQL Server by querying SELECT name AS timezone_id FROM sys.time_zone_info.\r\nList of Ids can also be obtained by executing [System.TimeZoneInfo]::GetSystemTimeZones() in PowerShell.\r\nAn example of valid timezone id is \"Pacific Standard Time\" or \"W. Europe Standard Time\"." + }, + "vCores": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The number of vCores. Allowed values: 8, 16, 24, 32, 40, 64, 80." + } + }, + "description": "The properties of a managed instance." + }, + "managedInstances_azureADOnlyAuthentications_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-02-02-preview" + ] + }, + "name": { + "type": "string", + "enum": [ + "Default" + ], + "description": "The name of server azure active directory only authentication." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/ManagedInstanceAzureADOnlyAuthProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of a active directory only authentication for Managed Instance." + }, + "type": { + "type": "string", + "enum": [ + "azureADOnlyAuthentications" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Sql/managedInstances/azureADOnlyAuthentications" + }, + "managedInstances_databases_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-02-02-preview" + ] + }, + "location": { + "type": "string", + "description": "Resource location." + }, + "name": { + "type": "string", + "description": "The name of the database." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/ManagedDatabaseProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The managed database's properties." + }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags." + }, + "type": { + "type": "string", + "enum": [ + "databases" + ] + } + }, + "required": [ + "apiVersion", + "location", + "name", + "properties", + "type" + ], + "description": "Microsoft.Sql/managedInstances/databases" + }, + "managedInstances_securityAlertPolicies_childResource": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "enum": [ + "2020-02-02-preview" + ] + }, + "name": { + "type": "string", + "enum": [ + "default" + ], + "description": "The name of the security alert policy." + }, + "properties": { + "oneOf": [ + { + "$ref": "#/definitions/SecurityAlertsPolicyProperties" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Properties of a security alert policy." + }, + "type": { + "type": "string", + "enum": [ + "securityAlertPolicies" + ] + } + }, + "required": [ + "apiVersion", + "name", + "properties", + "type" + ], + "description": "Microsoft.Sql/managedInstances/securityAlertPolicies" + }, + "ResourceIdentity": { + "type": "object", + "properties": { + "type": { + "oneOf": [ + { + "type": "string", + "enum": [ + "SystemAssigned" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "The identity type. Set this to 'SystemAssigned' in order to automatically create and assign an Azure Active Directory principal for the resource." + } + }, + "description": "Azure Active Directory identity configuration for a resource." + }, "SecurityAlertsPolicyProperties": { "type": "object", "properties": { @@ -383,6 +931,42 @@ "state" ], "description": "Properties of a security alert policy." + }, + "Sku": { + "type": "object", + "properties": { + "capacity": { + "oneOf": [ + { + "type": "integer" + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Capacity of the particular SKU." + }, + "family": { + "type": "string", + "description": "If the service has different generations of hardware, for the same SKU, then that can be captured here." + }, + "name": { + "type": "string", + "description": "The name of the SKU, typically, a letter + Number code, e.g. P3." + }, + "size": { + "type": "string", + "description": "Size of the particular SKU" + }, + "tier": { + "type": "string", + "description": "The tier or edition of the particular SKU, e.g. Basic, Premium." + } + }, + "required": [ + "name" + ], + "description": "An ARM Resource SKU." } } } \ No newline at end of file diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json index b24fabf5fe..aedb7d72ea 100644 --- a/schemas/common/autogeneratedResources.json +++ b/schemas/common/autogeneratedResources.json @@ -4453,6 +4453,12 @@ { "$ref": "https://schema.management.azure.com/schemas/2019-06-01-preview/Microsoft.Sql.json#/resourceDefinitions/servers_databases_workloadGroups_workloadClassifiers" }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-02-02-preview/Microsoft.Sql.json#/resourceDefinitions/managedInstances" + }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-02-02-preview/Microsoft.Sql.json#/resourceDefinitions/managedInstances_azureADOnlyAuthentications" + }, { "$ref": "https://schema.management.azure.com/schemas/2020-02-02-preview/Microsoft.Sql.json#/resourceDefinitions/managedInstances_databases" }, @@ -4462,6 +4468,9 @@ { "$ref": "https://schema.management.azure.com/schemas/2020-02-02-preview/Microsoft.Sql.json#/resourceDefinitions/servers_azureADOnlyAuthentications" }, + { + "$ref": "https://schema.management.azure.com/schemas/2020-02-02-preview/Microsoft.Sql.json#/resourceDefinitions/servers_databases_backupShortTermRetentionPolicies" + }, { "$ref": "https://schema.management.azure.com/schemas/2020-02-02-preview/Microsoft.Sql.json#/resourceDefinitions/servers_databases_securityAlertPolicies" },