Skip to content

Commit

Permalink
♻️ (MigrationTools): update migration config schema version from v2 t…
Browse files Browse the repository at this point in the history
…o v160

The migration configuration schema version is updated from v2 to v160 to reflect the new versioning scheme. This change ensures consistency across the codebase and aligns with the updated schema versioning strategy. The removal of the `Version` property from `EngineConfiguration` simplifies the configuration structure.
  • Loading branch information
MrHinsh committed Aug 16, 2024
1 parent 129fddd commit 21fb303
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public static void AddMigrationToolServicesForClientAzureDevOpsObjectModel(this
context.AddSingleton<TfsTeamSettingsEnricher>().AddSingleton<IOptions<TfsTeamSettingsEnricherOptions>>(Microsoft.Extensions.Options.Options.Create(configuration.GetSectionCommonEnrichers_v15<TfsTeamSettingsEnricherOptions>(TfsTeamSettingsEnricherOptions.ConfigurationSectionName)));

break;
case MigrationConfigSchema.v2:
case MigrationConfigSchema.v160:
context.AddSingleton<TfsAttachmentEnricher>().AddOptions<TfsAttachmentEnricherOptions>().Bind(configuration.GetSection(TfsAttachmentEnricherOptions.ConfigurationSectionName));
context.AddSingleton<TfsUserMappingEnricher>().AddOptions<TfsUserMappingEnricherOptions>().Bind(configuration.GetSection(TfsUserMappingEnricherOptions.ConfigurationSectionName));
context.AddSingleton<TfsValidateRequiredField>().AddOptions<TfsValidateRequiredFieldOptions>().Bind(configuration.GetSection(TfsValidateRequiredFieldOptions.ConfigurationSectionName));
Expand Down
5 changes: 1 addition & 4 deletions src/MigrationTools.Host/MigrationToolHost.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,9 @@ public static IHostBuilder CreateDefaultBuilder(string[] args, Action<IConfigura
var parsed = reader.BuildFromFile(configFile); // TODO revert tp
options.Source = parsed.Source;
options.Target = parsed.Target;
options.Version = parsed.Version;
break;
case MigrationConfigSchema.v2:
case MigrationConfigSchema.v160:
// This code Converts the new config format to the v1 and v2 runtme format.
options.Version = configuration.GetValue<string>("MigrationTools:Version");
options.Source = configuration.GetSection("MigrationTools:Source")?.GetMigrationToolsOption<IMigrationClientConfig>("EndpointType");
options.Target = configuration.GetSection("MigrationTools:Target")?.GetMigrationToolsOption<IMigrationClientConfig>("EndpointType");
break;
Expand Down
4 changes: 2 additions & 2 deletions src/MigrationTools/Options/VersionOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace MigrationTools.Options
public enum MigrationConfigSchema
{
v1,
v2
v160
}

public class VersionOptions
Expand Down Expand Up @@ -54,7 +54,7 @@ public static MigrationConfigSchema GetMigrationConfigVersion(IConfiguration con
}
else
{
return MigrationConfigSchema.v2;
return MigrationConfigSchema.v160;
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public void Configure(FieldMappingToolOptions options)
{
switch (VersionOptions.ConfigureOptions.GetMigrationConfigVersion(_configuration))
{
case MigrationConfigSchema.v2:
case MigrationConfigSchema.v160:
_configuration.GetSection(ConfigurationSectionName).Bind(options);
options.FieldMaps = _configuration.GetSection(FieldMappingToolOptions.ConfigurationSectionName+":FieldMaps")?.ToMigrationToolsList(child => child.GetMigrationToolsOption<IFieldMapConfig>("FieldMapType"));
break;
Expand Down
2 changes: 1 addition & 1 deletion src/MigrationTools/Processors/ProcessorContainerOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void Configure(ProcessorContainerOptions options)
{
switch (VersionOptions.ConfigureOptions.GetMigrationConfigVersion(_configuration))
{
case MigrationConfigSchema.v2:
case MigrationConfigSchema.v160:
_configuration.GetSection(ConfigurationSectionName).Bind(options);
options.Processors = _configuration.GetSection(ProcessorContainerOptions.ConfigurationSectionName)?.ToMigrationToolsList(child => child.GetMigrationToolsOption<IProcessorConfig>("ProcessorType"));
foreach (var processor in options.Processors)
Expand Down
2 changes: 1 addition & 1 deletion src/MigrationTools/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public static void AddMigrationToolServices(this IServiceCollection context, ICo
context.AddSingleton<WorkItemTypeMappingEnricher>().AddSingleton<IOptions<WorkItemTypeMappingEnricherOptions>>(Microsoft.Extensions.Options.Options.Create(configuration.GetSectionCommonEnrichers_v15<WorkItemTypeMappingEnricherOptions>(WorkItemTypeMappingEnricherOptions.ConfigurationSectionName)));
context.AddSingleton< GitRepoMappingTool>().AddSingleton<IOptions<GitRepoMappingToolOptions>>(Microsoft.Extensions.Options.Options.Create(configuration.GetSectionCommonEnrichers_v15<GitRepoMappingToolOptions>(GitRepoMappingToolOptions.ConfigurationSectionName)));
break;
case MigrationConfigSchema.v2:
case MigrationConfigSchema.v160:
context.AddSingleton<StringManipulatorEnricher>().AddOptions<StringManipulatorEnricherOptions>().Bind(configuration.GetSection(StringManipulatorEnricherOptions.ConfigurationSectionName));
context.AddSingleton<WorkItemTypeMappingEnricher>().AddOptions<WorkItemTypeMappingEnricherOptions>().Bind(configuration.GetSection(WorkItemTypeMappingEnricherOptions.ConfigurationSectionName));
context.AddSingleton<GitRepoMappingTool>().AddOptions<GitRepoMappingToolOptions>().Bind(configuration.GetSection(GitRepoMappingToolOptions.ConfigurationSectionName));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ public EngineConfiguration()
public IMigrationClientConfig Source { get; set; }
public IMigrationClientConfig Target { get; set; }
public string LogLevel { get; private set; }
public string Version { get; set; }



}
}

0 comments on commit 21fb303

Please sign in to comment.