test

Author: reakaleek

src/infra/docs-lambda-index-publisher/Models.cs

@@ -3,13 +3,13 @@
 // See the LICENSE file in the project root for more information
 
 using System.Text.Json.Serialization;
-using Amazon.Lambda.S3Events;
 using Amazon.Lambda.SQSEvents;
+using Amazon.S3.Util;
 
 namespace Elastic.Documentation.Lambda.LinkIndexUploader;
 
 [JsonSerializable(typeof(SQSEvent))]
-[JsonSerializable(typeof(S3Event))]
+[JsonSerializable(typeof(S3EventNotification))]
 [JsonSerializable(typeof(SQSBatchResponse))]
 public partial class LinkIndexUpdaterSerializerContext : JsonSerializerContext;
 

src/infra/docs-lambda-index-publisher/Program.cs

@@ -6,11 +6,11 @@
 using System.Text.Json;
 using Amazon.Lambda.Core;
 using Amazon.Lambda.RuntimeSupport;
-using Amazon.Lambda.S3Events;
 using Amazon.Lambda.Serialization.SystemTextJson;
 using Amazon.Lambda.SQSEvents;
 using Amazon.S3;
 using Amazon.S3.Model;
+using Amazon.S3.Util;
 using Elastic.Documentation.Lambda.LinkIndexUploader;
 using Elastic.Markdown.IO.State;
 using Elastic.Markdown.Links.CrossLinks;
@@ -107,18 +107,17 @@ static async Task<SQSBatchResponse> Handler(SQSEvent ev, ILambdaContext context)
 	}
 }
 
-static async Task<IReadOnlyCollection<(S3Event.S3EventNotificationRecord, LinkReference)>> GetLinkReferences(IAmazonS3 s3Client, SQSEvent.SQSMessage message, ILambdaContext context)
+static async Task<IReadOnlyCollection<(S3EventNotification.S3EventNotificationRecord, LinkReference)>> GetLinkReferences(IAmazonS3 s3Client, SQSEvent.SQSMessage message, ILambdaContext context)
 {
 	if (string.IsNullOrEmpty(message.Body))
 		throw new Exception("No Body in SQS Message.");
 	context.Logger.LogDebug("Received message {messageBody}", message.Body);
-	var s3Event = JsonSerializer.Deserialize<S3Event>(message.Body, LinkIndexUpdaterSerializerContext.Default.S3Event);
+	var s3Event = S3EventNotification.ParseJson(message.Body);
 	if (s3Event?.Records == null || s3Event.Records.Count == 0)
 		throw new Exception("Invalid S3 event message format");
-	var linkReferences = new ConcurrentBag<(S3Event.S3EventNotificationRecord, LinkReference)>();
+	var linkReferences = new ConcurrentBag<(S3EventNotification.S3EventNotificationRecord, LinkReference)>();
 	await Parallel.ForEachAsync(s3Event.Records, async (record, ctx) =>
 	{
-		context.Logger.LogInformation(JsonSerializer.Serialize(record, LinkIndexUpdaterSerializerContext.Default.S3Event));
 		var s3Bucket = record.S3.Bucket;
 		var s3Object = record.S3.Object;
 		context.Logger.LogInformation("Get object {key} from bucket {bucketName}", s3Object.Key, s3Bucket.Name);
@@ -132,7 +131,7 @@ await Parallel.ForEachAsync(s3Event.Records, async (record, ctx) =>
 	return linkReferences;
 }
 
-static void UpdateLinkIndex(LinkIndex linkIndex, LinkReference linkReference, S3Event.S3EventNotificationRecord s3EventRecord, ILambdaContext context)
+static void UpdateLinkIndex(LinkIndex linkIndex, LinkReference linkReference, S3EventNotification.S3EventNotificationRecord s3EventRecord, ILambdaContext context)
 {
 	var s3Object = s3EventRecord.S3.Object;
 	var keyTokens = s3Object.Key.Split('/');