From f3e85bf537e973832fd8b630394c4b951badce66 Mon Sep 17 00:00:00 2001 From: Te Zhang Date: Tue, 17 Sep 2019 15:32:23 -0700 Subject: [PATCH 1/4] Fix eligibility typo --- .../preview/2018-03-31-preview/definitions/TasksCommon.json | 2 +- .../preview/2018-07-15-preview/definitions/TasksCommon.json | 2 +- .../stable/2018-04-19/definitions/TasksCommon.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-31-preview/definitions/TasksCommon.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-31-preview/definitions/TasksCommon.json index e17e42f57991..1064a1d1c9a4 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-31-preview/definitions/TasksCommon.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-31-preview/definitions/TasksCommon.json @@ -605,7 +605,7 @@ "type": "object", "description": "Information about migration eligibility of a server object", "properties": { - "isEligibileForMigration": { + "isEligibleForMigration": { "type": "boolean", "description": "Whether object is eligible for migration or not.", "readOnly": true diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/TasksCommon.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/TasksCommon.json index aebe0e18411a..7f0496f4d91a 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/TasksCommon.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/TasksCommon.json @@ -1011,7 +1011,7 @@ "type": "object", "description": "Information about migration eligibility of a server object", "properties": { - "isEligibileForMigration": { + "isEligibleForMigration": { "type": "boolean", "description": "Whether object is eligible for migration or not.", "readOnly": true diff --git a/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/TasksCommon.json b/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/TasksCommon.json index 234e85f8390f..075c70e3e167 100644 --- a/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/TasksCommon.json +++ b/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/TasksCommon.json @@ -1029,7 +1029,7 @@ "type": "object", "description": "Information about migration eligibility of a server object", "properties": { - "isEligibileForMigration": { + "isEligibleForMigration": { "type": "boolean", "description": "Whether object is eligible for migration or not.", "readOnly": true From f8a0f9fccb5e3f7911f171e4480fbd48fc4a85df Mon Sep 17 00:00:00 2001 From: Te Zhang Date: Wed, 18 Sep 2019 16:57:56 -0700 Subject: [PATCH 2/4] Remove suppression for Eligible typo --- cSpell.json | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/cSpell.json b/cSpell.json index ca3148fdadb4..3a47d373214e 100644 --- a/cSpell.json +++ b/cSpell.json @@ -192,7 +192,6 @@ "filename": "**/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/TasksCommon.json", "words": [ "Miliseconds", - "Eligibile", "INITIALIAZING" ] }, @@ -245,18 +244,6 @@ "Managementt" ] }, - { - "filename": "**/specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2018-03-31-preview/definitions/TasksCommon.json", - "words": [ - "Eligibile" - ] - }, - { - "filename": "**/specification/datamigration/resource-manager/Microsoft.DataMigration/stable/2018-04-19/definitions/TasksCommon.json", - "words": [ - "Eligibile" - ] - }, { "filename": "**/specification/frontdoor/resource-manager/Microsoft.Network/preview/2018-08-01-preview/webapplicationfirewall.json", "words": [ From d7e2e3e8d3a7b4f831e0d0e902ba5eeb092d140a Mon Sep 17 00:00:00 2001 From: Te Zhang Date: Fri, 20 Sep 2019 12:12:58 -0700 Subject: [PATCH 3/4] Add aad domain name para 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..493348726188 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 myaad.onmicrosoft.com for managed domain, required if and only if Windows logins are selected" + } }, "required": [ "selectedDatabases", From c928cfab7f680fbed26e48a69e88c1f5fc2070f4 Mon Sep 17 00:00:00 2001 From: Te Zhang Date: Fri, 20 Sep 2019 12:30:02 -0700 Subject: [PATCH 4/4] add aad domain name --- .../definitions/MigrateSqlServerSqlMITask.json | 2 +- 1 file changed, 1 insertion(+), 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 493348726188..1f1f3f482bf0 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,7 +59,7 @@ "$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", { + "aadDomainName": { "type": "string", "description": "Azure Active Directory domain name in the format of 'contoso.com' for federated Azure AD or myaad.onmicrosoft.com for managed domain, required if and only if Windows logins are selected" }