From 921271e86bd377fba747c455dc3e12c4fe871d39 Mon Sep 17 00:00:00 2001
From: Sara Adams <sara.e.adams@gmail.com>
Date: Sat, 2 Dec 2023 05:32:36 +0100
Subject: [PATCH] Move buildifier setup from `WORKSPACE` to Bzlmod

Signed-off-by: Sara Adams <sara.e.adams@gmail.com>
---
 MODULE.bazel                 |  1 +
 WORKSPACE                    | 54 ------------------------------------
 infra/lint.sh                |  2 +-
 third_party/buildifier/BUILD | 16 ++---------
 4 files changed, 5 insertions(+), 68 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index cd5ab0d..a18ebd1 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -5,6 +5,7 @@
 # =========================================
 
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
+bazel_dep(name = "buildifier_prebuilt", version = "6.3.3")
 bazel_dep(name = "platforms", version = "0.0.8")
 bazel_dep(name = "rules_jvm_external", version = "5.3")
 bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
diff --git a/WORKSPACE b/WORKSPACE
index 774a357..1af06b7 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -2,57 +2,3 @@ workspace(
     name = "com_engflow_bazel_invocation_analyzer",
 )
 
-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
-
-# Dependencies required for linting
-
-## BUILD files
-http_file(
-    name = "buildifier_darwin_amd64",
-    executable = True,
-    sha256 = "c9378d9f4293fc38ec54a08fbc74e7a9d28914dae6891334401e59f38f6e65dc",
-    urls = [
-        "https://storage.googleapis.com/engflow-tools-public/github.com/bazelbuild/buildtools/releases/download/5.1.0/buildifier-darwin-amd64",
-        "https://github.com/bazelbuild/buildtools/releases/download/5.1.0/buildifier-darwin-amd64",
-    ],
-)
-
-http_file(
-    name = "buildifier_darwin_arm64",
-    executable = True,
-    sha256 = "745feb5ea96cb6ff39a76b2821c57591fd70b528325562486d47b5d08900e2e4",
-    urls = [
-        "https://storage.googleapis.com/engflow-tools-public/github.com/bazelbuild/buildtools/releases/download/5.1.0/buildifier-darwin-arm64",
-        "https://github.com/bazelbuild/buildtools/releases/download/5.1.0/buildifier-darwin-arm64",
-    ],
-)
-
-http_file(
-    name = "buildifier_linux_amd64",
-    executable = True,
-    sha256 = "52bf6b102cb4f88464e197caac06d69793fa2b05f5ad50a7e7bf6fbd656648a3",
-    urls = [
-        "https://storage.googleapis.com/engflow-tools-public/github.com/bazelbuild/buildtools/releases/download/5.1.0/buildifier-linux-amd64",
-        "https://github.com/bazelbuild/buildtools/releases/download/5.1.0/buildifier-linux-amd64",
-    ],
-)
-
-http_file(
-    name = "buildifier_linux_arm64",
-    executable = True,
-    sha256 = "917d599dbb040e63ae7a7e1adb710d2057811902fdc9e35cce925ebfd966eeb8",
-    urls = [
-        "https://storage.googleapis.com/engflow-tools-public/github.com/bazelbuild/buildtools/releases/download/5.1.0/buildifier-linux-arm64",
-        "https://github.com/bazelbuild/buildtools/releases/download/5.1.0/buildifier-linux-arm64",
-    ],
-)
-
-http_file(
-    name = "buildifier_windows_amd64",
-    executable = True,
-    sha256 = "2f039125e2fbef4c804e43dc11c71866cf444306ac6d0f5e38c592854458f425",
-    urls = [
-        "https://storage.googleapis.com/engflow-tools-public/github.com/bazelbuild/buildtools/releases/download/5.1.0/buildifier-windows-amd64.exe",
-        "https://github.com/bazelbuild/buildtools/releases/download/5.1.0/buildifier-windows-amd64.exe",
-    ],
-)
diff --git a/infra/lint.sh b/infra/lint.sh
index 660dd49..3b6c5cf 100755
--- a/infra/lint.sh
+++ b/infra/lint.sh
@@ -49,7 +49,7 @@ EOT
 }
 
 JAVA_FORMATTER="$(rlocation com_engflow_bazel_invocation_analyzer/third_party/google-java-format/google-java-format)"
-STARLARK_FORMATTER="$(rlocation com_engflow_bazel_invocation_analyzer/third_party/buildifier/buildifier.exe)"
+STARLARK_FORMATTER="$(rlocation com_engflow_bazel_invocation_analyzer/third_party/buildifier/buildifier)"
 POSITIONAL_ARGS=()
 FIX=
 
diff --git a/third_party/buildifier/BUILD b/third_party/buildifier/BUILD
index a816e08..0b4bcea 100644
--- a/third_party/buildifier/BUILD
+++ b/third_party/buildifier/BUILD
@@ -1,18 +1,8 @@
 package(default_visibility = ["//infra:__subpackages__"])
 
-load("@bazel_skylib//rules:copy_file.bzl", "copy_file")
+load("@buildifier_prebuilt//:rules.bzl", "buildifier_binary")
 
-copy_file(
+buildifier_binary(
     name = "buildifier",
-    src = select({
-        "//conditions:darwin_arm64": "@buildifier_darwin_arm64//file",
-        "//conditions:darwin_x86_64": "@buildifier_darwin_amd64//file",
-        "//conditions:linux_aarch64": "@buildifier_linux_arm64//file",
-        "//conditions:linux_x86_64": "@buildifier_linux_amd64//file",
-        "//conditions:windows": "@buildifier_windows_amd64//file",
-        "//conditions:default": "@buildifier_linux_amd64//file",
-    }),
-    out = "buildifier.exe",
-    allow_symlink = True,
-    is_executable = True,
+    visibility = ["//visibility:public"],
 )