Merge remote-tracking branch 'upstream2/main' into add-download-config-option

Author: rajatvig

README.md

@@ -45,7 +45,7 @@ For example, in the following configuration:
 steps:
   - label: "Triggering pipelines"
     plugins:
-      - monorepo-diff#v1.5.1:
+      - monorepo-diff#v1.5.2:
           diff: "git diff --name-only HEAD~1"
           watch:
             - path: "**/*"
@@ -78,7 +78,7 @@ This is a sub-section that provides configuration for running commands or trigge
 steps:
   - label: "Triggering pipelines"
     plugins:
-      - monorepo-diff#v1.5.1:
+      - monorepo-diff#v1.5.2:
           watch:
             - path: app/
               config:
@@ -109,7 +109,7 @@ steps:
 steps:
   - label: "Triggering pipelines with plugin"
     plugins:
-      - monorepo-diff#v1.5.1:
+      - monorepo-diff#v1.5.2:
           watch:
             - path: test/.buildkite/
               config: # Required [trigger step configuration]
@@ -138,7 +138,7 @@ The plugin supports conditional execution of pipeline steps using the `if` key,
 steps:
   - label: "Triggering pipelines with plugin"
     plugins:
-      - monorepo-diff#v1.5.1:
+      - monorepo-diff#v1.5.2:
           diff: git diff --name-only HEAD~1
           watch:
             - path: services/api
