Fix types

Author: reakaleek

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

@@ -3,51 +3,51 @@
 // See the LICENSE file in the project root for more information
 
 using System.Text.Json.Serialization;
+using Amazon.Lambda.S3Events;
 using Amazon.Lambda.SQSEvents;
 
 namespace Elastic.Documentation.Lambda.LinkIndexUploader;
 
 [JsonSerializable(typeof(SQSEvent))]
 [JsonSerializable(typeof(S3Event))]
-[JsonSerializable(typeof(S3EventNotification))]
 [JsonSerializable(typeof(SQSBatchResponse))]
 public partial class LinkIndexUpdaterSerializerContext : JsonSerializerContext;
 
-public class S3EventNotification
-{
-	[JsonPropertyName("Records")]
-	public List<S3EventRecord> Records { get; set; } = [];
-}
-
-public class S3EventRecord
-{
-	[JsonPropertyName("s3")]
-	public S3Event S3 { get; set; } = new();
-
-	[JsonPropertyName("eventTime")]
-	public DateTime EventTime { get; set; }
-}
-
-public class S3Event
-{
-	[JsonPropertyName("object")]
-	public S3Object Obj { get; set; } = new();
-
-	[JsonPropertyName("bucket")]
-	public S3Bucket Bucket { get; set; } = new();
-}
-
-public class S3Bucket
-{
-	[JsonPropertyName("name")]
-	public string Name { get; set; } = string.Empty;
-}
-
-public class S3Object
-{
-	[JsonPropertyName("key")]
-	public string Key { get; set; } = string.Empty;
-
-	[JsonPropertyName("eTag")]
-	public string ETag { get; set; } = string.Empty;
-}
+// public class S3EventNotification
+// {
+// 	[JsonPropertyName("Records")]
+// 	public List<S3EventRecord> Records { get; set; } = [];
+// }
+
+// public class S3EventRecord
+// {
+// 	[JsonPropertyName("s3")]
+// 	public S3Event S3 { get; set; } = new();
+//
+// 	[JsonPropertyName("eventTime")]
+// 	public DateTime EventTime { get; set; }
+// }
+//
+// public class S3Event
+// {
+// 	[JsonPropertyName("object")]
+// 	public S3Object Obj { get; set; } = new();
+//
+// 	[JsonPropertyName("bucket")]
+// 	public S3Bucket Bucket { get; set; } = new();
+// }
+//
+// public class S3Bucket
+// {
+// 	[JsonPropertyName("name")]
+// 	public string Name { get; set; } = string.Empty;
+// }
+//
+// public class S3Object
+// {
+// 	[JsonPropertyName("key")]
+// 	public string Key { get; set; } = string.Empty;
+//
+// 	[JsonPropertyName("eTag")]
+// 	public string ETag { get; set; } = string.Empty;
+// }

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

@@ -6,6 +6,7 @@
 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;
@@ -106,19 +107,19 @@ static async Task<SQSBatchResponse> Handler(SQSEvent ev, ILambdaContext context)
 	}
 }
 
-static async Task<IReadOnlyCollection<(S3EventRecord, LinkReference)>> GetLinkReferences(IAmazonS3 s3Client, SQSEvent.SQSMessage message, ILambdaContext context)
+static async Task<IReadOnlyCollection<(S3Event.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<S3EventNotification>(message.Body, LinkIndexUpdaterSerializerContext.Default.S3EventNotification);
+	var s3Event = JsonSerializer.Deserialize<S3Event>(message.Body, LinkIndexUpdaterSerializerContext.Default.S3Event);
 	if (s3Event?.Records == null || s3Event.Records.Count == 0)
 		throw new Exception("Invalid S3 event message format");
-	var linkReferences = new ConcurrentBag<(S3EventRecord, LinkReference)>();
+	var linkReferences = new ConcurrentBag<(S3Event.S3EventNotificationRecord, LinkReference)>();
 	await Parallel.ForEachAsync(s3Event.Records, async (record, ctx) =>
 	{
 		var s3Bucket = record.S3.Bucket;
-		var s3Object = record.S3.Obj;
+		var s3Object = record.S3.Object;
 		context.Logger.LogInformation("Get object {key} from bucket {bucketName}", s3Object.Key, s3Bucket.Name);
 		var getObjectResponse = await s3Client.GetObjectAsync(s3Bucket.Name, s3Object.Key, ctx);
 		await using var stream = getObjectResponse.ResponseStream;
@@ -130,9 +131,9 @@ await Parallel.ForEachAsync(s3Event.Records, async (record, ctx) =>
 	return linkReferences;
 }
 
-static void UpdateLinkIndex(LinkIndex linkIndex, LinkReference linkReference, S3EventRecord s3EventRecord, ILambdaContext context)
+static void UpdateLinkIndex(LinkIndex linkIndex, LinkReference linkReference, S3Event.S3EventNotificationRecord s3EventRecord, ILambdaContext context)
 {
-	var s3Object = s3EventRecord.S3.Obj;
+	var s3Object = s3EventRecord.S3.Object;
 	var keyTokens = s3Object.Key.Split('/');
 	var repository = keyTokens[1];
 	var branch = keyTokens[2];