ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add login migrations error code (#1988)

Browse Source 
Update login migrations nuget to expose error code + error code string
This commit is contained in:
AkshayMata
2023-04-04 15:04:38 -07:00
committed by GitHub
parent 098cf3be35
commit 7f65b9c5ee
6 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Packages.props
View File

@@ -28,7 +28,7 @@
<PackageReference Update="Microsoft.Azure.Kusto.Language" Version="9.0.4" /> <PackageReference Update="Microsoft.Azure.Kusto.Language" Version="9.0.4" />
<PackageReference Update="Microsoft.SqlServer.Assessment" Version="[1.1.17]" /> <PackageReference Update="Microsoft.SqlServer.Assessment" Version="[1.1.17]" />
<PackageReference Update="Microsoft.SqlServer.Migration.Assessment" Version="1.0.20230301.46" /> <PackageReference Update="Microsoft.SqlServer.Migration.Assessment" Version="1.0.20230301.46" />
<PackageReference Update="Microsoft.SqlServer.Migration.Logins" Version="1.0.20230302.47" /> <PackageReference Update="Microsoft.SqlServer.Migration.Logins" Version="1.0.20230321.50" />
<PackageReference Update="Microsoft.SqlServer.Management.SqlParser" Version="170.7.0" /> <PackageReference Update="Microsoft.SqlServer.Management.SqlParser" Version="170.7.0" />
<PackageReference Update="Microsoft.SqlServer.Migration.Tde" Version="1.0.20230403.55" /> <PackageReference Update="Microsoft.SqlServer.Migration.Tde" Version="1.0.20230403.55" />
<PackageReference Update="Microsoft.Azure.OperationalInsights" Version="1.0.0" /> <PackageReference Update="Microsoft.Azure.OperationalInsights" Version="1.0.0" />

BIN
bin/nuget/Microsoft.SqlServer.Migration.Logins.1.0.20230302.47.nupkg
View File

Binary file not shown.

BIN
bin/nuget/Microsoft.SqlServer.Migration.Logins.1.0.20230321.50.nupkg Normal file
View File

Binary file not shown.

4
src/Microsoft.SqlTools.Migration/Contracts/StartLoginMigration.cs
View File

@@ -5,7 +5,7 @@
#nullable disable #nullable disable
using Microsoft.SqlServer.DataCollection.Common.Contracts.OperationsInfrastructure; using Microsoft.SqlServer.Migration.Logins.Contracts.Exceptions;
using Microsoft.SqlTools.Hosting.Protocol.Contracts; using Microsoft.SqlTools.Hosting.Protocol.Contracts;
using System.Collections.Generic; using System.Collections.Generic;
@@ -81,7 +81,7 @@ namespace Microsoft.SqlTools.Migration.Contracts
/// <summary> /// <summary>
/// Start time of the assessment /// Start time of the assessment
/// </summary> /// </summary>
public IDictionary<string, IEnumerable<ReportableException>> ExceptionMap { get; set; } public IDictionary<string, IEnumerable<LoginMigrationException>> ExceptionMap { get; set; }
/// <summary> /// <summary>
/// The login migration step that just completed /// The login migration step that just completed

11
src/Microsoft.SqlTools.Migration/MigrationService.cs
View File

@@ -27,6 +27,7 @@ using Microsoft.SqlServer.Migration.Assessment.Common.Utils;
using Microsoft.SqlServer.Migration.Logins; using Microsoft.SqlServer.Migration.Logins;
using Microsoft.SqlServer.Migration.Logins.Contracts; using Microsoft.SqlServer.Migration.Logins.Contracts;
using Microsoft.SqlServer.Migration.Logins.Contracts.ErrorHandling; using Microsoft.SqlServer.Migration.Logins.Contracts.ErrorHandling;
using Microsoft.SqlServer.Migration.Logins.Contracts.Exceptions;
using Microsoft.SqlServer.Migration.Logins.ErrorHandling; using Microsoft.SqlServer.Migration.Logins.ErrorHandling;
using Microsoft.SqlServer.Migration.Logins.Helpers; using Microsoft.SqlServer.Migration.Logins.Helpers;
using Microsoft.SqlServer.Migration.SkuRecommendation; using Microsoft.SqlServer.Migration.SkuRecommendation;
@@ -294,7 +295,7 @@ namespace Microsoft.SqlTools.Migration
ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString, ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString,
null, parameters.LoginList, parameters.AADDomainName, logger); null, parameters.LoginList, parameters.AADDomainName, logger);
IDictionary<string, IEnumerable<ReportableException>> exceptionMap = new Dictionary<string, IEnumerable<ReportableException>>(); IDictionary<string, IEnumerable<LoginMigrationException>> exceptionMap = new Dictionary<string, IEnumerable<LoginMigrationException>>();
exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None)); exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None));
exceptionMap.AddExceptions(await loginMigration.MigrateLogins(CancellationToken.None)); exceptionMap.AddExceptions(await loginMigration.MigrateLogins(CancellationToken.None));
@@ -327,7 +328,7 @@ namespace Microsoft.SqlTools.Migration
ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString, ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString,
null, parameters.LoginList, parameters.AADDomainName, logger); null, parameters.LoginList, parameters.AADDomainName, logger);
IDictionary<string, IEnumerable<ReportableException>> exceptionMap = new Dictionary<string, IEnumerable<ReportableException>>(); IDictionary<string, IEnumerable<LoginMigrationException>> exceptionMap = new Dictionary<string, IEnumerable<LoginMigrationException>>();
Stopwatch stopWatch = new Stopwatch(); Stopwatch stopWatch = new Stopwatch();
stopWatch.Start(); stopWatch.Start();
exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None)); exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None));
@@ -360,7 +361,7 @@ namespace Microsoft.SqlTools.Migration
ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString, ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString,
null, parameters.LoginList, parameters.AADDomainName, logger); null, parameters.LoginList, parameters.AADDomainName, logger);
IDictionary<string, IEnumerable<ReportableException>> exceptionMap = new Dictionary<string, IEnumerable<ReportableException>>(); IDictionary<string, IEnumerable<LoginMigrationException>> exceptionMap = new Dictionary<string, IEnumerable<LoginMigrationException>>();
Stopwatch stopWatch = new Stopwatch(); Stopwatch stopWatch = new Stopwatch();
stopWatch.Start(); stopWatch.Start();
exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None)); exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None));
@@ -393,7 +394,7 @@ namespace Microsoft.SqlTools.Migration
ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString, ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString,
null, parameters.LoginList, parameters.AADDomainName, logger); null, parameters.LoginList, parameters.AADDomainName, logger);
IDictionary<string, IEnumerable<ReportableException>> exceptionMap = new Dictionary<string, IEnumerable<ReportableException>>(); IDictionary<string, IEnumerable<LoginMigrationException>> exceptionMap = new Dictionary<string, IEnumerable<LoginMigrationException>>();
Stopwatch stopWatch = new Stopwatch(); Stopwatch stopWatch = new Stopwatch();
stopWatch.Start(); stopWatch.Start();
@@ -427,7 +428,7 @@ namespace Microsoft.SqlTools.Migration
ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString, ILoginsMigration loginMigration = new LoginsMigration(parameters.SourceConnectionString, parameters.TargetConnectionString,
null, parameters.LoginList, parameters.AADDomainName, logger); null, parameters.LoginList, parameters.AADDomainName, logger);
IDictionary<string, IEnumerable<ReportableException>> exceptionMap = new Dictionary<string, IEnumerable<ReportableException>>(); IDictionary<string, IEnumerable<LoginMigrationException>> exceptionMap = new Dictionary<string, IEnumerable<LoginMigrationException>>();
Stopwatch stopWatch = new Stopwatch(); Stopwatch stopWatch = new Stopwatch();
stopWatch.Start(); stopWatch.Start();
exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None)); exceptionMap.AddExceptions(await loginMigration.StartValidations(CancellationToken.None));

4
src/Microsoft.SqlTools.Migration/Utils/ExtensionMethods.cs
View File

@@ -7,13 +7,13 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Microsoft.SqlServer.DataCollection.Common.Contracts.OperationsInfrastructure; using Microsoft.SqlServer.Migration.Logins.Contracts.Exceptions;
namespace Microsoft.SqlTools.Migration.Utils namespace Microsoft.SqlTools.Migration.Utils
{ {
internal static class ExtensionMethods internal static class ExtensionMethods
{ {
public static void AddExceptions(this IDictionary<string, IEnumerable<ReportableException>> exceptionMap1, IDictionary<string, IEnumerable<ReportableException>> exceptionMap2) public static void AddExceptions(this IDictionary<string, IEnumerable<LoginMigrationException>> exceptionMap1, IDictionary<string, IEnumerable<LoginMigrationException>> exceptionMap2)
{ {
if (exceptionMap1 is null || exceptionMap2 is null) if (exceptionMap1 is null || exceptionMap2 is null)
{ {