Use domain-type inference for products, and add safety net to ResolveBundleDirectory

Author: cotti

src/services/Elastic.Changelog/Uploading/ChangelogUploadService.cs

@@ -164,9 +164,6 @@ private List<string> ReadProductsFromFragment(string filePath)
 		}
 	}
 
-	private static readonly YamlDotNet.Serialization.IDeserializer BundleDeserializer =
-		ReleaseNotesSerialization.GetEntryDeserializer();
-
 	internal IReadOnlyList<UploadTarget> DiscoverBundleUploadTargets(IDiagnosticsCollector collector, string bundleDir)
 	{
 		var rootDir = _fileSystem.DirectoryInfo.New(bundleDir);
@@ -216,14 +213,11 @@ private List<string> ReadProductsFromBundle(string filePath)
 		try
 		{
 			var content = _fileSystem.File.ReadAllText(filePath);
-			var bundle = BundleDeserializer.Deserialize<BundleDto>(content);
-			if (bundle?.Products == null)
-				return [];
+			var bundle = ReleaseNotesSerialization.DeserializeBundle(content);
 
 			return bundle.Products
-				.Select(p => p?.Product)
+				.Select(p => p.ProductId)
 				.Where(p => !string.IsNullOrWhiteSpace(p))
-				.Select(p => p!)
 				.Distinct()
 				.ToList();
 		}
@@ -255,6 +249,6 @@ private List<string> ReadProductsFromBundle(string filePath)
 			return "docs/releases";
 
 		var config = await _configLoader.LoadChangelogConfiguration(collector, args.Config, ctx);
-		return config?.Bundle?.OutputDirectory ?? "docs/releases";
+		return config?.Bundle?.OutputDirectory ?? config?.Bundle?.Directory ?? "docs/releases";
 	}
 }

tests/Elastic.Changelog.Tests/Uploading/ChangelogUploadServiceTests.cs

@@ -343,9 +343,16 @@ public async Task Upload_BundleArtifactType_UploadsToS3()
 			  - product: elasticsearch
 			    target: 9.2.0
 			    lifecycle: ga
+			    repo: elasticsearch
+			    owner: elastic
 			entries:
-			  - title: New feature
-			    type: feature
+			  - file:
+			      name: 1234-feature.yaml
+			      checksum: abc123def456
+			    type: enhancement
+			    title: New feature
+			    prs:
+			      - https://github.com/elastic/elasticsearch/pull/1234
 			"""));
 
 		A.CallTo(() => _s3Client.GetObjectMetadataAsync(A<GetObjectMetadataRequest>._, A<CancellationToken>._))
@@ -383,9 +390,16 @@ public void DiscoverBundleUploadTargets_MapsToCorrectS3Key()
 			products:
 			  - product: elasticsearch
 			    target: 9.2.0
+			    repo: elasticsearch
+			    owner: elastic
 			entries:
-			  - title: Feature
-			    type: feature
+			  - file:
+			      name: 5678-bugfix.yaml
+			      checksum: def789abc012
+			    type: bug-fix
+			    title: Fixed crash on startup
+			    prs:
+			      - https://github.com/elastic/elasticsearch/pull/5678
 			"""));
 
 		var targets = _service.DiscoverBundleUploadTargets(_collector, bundleDir);
@@ -405,11 +419,18 @@ public void DiscoverBundleUploadTargets_MultipleProducts_CreatesTargetPerProduct
 			products:
 			  - product: elasticsearch
 			    target: 9.2.0
+			    repo: elasticsearch
 			  - product: kibana
 			    target: 9.2.0
+			    repo: kibana
 			entries:
-			  - title: Stack feature
-			    type: feature
+			  - file:
+			      name: 9999-cross-product.yaml
+			      checksum: aaa111bbb222
+			    type: enhancement
+			    title: Cross-product improvement
+			    prs:
+			      - https://github.com/elastic/elasticsearch/pull/9999
 			"""));
 
 		var targets = _service.DiscoverBundleUploadTargets(_collector, bundleDir);