Skip to content

Commit 96c8ab3

Browse files
codingbanditcodingbandit
authored
Merge pull request AzureCosmosDB#18 from AzureCosmosDB/develop
Adding features for release
2 parents e00e8a2 + add29cd commit 96c8ab3

10 files changed

+345
-33
lines changed

‎Core/Cosmos.DataTransfer.Core.UnitTests/Cosmos.DataTransfer.Core.UnitTests.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
<ItemGroup>
1111
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
12+
<PackageReference Include="Moq" Version="4.18.4" />
1213
<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
1314
<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
1415
<PackageReference Include="coverlet.collector" Version="3.1.2">
@@ -17,4 +18,8 @@
1718
</PackageReference>
1819
</ItemGroup>
1920

21+
<ItemGroup>
22+
<ProjectReference Include="..\Cosmos.DataTransfer.Core\Cosmos.DataTransfer.Core.csproj" />
23+
</ItemGroup>
24+
2025
</Project>

‎Core/Cosmos.DataTransfer.Core.UnitTests/RunCommandTests.cs

+179
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,179 @@
1+
using Microsoft.Extensions.Configuration;
2+
using Microsoft.Extensions.Logging.Abstractions;
3+
using Microsoft.VisualStudio.TestTools.UnitTesting;
4+
using System.CommandLine;
5+
using System;
6+
using System.CommandLine.Invocation;
7+
using System.Collections.Generic;
8+
using Moq;
9+
using System.ComponentModel.Composition.Hosting;
10+
using Cosmos.DataTransfer.Interfaces;
11+
using Microsoft.Extensions.Logging;
12+
using System.Threading;
13+
14+
namespace Cosmos.DataTransfer.Core.UnitTests
15+
{
16+
[TestClass]
17+
public class RunCommandTests
18+
{
19+
[TestMethod]
20+
public void Invoke_WithSingleConfig_ExecutesSingleOperation()
21+
{
22+
const string source = "testSource";
23+
const string sink = "testSink";
24+
IConfigurationRoot configuration = new ConfigurationBuilder()
25+
.AddInMemoryCollection(new Dictionary<string, string>
26+
{
27+
{ "Source", source },
28+
{ "Sink", sink },
29+
})
30+
.Build();
31+
var loader = new Mock<IExtensionLoader>();
32+
var sourceExtension = new Mock<IDataSourceExtension>();
33+
sourceExtension.SetupGet(ds => ds.DisplayName).Returns(source);
34+
loader
35+
.Setup(l => l.LoadExtensions<IDataSourceExtension>(It.IsAny<CompositionContainer>()))
36+
.Returns(new List<IDataSourceExtension> { sourceExtension.Object });
37+
38+
var sinkExtension = new Mock<IDataSinkExtension>();
39+
sinkExtension.SetupGet(ds => ds.DisplayName).Returns(sink);
40+
loader
41+
.Setup(l => l.LoadExtensions<IDataSinkExtension>(It.IsAny<CompositionContainer>()))
42+
.Returns(new List<IDataSinkExtension> { sinkExtension.Object });
43+
var handler = new RunCommand.CommandHandler(loader.Object,
44+
configuration,
45+
NullLoggerFactory.Instance);
46+
47+
var parseResult = new RootCommand().Parse(Array.Empty<string>());
48+
var result = handler.Invoke(new InvocationContext(parseResult));
49+
Assert.AreEqual(0, result);
50+
51+
sourceExtension.Verify(se => se.ReadAsync(It.IsAny<IConfiguration>(), It.IsAny<ILogger>(), It.IsAny<CancellationToken>()), Times.Once);
52+
sinkExtension.Verify(se => se.WriteAsync(It.IsAny <IAsyncEnumerable<IDataItem>>(), It.IsAny<IConfiguration>(), sourceExtension.Object, It.IsAny<ILogger>(), It.IsAny<CancellationToken>()), Times.Once);
53+
}
54+
55+
[TestMethod]
56+
public void Invoke_WithMultipleOperations_ExecutesAllOperations()
57+
{
58+
const string source = "testSource";
59+
const string sink = "testSink";
60+
IConfigurationRoot configuration = new ConfigurationBuilder()
61+
.AddInMemoryCollection(new Dictionary<string, string>
62+
{
63+
{ "Source", source },
64+
{ "Sink", sink },
65+
{ "Operations:0:SourceSettings:FilePath", "file-in.json" },
66+
{ "Operations:0:SinkSettings:FilePath", "file-out.json" },
67+
{ "Operations:1:SourceSettings:FilePath", "file1.json" },
68+
{ "Operations:1:SinkSettings:FilePath", "file2.json" },
69+
{ "Operations:2:SourceSettings:FilePath", "fileA.json" },
70+
{ "Operations:2:SinkSettings:FilePath", "fileB.json" },
71+
})
72+
.Build();
73+
var loader = new Mock<IExtensionLoader>();
74+
var sourceExtension = new Mock<IDataSourceExtension>();
75+
sourceExtension.SetupGet(ds => ds.DisplayName).Returns(source);
76+
loader
77+
.Setup(l => l.LoadExtensions<IDataSourceExtension>(It.IsAny<CompositionContainer>()))
78+
.Returns(new List<IDataSourceExtension> { sourceExtension.Object });
79+
80+
var sinkExtension = new Mock<IDataSinkExtension>();
81+
sinkExtension.SetupGet(ds => ds.DisplayName).Returns(sink);
82+
loader
83+
.Setup(l => l.LoadExtensions<IDataSinkExtension>(It.IsAny<CompositionContainer>()))
84+
.Returns(new List<IDataSinkExtension> { sinkExtension.Object });
85+
var handler = new RunCommand.CommandHandler(loader.Object,
86+
configuration,
87+
NullLoggerFactory.Instance);
88+
89+
var parseResult = new RootCommand().Parse(Array.Empty<string>());
90+
var result = handler.Invoke(new InvocationContext(parseResult));
91+
Assert.AreEqual(0, result);
92+
93+
sourceExtension.Verify(se => se.ReadAsync(It.IsAny<IConfiguration>(), It.IsAny<ILogger>(), It.IsAny<CancellationToken>()), Times.Exactly(3));
94+
sinkExtension.Verify(se => se.WriteAsync(It.IsAny<IAsyncEnumerable<IDataItem>>(), It.IsAny<IConfiguration>(), sourceExtension.Object, It.IsAny<ILogger>(), It.IsAny<CancellationToken>()), Times.Exactly(3));
95+
}
96+
97+
[TestMethod]
98+
public void Invoke_WithMultipleSinks_ExecutesAllOperationsFromSource()
99+
{
100+
const string source = "testSource";
101+
const string sink = "testSink";
102+
const string sourceFile = "file-in.json";
103+
IConfigurationRoot configuration = new ConfigurationBuilder()
104+
.AddInMemoryCollection(new Dictionary<string, string>
105+
{
106+
{ "Source", source },
107+
{ "Sink", sink },
108+
{ "SourceSettings:FilePath", sourceFile },
109+
{ "Operations:0:SinkSettings:FilePath", "file-out.json" },
110+
{ "Operations:1:SinkSettings:FilePath", "file2.json" },
111+
{ "Operations:2:SinkSettings:FilePath", "fileB.json" },
112+
})
113+
.Build();
114+
var loader = new Mock<IExtensionLoader>();
115+
var sourceExtension = new Mock<IDataSourceExtension>();
116+
sourceExtension.SetupGet(ds => ds.DisplayName).Returns(source);
117+
loader
118+
.Setup(l => l.LoadExtensions<IDataSourceExtension>(It.IsAny<CompositionContainer>()))
119+
.Returns(new List<IDataSourceExtension> { sourceExtension.Object });
120+
121+
var sinkExtension = new Mock<IDataSinkExtension>();
122+
sinkExtension.SetupGet(ds => ds.DisplayName).Returns(sink);
123+
loader
124+
.Setup(l => l.LoadExtensions<IDataSinkExtension>(It.IsAny<CompositionContainer>()))
125+
.Returns(new List<IDataSinkExtension> { sinkExtension.Object });
126+
var handler = new RunCommand.CommandHandler(loader.Object,
127+
configuration,
128+
NullLoggerFactory.Instance);
129+
130+
var parseResult = new RootCommand().Parse(Array.Empty<string>());
131+
var result = handler.Invoke(new InvocationContext(parseResult));
132+
Assert.AreEqual(0, result);
133+
134+
sourceExtension.Verify(se => se.ReadAsync(It.Is<IConfiguration>(c => c["FilePath"] == sourceFile), It.IsAny<ILogger>(), It.IsAny<CancellationToken>()), Times.Exactly(3));
135+
sinkExtension.Verify(se => se.WriteAsync(It.IsAny<IAsyncEnumerable<IDataItem>>(), It.IsAny<IConfiguration>(), sourceExtension.Object, It.IsAny<ILogger>(), It.IsAny<CancellationToken>()), Times.Exactly(3));
136+
}
137+
138+
[TestMethod]
139+
public void Invoke_WithMultipleSources_ExecutesAllOperationsToSink()
140+
{
141+
const string source = "testSource";
142+
const string sink = "testSink";
143+
const string targetFile = "file-out.json";
144+
IConfigurationRoot configuration = new ConfigurationBuilder()
145+
.AddInMemoryCollection(new Dictionary<string, string>
146+
{
147+
{ "Source", source },
148+
{ "Sink", sink },
149+
{ "SinkSettings:FilePath", targetFile },
150+
{ "Operations:0:SourceSettings:FilePath", "file-in.json" },
151+
{ "Operations:1:SourceSettings:FilePath", "file1.json" },
152+
{ "Operations:2:SourceSettings:FilePath", "fileA.json" },
153+
})
154+
.Build();
155+
var loader = new Mock<IExtensionLoader>();
156+
var sourceExtension = new Mock<IDataSourceExtension>();
157+
sourceExtension.SetupGet(ds => ds.DisplayName).Returns(source);
158+
loader
159+
.Setup(l => l.LoadExtensions<IDataSourceExtension>(It.IsAny<CompositionContainer>()))
160+
.Returns(new List<IDataSourceExtension> { sourceExtension.Object });
161+
162+
var sinkExtension = new Mock<IDataSinkExtension>();
163+
sinkExtension.SetupGet(ds => ds.DisplayName).Returns(sink);
164+
loader
165+
.Setup(l => l.LoadExtensions<IDataSinkExtension>(It.IsAny<CompositionContainer>()))
166+
.Returns(new List<IDataSinkExtension> { sinkExtension.Object });
167+
var handler = new RunCommand.CommandHandler(loader.Object,
168+
configuration,
169+
NullLoggerFactory.Instance);
170+
171+
var parseResult = new RootCommand().Parse(Array.Empty<string>());
172+
var result = handler.Invoke(new InvocationContext(parseResult));
173+
Assert.AreEqual(0, result);
174+
175+
sourceExtension.Verify(se => se.ReadAsync(It.IsAny<IConfiguration>(), It.IsAny<ILogger>(), It.IsAny<CancellationToken>()), Times.Exactly(3));
176+
sinkExtension.Verify(se => se.WriteAsync(It.IsAny<IAsyncEnumerable<IDataItem>>(), It.Is<IConfiguration>(c => c["FilePath"] == targetFile), sourceExtension.Object, It.IsAny<ILogger>(), It.IsAny<CancellationToken>()), Times.Exactly(3));
177+
}
178+
}
179+
}

