updatecli: pass the branch instead (#17291)

Author: v1v

.ci/scripts/update-beats.sh

@@ -6,3 +6,18 @@
 set -euo pipefail
 
 make update-beats BEATS_VERSION="${1}"
+
+#
+# updatecli with kind: shell requires the script to exit with 0
+# if there are no modifications to the repository.
+# Otherwise, it will print the diff.
+# This is to avoid the updatecli to fail when there are no modifications.
+# See https://www.updatecli.io/docs/plugins/resource/shell/#_shell_target
+#
+if git diff --quiet ; then
+    # No modifications – exit successfully but keep stdout empty to that updatecli is happy
+    exit 0
+else
+    make update-beats-message
+    git --no-pager diff
+fi

.ci/updatecli/update-beats.yml

@@ -13,10 +13,11 @@ scms:
       token: '{{ requiredEnv "GITHUB_TOKEN" }}'
       branch: '{{ requiredEnv "BRANCH_NAME" }}'
       commitusingapi: true
+      force: false
 
 actions:
   default:
-    title: '[updatecli] Update to elastic/beats@{{ source "beats" }}'
+    title: '[updatecli][{{ requiredEnv "BRANCH_NAME" }}] Update to elastic/beats'
     kind: github/pullrequest
     scmid: default
     spec:
@@ -26,41 +27,16 @@ actions:
         - backport-skip
       description: |-
         ### What
-        `elastic/beats` automatic sync
-
-        *Changeset*
-        * https://github.com/elastic/beats/commit/{{ source "beats" }}
-
-sources:
-  beats:
-    kind: json
-    spec:
-      file: 'https://api.github.com/repos/elastic/beats/commits?sha={{ requiredEnv "BRANCH_NAME" }}&per_page=1'
-      key: '.[0].sha'
-    transformers:
-      # substring 12 chars so it works for the condition
-      - findsubmatch:
-          pattern: ^(.{12}).*
-          captureindex: 1
-
-conditions:
-  is-already-updated:
-    name: Is version 'github.com/elastic/beats@{{ source "beats" }}' not updated in 'go.mod'?
-    kind: shell
-    disablesourceinput: true
-    scmid: default
-    spec:
-      command: grep {{ source "beats" }} go.mod && exit 1 || exit 0
-    failwhen: false
+        `elastic/beats@{{ requiredEnv "BRANCH_NAME" }}` automatic sync
 
 targets:
   beats:
-    name: 'Update to elastic/beats@{{ source "beats" }}'
-    sourceid: beats
+    name: 'update-beats with {{ requiredEnv "BRANCH_NAME" }}'
     scmid: default
     kind: shell
+    disablesourceinput: true
     spec:
-      command: .ci/scripts/update-beats.sh
+      command: .ci/scripts/update-beats.sh '{{ requiredEnv "BRANCH_NAME" }}'
       environments:
         - name: PATH
         - name: HOME

Makefile

@@ -235,12 +235,14 @@ BEATS_MODULE:=github.com/elastic/beats/v7
 
 .PHONY: update-beats
 update-beats: update-beats-module tidy notice
-	@echo --- Use this commit message: Update to elastic/beats@$(shell go list -m -f {{.Version}} $(BEATS_MODULE) | cut -d- -f3)
 
 .PHONY: update-beats-module
 update-beats-module:
 	go get $(BEATS_MODULE)@$(BEATS_VERSION) && go mod tidy
 
+update-beats-message:
+	@echo --- Use this commit message: Update to elastic/beats@$(shell go list -m -f {{.Version}} $(BEATS_MODULE) | cut -d- -f3)
+
 ##############################################################################
 # Linting, style-checking, license header checks, etc.
 ##############################################################################