win_lineinfile: fixes the inconsistent of the last emtpy line on diff. (

ansible-collections#283) * Fixes the inconsistent of the last emtpy line on diff. The last empty line is stripped from the only before data of diff. While the after data of diff is fixed on ansible-collections#219. * Added changelog fragment Co-authored-by: Jordan Borean <jborean93@gmail.com>
bahaynes · Aug 23, 2021 · e004dd1 · e004dd1
1 parent 8761cbe
commit e004dd1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/changelogs/fragments/win_lineinfile-diff.yml b/changelogs/fragments/win_lineinfile-diff.yml
@@ -0,0 +1,2 @@
+bugfixes:
+- win_lineinfile - Fix up diff output with ending newlines - https://github.com/ansible-collections/community.windows/pull/283
diff --git a/plugins/modules/win_lineinfile.ps1 b/plugins/modules/win_lineinfile.ps1
@@ -105,6 +105,9 @@ function Present($path, $regex, $line, $insertafter, $insertbefore, $create, $ba
 	}
 
 	if ($diff_support) {
+		if ($endswithnewline) {
+			$before += ""
+		}
 		$result.diff = @{
 			before = $before -join $linesep;
 		}
@@ -254,6 +257,7 @@ function Absent($path, $regex, $line, $backup, $validate, $encodingobj, $linesep
 		$alltext = [System.IO.File]::ReadAllText($cleanpath, $encodingobj);
 		If (($alltext[-1] -eq "`n") -or ($alltext[-1] -eq "`r")) {
 			$lines.Add("")
+			$before += ""
 		}
 	}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- win_lineinfile - Fix up diff output with ending newlines - https://github.com/ansible-collections/community.windows/pull/283