@@ -151,20 +151,20 @@ steps:
                 if: build.tag != null
 ```
 
-In the example above, 
+In the example above,
+
 - The `deploy-api` trigger will only run on the main branch or branches matching `release/*`.
 - The `web deployment` command will run only if the build has a tag.
 
-
 #### `diff` (optional)
 
 This will run the script provided to determine the folder changes.
 Depending on your use case, you may want to determine the point where the branch occurs
-https://stackoverflow.com/questions/1527234/finding-a-branch-point-with-git and perform a diff against the branch point.
+<https://stackoverflow.com/questions/1527234/finding-a-branch-point-with-git> and perform a diff against the branch point.
 
 Default: `git diff --name-only HEAD~1`
 
-#### Sample output:
+#### Sample output
 
 ```
 README.md
@@ -201,7 +201,7 @@ git diff --name-only "$LATEST_TAG"
 steps:
   - label: "Triggering pipelines"
     plugins:
-      - monorepo-diff#v1.5.1:
+      - monorepo-diff#v1.5.2:
           diff: "git diff --name-only HEAD~1"
           watch:
             - path: "bar-service/"
@@ -228,7 +228,7 @@ A default `config` to run if no paths are matched, the `config` key is not requi
 steps:
   - label: "Triggering pipelines"
     plugins:
-      - monorepo-diff#v1.5.1:
+      - monorepo-diff#v1.5.2:
           diff: "git diff --name-only HEAD~1"
           watch:
             - path: "bar-service/"
@@ -250,7 +250,7 @@ The object values provided in this configuration will be appended to `env` prope
 steps:
   - label: "Triggering pipelines"
     plugins:
-      - monorepo-diff#v1.5.1:
+      - monorepo-diff#v1.5.2:
           diff: "git diff --name-only HEAD~1"
           watch:
             - path: "foo-service/"
@@ -272,7 +272,7 @@ Add `log_level` property to set the log level. Supported log levels are `debug`
 steps:
   - label: "Triggering pipelines"
     plugins:
-      - monorepo-diff#v1.5.1:
+      - monorepo-diff#v1.5.2:
           diff: "git diff --name-only HEAD~1"
           log_level: "debug" # defaults to "info"
           watch:
@@ -327,7 +327,7 @@ By setting `wait` to `true`, the build will wait until the triggered pipeline bu
 steps:
   - label: "Triggering pipelines"
     plugins:
-      - monorepo-diff#v1.5.1:
+      - monorepo-diff#v1.5.2:
           diff: "git diff --name-only $(head -n 1 last_successful_build)"
           interpolation: false
           env:
@@ -382,7 +382,6 @@ Thanks to [@chronotc](https://github.com/chronotc) and [@adikari](https://github
 
 MIT (see [LICENSE](LICENSE))
 
-
 ## How to Contribute
 
 Please read [contributing guide](https://github.com/buildkite-plugins/monorepo-diff-buildkite-plugin/blob/master/CONTRIBUTING.md).

hooks/command

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+executable="monorepo-diff-buildkite-plugin"
+executable_version_file="${executable}.version"
+
 check_cmd() {
   command -v "$1" > /dev/null 2>&1
   return $?
@@ -63,6 +66,27 @@ downloader() {
   fi
 }
 
+get_latest_version() {
+  local _repo="https://api.github.com/repos/buildkite-plugins/monorepo-diff-buildkite-plugin"
+  local _version=""
+
+  if check_cmd curl; then
+    _version=$(curl -s "${_repo}/releases/latest" | grep -oE '"tag_name": "v[0-9]+\.[0-9]+\.[0-9]+"' | cut -d'"' -f4)
+  elif check_cmd wget; then
+    _version=$(wget -qO- "${_repo}/releases/latest" | grep -oE '"tag_name": "v[0-9]+\.[0-9]+\.[0-9]+"' | cut -d'"' -f4)
+  fi
+
+  if [[ "$_version" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
+    echo "${_version}"
+  fi
+}
+
+get_binary_version() {
+  if [ -f "${executable_version_file}" ]; then
+    cat "${executable_version_file}" | tr -d '\n'
+  fi
+}
+
 get_version() {
   local _plugin=${BUILDKITE_PLUGINS:-""}
   local _version=""
@@ -76,38 +100,60 @@ get_version() {
   else
     _version=""
   fi
-    
+
   RETVAL="$_version"
 }
 
 download_binary_and_run() {
   get_architecture || return 1
   local _arch="$RETVAL"
-  local _executable="monorepo-diff-buildkite-plugin"
   local _repo="https://github.com/buildkite-plugins/monorepo-diff-buildkite-plugin"
 
   get_version || return 1
-  local _version="$RETVAL"
+  local _specified_version="$RETVAL"
+  local _latest_version=""
+  local _binary_version=""
+  local test_mode="${BUILDKITE_PLUGIN_MONOREPO_DIFF_BUILDKITE_PLUGIN_TEST_MODE:-false}"
+  local _url=""
 
-  if [ -z "${_version}" ]; then
-    _url=${_repo}/releases/latest/download/${_executable}_${_arch}
-  else
-    _url=${_repo}/releases/download/${_version}/${_executable}_${_arch}
+  if check_cmd "./${executable}"; then
+    _binary_version=$(get_binary_version)
+    if [[ -z "$_binary_version" ]]; then
+      say "Warning: Could not determine binary version, will download fresh copy"
+    fi
   fi
 
-  local test_mode="${BUILDKITE_PLUGIN_MONOREPO_DIFF_BUILDKITE_PLUGIN_TEST_MODE:-false}"
+  if [[ "$test_mode" == "true" ]]; then
+    true
+  elif [[ "$_specified_version" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]; then
+    if [[ -z "$_binary_version" ]] || [[ "$_binary_version" != "$_specified_version" ]]; then
+      _url=${_repo}/releases/download/${_specified_version}/${executable}_${_arch}
+      _binary_version="${_specified_version}"
+    fi
+  else
+    _latest_version=$(get_latest_version)
+    if [[ -z "$_latest_version" ]]; then
+      say "Error: Could not determine latest version"
+      exit 1
+    fi
+    if [[ -z "$_binary_version" ]] || [[ "$_binary_version" != "$_latest_version" ]]; then
+      _url=${_repo}/releases/download/${_latest_version}/${executable}_${_arch}
+      _binary_version="${_latest_version}"
+    fi
+  fi
 
-  if [[ "$test_mode" == "false" ]]; then
-    if ! downloader "$_url" "$_executable"; then
+  if [ -n "${_url}" ]; then
+    if ! downloader "$_url" "${executable}"; then
       say "failed to download $_url"
       exit 1
     fi
+    echo "${_binary_version}" > "${executable_version_file}"
   fi
 
   # todo: move it to a more secure place
-  chmod +x ${_executable}
+  chmod +x "${executable}"
 
-  ./${_executable}
+  ./"${executable}"
 }
 
 run_preinstalled_binary() {

pipeline.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"reflect"
+	"strconv"
 	"strings"
 
 	"github.com/bmatcuk/doublestar/v4"
@@ -104,7 +105,25 @@ func diff(command string) ([]string, error) {
 		return nil, fmt.Errorf("diff command failed: %v", err)
 	}
 
-	return strings.Fields(strings.TrimSpace(output)), nil
+	fields := strings.Fields(strings.TrimSpace(output))
+	paths := make([]string, 0, len(fields))
+
+	for _, field := range fields {
+		// Git quotes paths with special characters using C-style quoting
+		if strings.HasPrefix(field, "\"") && strings.HasSuffix(field, "\"") {
+			// Unquote to decode escape sequences (e.g., \360\237\252\201 -> 🪁)
+			if unquoted, err := strconv.Unquote(field); err == nil {
+				paths = append(paths, unquoted)
+			} else {
+				// If unquoting fails, fall back to removing quotes
+				paths = append(paths, strings.Trim(field, "\""))
+			}
+		} else {
+			paths = append(paths, field)
+		}
+	}
+
+	return paths, nil
 }
 
 func stepsToTrigger(files []string, watch []WatchConfig) ([]Step, error) {

pipeline_test.go

@@ -119,6 +119,34 @@ func TestDiffWithSubshell(t *testing.T) {
 	assert.Equal(t, want, got)
 }
 
+func TestDiffWithQuotedPaths(t *testing.T) {
+	want := []string{
+		"projects/test/pages/17_🪁_testfile.py",
+		"normal/file.txt",
+	}
+	got, err := diff(`printf '"projects/test/pages/17_\360\237\252\201_testfile.py" normal/file.txt'`)
+	assert.NoError(t, err)
+	assert.Equal(t, want, got)
+}
+
+func TestStepsToTriggerWithEmojiPaths(t *testing.T) {
+	watch := []WatchConfig{
+		{
+			Paths: []string{"projects/**"},
+			Step:  Step{Trigger: "test-pipeline"},
+		},
+	}
+
+	changedFiles := []string{
+		"projects/test/pages/17_🪁_testfile.py",
+		"other/file.txt",
+	}
+
+	steps, err := stepsToTrigger(changedFiles, watch)
+	assert.NoError(t, err)
+	assert.Equal(t, []Step{{Trigger: "test-pipeline"}}, steps)
+}
+
 func TestPipelinesToTriggerGetsListOfPipelines(t *testing.T) {
 	want := []string{"service-1", "service-2", "service-4"}