From 91579252e6aa0e9aa0b00749c82755240e5f5282 Mon Sep 17 00:00:00 2001 From: Te Zhang Date: Fri, 20 Sep 2019 12:44:13 -0700 Subject: [PATCH 1/2] Add aad domain name for windows login migration support --- .../definitions/MigrateSqlServerSqlMITask.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMITask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMITask.json index 5339b335b7ab..f23f9306f57f 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMITask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMITask.json @@ -58,7 +58,11 @@ "backupMode": { "$ref": "./TasksCommon.json#/definitions/BackupMode", "description": "Backup Mode to specify whether to use existing backup or create new backup. If using existing backups, backup file paths are required to be provided in selectedDatabases." - } + }, + "aadDomainName": { + "type": "string", + "description": "Azure Active Directory domain name in the format of 'contoso.com' for federated Azure AD or 'contoso.onmicrosoft.com' for managed domain, required if and only if Windows logins are selected" + } }, "required": [ "selectedDatabases", From cd19fe136c5db5e07538eae6e5f0268331ce948a Mon Sep 17 00:00:00 2001 From: Te Zhang Date: Fri, 20 Sep 2019 13:41:31 -0700 Subject: [PATCH 2/2] Fix indentation --- .../definitions/MigrateSqlServerSqlMITask.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMITask.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMITask.json index f23f9306f57f..3ec1fed7ef0f 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMITask.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMITask.json @@ -59,10 +59,10 @@ "$ref": "./TasksCommon.json#/definitions/BackupMode", "description": "Backup Mode to specify whether to use existing backup or create new backup. If using existing backups, backup file paths are required to be provided in selectedDatabases." }, - "aadDomainName": { - "type": "string", - "description": "Azure Active Directory domain name in the format of 'contoso.com' for federated Azure AD or 'contoso.onmicrosoft.com' for managed domain, required if and only if Windows logins are selected" - } + "aadDomainName": { + "type": "string", + "description": "Azure Active Directory domain name in the format of 'contoso.com' for federated Azure AD or 'contoso.onmicrosoft.com' for managed domain, required if and only if Windows logins are selected" + } }, "required": [ "selectedDatabases",