Merge remote-tracking branch 'origin/fix/diff-validate-ci' into fix/diff-validate-ci

Author: cotti

actions/diff-validate/action.yml

@@ -0,0 +1,10 @@
+name: 'Validate Redirect Rules'
+description: 'Validates consistency of the documentation changes in relation to redirect rules'
+
+runs:
+  using: "composite"
+  steps:
+    - name: Validate Redirect Rules
+      uses: elastic/docs-builder@main
+      with:
+        command: "diff validate"

docs-builder.sln

@@ -141,6 +141,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Api.I
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Elastic.Documentation.Api.Lambda", "src\api\Elastic.Documentation.Api.Lambda\Elastic.Documentation.Api.Lambda.csproj", "{C6A121C5-DEB1-4FCE-9140-AF144EA98EEE}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "diff-validate", "diff-validate", "{E7C7A02B-9AB4-455A-9A64-3D326ED1A95A}"
+	ProjectSection(SolutionItems) = preProject
+		actions\diff-validate\action.yml = actions\diff-validate\action.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -287,5 +292,6 @@ Global
 		{F30B90AD-1A01-4A6F-9699-809FA6875B22} = {B042CC78-5060-4091-B95A-79C71BA3908A}
 		{AE3FC78E-167F-4B6E-88EC-84743EB748B7} = {B042CC78-5060-4091-B95A-79C71BA3908A}
 		{C6A121C5-DEB1-4FCE-9140-AF144EA98EEE} = {B042CC78-5060-4091-B95A-79C71BA3908A}
+		{E7C7A02B-9AB4-455A-9A64-3D326ED1A95A} = {245023D2-D3CA-47B9-831D-DAB91A2FFDC7}
 	EndGlobalSection
 EndGlobal

src/tooling/docs-builder/Cli/DiffCommands.cs

@@ -57,20 +57,18 @@ public async Task<int> ValidateRedirects([Argument] string? path = null, Cancel
 		}
 
 		IRepositoryTracker tracker = runningOnCi ? new IntegrationGitRepositoryTracker(path) : new LocalGitRepositoryTracker(collector, root, path);
-		var changed = tracker.GetChangedFiles() as GitChange[] ?? [];
+		var changed = tracker.GetChangedFiles();
 
-		if (changed.Length > 0)
-			_log.LogInformation($"Found {changed.Length} changes to files related to documentation in the current branch.");
+		if (changed.Any())
+			_log.LogInformation("Found {Count} changes to files related to documentation in the current branch.", changed.Count());
 
 		foreach (var notFound in changed.DistinctBy(c => c.FilePath).Where(c => c.ChangeType is GitChangeType.Deleted or GitChangeType.Renamed
 																	&& !redirects.ContainsKey(c is RenamedGitChange renamed ? renamed.OldFilePath : c.FilePath)))
 		{
 			if (notFound is RenamedGitChange renamed)
 			{
 				collector.EmitError(redirectFileInfo.Name,
-					runningOnCi
-						? $"A file was renamed to '{renamed.NewFilePath}' but it has no redirect configuration set."
-						: $"File '{renamed.OldFilePath}' was renamed to '{renamed.NewFilePath}' but it has no redirect configuration set.");
+					$"File '{renamed.OldFilePath}' was renamed to '{renamed.NewFilePath}' but it has no redirect configuration set.");
 			}
 			else if (notFound.ChangeType is GitChangeType.Deleted)
 			{

src/tooling/docs-builder/Tracking/IntegrationGitRepositoryTracker.cs

@@ -33,8 +33,12 @@ public IEnumerable<GitChange> GetChangedFiles()
 		var renamedFiles = Environment.GetEnvironmentVariable("RENAMED_FILES");
 		if (!string.IsNullOrEmpty(renamedFiles))
 		{
-			foreach (var file in renamedFiles.Split(' ', StringSplitOptions.RemoveEmptyEntries).Where(f => f.StartsWith(LookupPath)))
-				yield return new RenamedGitChange(string.Empty, file, GitChangeType.Renamed);
+			foreach (var pair in renamedFiles.Split(' ', StringSplitOptions.RemoveEmptyEntries).Where(f => f.StartsWith(LookupPath)))
+			{
+				var parts = pair.Split(':');
+				if (parts.Length == 2)
+					yield return new RenamedGitChange(parts[0], parts[1], GitChangeType.Renamed);
+			}
 		}
 	}
 }