Ensure remote builds have access to px cli. Squash with original commit

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>

Author: ddelnano

src/pxl_scripts/BUILD.bazel

@@ -20,11 +20,14 @@ package(default_visibility = ["//src:__subpackages__"])
 
 filegroup(
     name = "preset_queries",
-    srcs = glob([
-        "**/*.pxl",
-        "**/*.json",
-        "**/*.yaml",
-    ], exclude = ["bundle-oss.json"]),
+    srcs = glob(
+        [
+            "**/*.pxl",
+            "**/*.json",
+            "**/*.yaml",
+        ],
+        exclude = ["bundle-oss.json"],
+    ),
     visibility = ["//src:__subpackages__"],
 )
 
@@ -43,7 +46,10 @@ genrule(
         ":preset_queries",
     ],
     outs = ["bundle-oss.json"],
-    cmd = "export PATH_PREFIX=$$(dirname $(location //src/pxl_scripts:makefile))/; make -C $$PATH_PREFIX bundle-oss.json; cp bundle-oss.json $(@D)/bundle-oss.json",
+    cmd = "export PATH_PREFIX=$$(dirname $(location //src/pxl_scripts:makefile))/; PX_BIN=../../$(location //src/pixie_cli:px) make -C $$PATH_PREFIX bundle-oss.json; cp bundle-oss.json $(@D)/bundle-oss.json",
+    tools = [
+        "//src/pixie_cli:px",
+    ],
     visibility = ["//src:__subpackages__"],
 )
 

src/pxl_scripts/Makefile

@@ -25,6 +25,7 @@ K := $(foreach exec,$(EXECUTABLES),\
 # Optional path prefix to use for the script_files path. Used by bazel
 # to ensure the scripts are in the correct location.
 PATH_PREFIX ?= ""
+PX_BIN ?= px
 
 all: bundle-oss.json.gz
 
@@ -37,7 +38,7 @@ bundle-oss.json: $(script_files)
 		export HOME=$$TMPDIR; \
 		trap "rm -rf $$TMPDIR" EXIT; \
 	fi; \
-	px create-bundle --search_path $(PWD) $(foreach dir,$(dirs),--base $(PATH_PREFIX)$(dir)) -o $(PWD)/bundle-oss.json
+	$(PX_BIN) create-bundle --search_path $(PWD) $(foreach dir,$(dirs),--base $(PATH_PREFIX)$(dir)) -o $(PWD)/bundle-oss.json
 
 bundle-oss.json.gz: bundle-oss.json
 	gzip -c $< > $@