From a422f4ec6106e513c201992214321ea6b1765beb Mon Sep 17 00:00:00 2001
From: John Chadwick <jchadwick@buf.build>
Date: Mon, 17 Jun 2024 19:07:52 -0400
Subject: [PATCH 1/2] Fix Windows support

---
 buf/internal/breaking.bzl  |  3 +++
 buf/internal/lint.bzl      |  3 +++
 buf/internal/plugin.bzl    | 34 ++++++++++++++++++++++++++++------
 buf/internal/toolchain.bzl |  6 +++---
 4 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/buf/internal/breaking.bzl b/buf/internal/breaking.bzl
index 43bbf61..5b40ed3 100644
--- a/buf/internal/breaking.bzl
+++ b/buf/internal/breaking.bzl
@@ -59,6 +59,9 @@ buf_breaking_test = rule(
             executable = True,
             cfg = "exec",
         ),
+        "_windows_constraint": attr.label(
+            default = "@platforms//os:windows",
+        ),
         "targets": attr.label_list(
             providers = [ProtoInfo],
             doc = """`proto_library` targets to check for breaking changes""",
diff --git a/buf/internal/lint.bzl b/buf/internal/lint.bzl
index 981eecd..f0c8012 100644
--- a/buf/internal/lint.bzl
+++ b/buf/internal/lint.bzl
@@ -56,6 +56,9 @@ buf_lint_test = rule(
             executable = True,
             cfg = "exec",
         ),
+        "_windows_constraint": attr.label(
+            default = "@platforms//os:windows",
+        ),
         "targets": attr.label_list(
             providers = [ProtoInfo],
             mandatory = True,
diff --git a/buf/internal/plugin.bzl b/buf/internal/plugin.bzl
index 2c4a63b..d186414 100644
--- a/buf/internal/plugin.bzl
+++ b/buf/internal/plugin.bzl
@@ -14,6 +14,12 @@
 
 """protoc plugin based test rule"""
 
+_BATCH_PROTOC_SHIM = """@echo off
+set errorlevel=
+call {} @{}
+exit /b %errorlevel%
+"""
+
 def protoc_plugin_test(ctx, proto_infos, protoc, plugin, config, files_to_include = [], protoc_args = []):
     """protoc_plugin_test creates a script file for a generic protoc plugin
 
@@ -28,6 +34,12 @@ def protoc_plugin_test(ctx, proto_infos, protoc, plugin, config, files_to_includ
     Returns:
         Runfiles required to run the test
     """
+    is_windows = ctx.target_platform_has_constraint(ctx.attr._windows_constraint[platform_common.ConstraintValueInfo])
+
+    path_join = ':'
+    if is_windows:
+        path_join = ';'
+
     deps = depset(
         [pi.direct_descriptor_set for pi in proto_infos],
         transitive = [pi.transitive_descriptor_sets for pi in proto_infos],
@@ -50,7 +62,7 @@ def protoc_plugin_test(ctx, proto_infos, protoc, plugin, config, files_to_includ
     args = args.set_param_file_format("multiline")
     args.add_joined(["--plugin", "protoc-gen-buf-plugin", plugin.short_path], join_with = "=")
     args.add_joined(["--buf-plugin_opt", config], join_with = "=")
-    args.add_joined("--descriptor_set_in", deps, join_with = ":", map_each = _short_path)
+    args.add_joined("--descriptor_set_in", deps, join_with = path_join, map_each = _short_path)
     args.add_joined(["--buf-plugin_out", "."], join_with = "=")
     args.add_all(protoc_args)
     args.add_all(sources)
@@ -62,11 +74,20 @@ def protoc_plugin_test(ctx, proto_infos, protoc, plugin, config, files_to_includ
         is_executable = True,
     )
 
-    ctx.actions.write(
-        output = ctx.outputs.executable,
-        content = "{} @{}".format(protoc.short_path, args_file.short_path),
-        is_executable = True,
-    )
+    if is_windows:
+        # TODO: This still requires `--enable_runfiles` on Windows.
+        executable_file = ctx.actions.declare_file("{}.bat".format(ctx.label.name))
+        ctx.actions.write(
+            output = executable_file,
+            content = _BATCH_PROTOC_SHIM.format(protoc.short_path, args_file.short_path),
+        )
+    else:
+        executable_file = ctx.actions.declare_file("{}.sh".format(ctx.label.name))
+        ctx.actions.write(
+            output = executable_file,
+            content = "{} @{}".format(protoc.short_path, args_file.short_path),
+            is_executable = True,
+        )
 
     files = [protoc, plugin, args_file] + source_files + files_to_include
     runfiles = ctx.runfiles(
@@ -76,6 +97,7 @@ def protoc_plugin_test(ctx, proto_infos, protoc, plugin, config, files_to_includ
 
     return [
         DefaultInfo(
+            executable = executable_file,
             runfiles = runfiles,
         ),
     ]
diff --git a/buf/internal/toolchain.bzl b/buf/internal/toolchain.bzl
index 0866f3f..bacd917 100644
--- a/buf/internal/toolchain.bzl
+++ b/buf/internal/toolchain.bzl
@@ -52,13 +52,13 @@ _buf_toolchain = rule(
 
 def declare_buf_toolchains(os, cpu, rules_buf_repo_name):
     for cmd in ["buf", "protoc-gen-buf-lint", "protoc-gen-buf-breaking"]:
-        ext = ""
+        exe_suffix = ""
         if os == "windows":
-            ext = ".exe"
+            exe_suffix = ".exe"
         toolchain_impl = cmd + "_toolchain_impl"
         _buf_toolchain(
             name = toolchain_impl,
-            cli = str(Label("//:"+ cmd)),
+            cli = str(Label("//:"+ cmd + exe_suffix)),
         )
         native.toolchain(
             name = cmd + "_toolchain",

From a3b334e552e29d2dbd5a057a48ef5f4b7c750de3 Mon Sep 17 00:00:00 2001
From: John Chadwick <jchadwick@buf.build>
Date: Tue, 18 Jun 2024 14:56:15 -0400
Subject: [PATCH 2/2] exe_suffix -> cmd_suffix

---
 buf/internal/toolchain.bzl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buf/internal/toolchain.bzl b/buf/internal/toolchain.bzl
index bacd917..b10b0de 100644
--- a/buf/internal/toolchain.bzl
+++ b/buf/internal/toolchain.bzl
@@ -52,13 +52,13 @@ _buf_toolchain = rule(
 
 def declare_buf_toolchains(os, cpu, rules_buf_repo_name):
     for cmd in ["buf", "protoc-gen-buf-lint", "protoc-gen-buf-breaking"]:
-        exe_suffix = ""
+        cmd_suffix = ""
         if os == "windows":
-            exe_suffix = ".exe"
+            cmd_suffix = ".exe"
         toolchain_impl = cmd + "_toolchain_impl"
         _buf_toolchain(
             name = toolchain_impl,
-            cli = str(Label("//:"+ cmd + exe_suffix)),
+            cli = str(Label("//:"+ cmd + cmd_suffix)),
         )
         native.toolchain(
             name = cmd + "_toolchain",