‎Core/Cosmos.DataTransfer.Core.UnitTests/UnitTest1.cs

-13
This file was deleted.

‎Core/Cosmos.DataTransfer.Core/ExtensionLoader.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
namespace Cosmos.DataTransfer.Core
77
{
8-
public class ExtensionLoader
8+
public class ExtensionLoader : IExtensionLoader
99
{
1010
private readonly IConfiguration _configuration;
1111
private readonly ILogger _logger;

‎Core/Cosmos.DataTransfer.Core/IExtensionLoader.cs

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
using Cosmos.DataTransfer.Interfaces;
2+
using System.ComponentModel.Composition.Hosting;
3+
4+
namespace Cosmos.DataTransfer.Core
5+
{
6+
public interface IExtensionLoader
7+
{
8+
CompositionContainer BuildExtensionCatalog(string extensionsPath);
9+
string GetExtensionFolderPath();
10+
List<T> LoadExtensions<T>(CompositionContainer container) where T : class, IDataTransferExtension;
11+
}
12+
}

‎Core/Cosmos.DataTransfer.Core/InitCommand.cs

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
using System.CommandLine;
2+
using System.CommandLine.Invocation;
3+
using System.Text.Json;
4+
using System.Text.Json.Serialization;
5+
using Microsoft.Extensions.Logging;
6+
7+
namespace Cosmos.DataTransfer.Core
8+
{
9+
public class InitCommand : Command
10+
{
11+
public InitCommand()
12+
: base("init", "Creates template settings file for use as input")
13+
{
14+
AddInitOptions(this);
15+
}
16+
17+
public static void AddInitOptions(Command command)
18+
{
19+
var settingsOption = new Option<FileInfo?>(
20+
aliases: new[] { "--path", "-p" },
21+
description: "The settings file to create. (default: migrationsettings.json)");
22+
var multiOption = new Option<bool?>(
23+
aliases: new[] { "--multi", "-m" },
24+
description: "True to include an Operations array for adding multiple data transfer operations in a single run");
25+
26+
command.AddOption(settingsOption);
27+
command.AddOption(multiOption);
28+
}
29+
30+
public class CommandHandler : ICommandHandler
31+
{
32+
private readonly ILogger<CommandHandler> _logger;
33+
34+
public FileInfo? Path { get; set; }
35+
public bool? Multi { get; set; }
36+
37+
public CommandHandler(ILogger<CommandHandler> logger)
38+
{
39+
_logger = logger;
40+
}
41+
42+
public int Invoke(InvocationContext context)
43+
{
44+
return InvokeAsync(context).GetAwaiter().GetResult();
45+
}
46+
47+
public async Task<int> InvokeAsync(InvocationContext context)
48+
{
49+
var options = new JsonSerializerOptions { WriteIndented = true, };
50+
string? json;
51+
if (Multi != true)
52+
{
53+
json = JsonSerializer.Serialize(new
54+
{
55+
Source = (string?)null,
56+
Sink = (string?)null,
57+
SourceSettings = new { },
58+
SinkSettings = new { },
59+
}, options);
60+
}
61+
else
62+
{
63+
json = JsonSerializer.Serialize(new
64+
{
65+
Source = (string?)null,
66+
Sink = (string?)null,
67+
SourceSettings = new { },
68+
SinkSettings = new { },
69+
Operations = new[]
70+
{
71+
new
72+
{
73+
SourceSettings = new { },
74+
SinkSettings = new { },
75+
},
76+
new
77+
{
78+
SourceSettings = new { },
79+
SinkSettings = new { },
80+
}
81+
}
82+
}, options);
83+
}
84+
await File.WriteAllTextAsync(Path?.FullName ?? "migrationsettings.json", json, context.GetCancellationToken());
85+
return 0;
86+
}
87+
}
88+
}
89+
}

‎Core/Cosmos.DataTransfer.Core/Program.cs

+5-3
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ public static async Task<int> Main(string[] args)
1818
var rootCommand = new RootCommand("Azure data migration tool") { TreatUnmatchedTokensAsErrors = false };
1919
rootCommand.AddCommand(new RunCommand());
2020
rootCommand.AddCommand(new ListCommand());
21+
rootCommand.AddCommand(new InitCommand());
2122

2223
// execute Run if no command provided
2324
RunCommand.AddRunOptions(rootCommand);
@@ -26,7 +27,7 @@ public static async Task<int> Main(string[] args)
2627
var host = ctx.GetHost();
2728
var logger = host.Services.GetService<ILoggerFactory>();
2829
var config = host.Services.GetService<IConfiguration>();
29-
var loader = host.Services.GetService<ExtensionLoader>();
30+
var loader = host.Services.GetService<IExtensionLoader>();
3031
if (loader == null || config == null || logger == null)
3132
{
3233
ctx.Console.Error.WriteLine("Missing required command");
@@ -53,10 +54,11 @@ public static async Task<int> Main(string[] args)
5354
cfg.AddUserSecrets<Program>();
5455
}).ConfigureServices((hostContext, services) =>
5556
{
56-
services.AddTransient<ExtensionLoader>();
57+
services.AddTransient<IExtensionLoader, ExtensionLoader>();
5758
})
5859
.UseCommandHandler<RunCommand, RunCommand.CommandHandler>()
59-
.UseCommandHandler<ListCommand, ListCommand.CommandHandler>();
60+
.UseCommandHandler<ListCommand, ListCommand.CommandHandler>()
61+
.UseCommandHandler<InitCommand, InitCommand.CommandHandler>();
6062
})
6163
.UseHelp(AddAdditionalArgumentsHelp)
6264
.UseDefaults().Build();

0 commit comments

Comments
 (0)