Change SourceGenerationContext's Dictionary typing and remove magic strings

Author: cotti

src/Elastic.Documentation/Serialization/SourceGenerationContext.cs

@@ -19,5 +19,5 @@ namespace Elastic.Documentation.Serialization;
 [JsonSerializable(typeof(LinkRegistry))]
 [JsonSerializable(typeof(LinkRegistryEntry))]
 [JsonSerializable(typeof(DocumentationDocument))]
-[JsonSerializable(typeof(FrozenDictionary<string, string>))]
+[JsonSerializable(typeof(Dictionary<string, string>))]
 public sealed partial class SourceGenerationContext : JsonSerializerContext;

src/tooling/docs-assembler/Building/AssemblerBuilder.cs

@@ -152,11 +152,11 @@ private async Task OutputRedirectsAsync(Dictionary<string, string> redirects, Ca
 	{
 		var uniqueRedirects = redirects
 			.Where(x => !x.Key.TrimEnd('/').Equals(x.Value.TrimEnd('/')))
-			.ToFrozenDictionary();
+			.ToDictionary();
 		var redirectsFile = context.WriteFileSystem.FileInfo.New(Path.Combine(context.OutputDirectory.FullName, "redirects.json"));
 		_logger.LogInformation("Writing {Count} resolved redirects to {Path}", uniqueRedirects.Count, redirectsFile.FullName);
 
-		var redirectsJson = JsonSerializer.Serialize(uniqueRedirects, SourceGenerationContext.Default.FrozenDictionaryStringString);
+		var redirectsJson = JsonSerializer.Serialize(uniqueRedirects, SourceGenerationContext.Default.DictionaryStringString);
 		await context.WriteFileSystem.File.WriteAllTextAsync(redirectsFile.FullName, redirectsJson, ctx);
 	}
 }

src/tooling/docs-assembler/Cli/DeployCommands.cs

@@ -17,10 +17,15 @@
 using Elastic.Documentation.Tooling.Diagnostics.Console;
 using Elastic.Documentation.Tooling.Filters;
 using Microsoft.Extensions.Logging;
-using DescribeKeyValueStoreRequest = Amazon.CloudFront.Model.DescribeKeyValueStoreRequest;
 
 namespace Documentation.Assembler.Cli;
 
+internal enum KvsOperation
+{
+	Puts,
+	Deletes
+}
+
 internal sealed class DeployCommands(ILoggerFactory logger, ICoreService githubActionsService)
 {
 	[SuppressMessage("Usage", "CA2254:Template should be a static expression")]
@@ -129,7 +134,7 @@ public async Task<int> UpdateRedirects(
 
 		ConsoleApp.Log("Parsing redirects mapping");
 		var jsonContent = await File.ReadAllTextAsync(redirectsFile, ctx);
-		var sourcedRedirects = JsonSerializer.Deserialize(jsonContent, SourceGenerationContext.Default.FrozenDictionaryStringString);
+		var sourcedRedirects = JsonSerializer.Deserialize(jsonContent, SourceGenerationContext.Default.DictionaryStringString);
 
 		if (sourcedRedirects is null)
 		{
@@ -144,7 +149,7 @@ public async Task<int> UpdateRedirects(
 		var kvsClient = new AmazonCloudFrontKeyValueStoreClient();
 
 		ConsoleApp.Log("Describing KVS");
-		var describeResponse = await cfClient.DescribeKeyValueStoreAsync(new DescribeKeyValueStoreRequest { Name = kvsName }, ctx);
+		var describeResponse = await cfClient.DescribeKeyValueStoreAsync(new Amazon.CloudFront.Model.DescribeKeyValueStoreRequest { Name = kvsName }, ctx);
 
 		var kvsArn = describeResponse.KeyValueStore.ARN;
 		var eTag = describeResponse.ETag;
@@ -171,8 +176,8 @@ public async Task<int> UpdateRedirects(
 		ConsoleApp.Log("Updating redirects in KVS");
 		const int batchSize = 500;
 
-		eTag = await ProcessBatchUpdatesAsync(kvsClient, kvsArn, eTag, toPut, batchSize, "Puts", ctx);
-		_ = await ProcessBatchUpdatesAsync(kvsClient, kvsArn, eTag, toDelete, batchSize, "Deletes", ctx);
+		eTag = await ProcessBatchUpdatesAsync(kvsClient, kvsArn, eTag, toPut, batchSize, KvsOperation.Puts, ctx);
+		_ = await ProcessBatchUpdatesAsync(kvsClient, kvsArn, eTag, toDelete, batchSize, KvsOperation.Deletes, ctx);
 
 		await collector.StopAsync(ctx);
 		return collector.Errors;
@@ -184,7 +189,7 @@ private static async Task<string> ProcessBatchUpdatesAsync(
 		string eTag,
 		IEnumerable<object> items,
 		int batchSize,
-		string operation,
+		KvsOperation operation,
 		Cancel ctx)
 	{
 		var enumerable = items.ToList();
@@ -197,9 +202,9 @@ private static async Task<string> ProcessBatchUpdatesAsync(
 				IfMatch = eTag
 			};
 
-			if (operation.Equals("Puts", StringComparison.InvariantCulture))
+			if (operation is KvsOperation.Puts)
 				updateRequest.Puts = batch.Cast<PutKeyRequestListItem>().ToList();
-			else if (operation.Equals("Deletes", StringComparison.InvariantCulture))
+			else if (operation is KvsOperation.Deletes)
 				updateRequest.Deletes = batch.Cast<DeleteKeyRequestListItem>().ToList();
 
 			var update = await kvsClient.UpdateKeysAsync(updateRequest, ctx);