From 7242387cd3f810399db498aa437fc73a914fd844 Mon Sep 17 00:00:00 2001
From: Damien Duportal <damien.duportal@gmail.com>
Date: Tue, 21 Nov 2023 15:12:23 +0100
Subject: [PATCH] chore(updatecli, tests) fix Linux Git manifest to also update
 goss (#919)

* chore(updatecli) fix Linux Git manifest to also update goss

Fixup of #910

* chore(tests) fix Linux Git version

Fixup of #893
---
 goss/goss-linux.yaml                |  2 +-
 updatecli/updatecli.d/git-linux.yml | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/goss/goss-linux.yaml b/goss/goss-linux.yaml
index 8fc37f7ba..77718fc85 100644
--- a/goss/goss-linux.yaml
+++ b/goss/goss-linux.yaml
@@ -61,7 +61,7 @@ command:
     exec: git --version
     exit-status: 0
     stdout:
-      - 2.42.0
+      - 2.43.0
   git_lfs:
     exec: git-lfs --version
     exit-status: 0
diff --git a/updatecli/updatecli.d/git-linux.yml b/updatecli/updatecli.d/git-linux.yml
index cc69fc5a0..7677a3b33 100644
--- a/updatecli/updatecli.d/git-linux.yml
+++ b/updatecli/updatecli.d/git-linux.yml
@@ -18,8 +18,8 @@ sources:
     kind: githubrelease
     name: Get the latest Git version
     spec:
-      owner: "git"
-      repository: "git"
+      owner: git
+      repository: git
       token: "{{ requiredEnv .github.token }}"
       username: "{{ .github.username }}"
       versionfilter:
@@ -29,11 +29,18 @@ sources:
 
 targets:
   updateGitVersion:
-    name: Update the Git version in the Packer default values
+    name: Bump Git version on Linux in the Packer default values
     kind: yaml
     spec:
-      file: "provisioning/tools-versions.yml"
-      key: "git_linux_version"
+      file: provisioning/tools-versions.yml
+      key: $.git_linux_version
+    scmid: default
+  updateVersionInGoss:
+    name: Bump Git version on Linux in the goss test
+    kind: yaml
+    spec:
+      file: goss/goss-linux.yaml
+      key: $.command.git.stdout[0]
     scmid: default
 
 actions: