Fix crates_vendor to work with wasmsign (and wasmsign2) binaries

Signed-off-by: Martijn Stevenson <[email protected]>

Author: martijneken

bazel/cargo/wasmsign/BUILD.bazel

@@ -26,6 +26,7 @@ exports_files(
 crates_vendor(
     name = "crates_vendor",
     cargo_lockfile = "//bazel/cargo/wasmsign:Cargo.Bazel.lock",
+    generate_binaries = True,
     generate_target_compatible_with = False,
     manifests = ["//bazel/cargo/wasmsign:Cargo.toml"],
     mode = "remote",

bazel/cargo/wasmsign/Cargo.toml

@@ -8,3 +8,7 @@ path = "fake_lib.rs"
 
 [dependencies]
 wasmsign = {git = "https://github.com/jedisct1/wasmsign", revision = "fa4d5598f778390df09be94232972b5b865a56b8"}
+
+# Ready to upgrade to wasmsign2:
+# Which generates: //bazel/cargo/wasmsign/remote:wasmsign2-cli__wasmsign2
+#wasmsign2-cli = {git = "https://github.com/wasm-signatures/wasmsign2", revision = "07c60eee7f4c655d5a91404f5a9ffd97316d01f1"}

bazel/cargo/wasmsign/remote/BUILD.bazel

@@ -30,3 +30,10 @@ alias(
     actual = "@crates_vendor__wasmsign-0.1.2//:wasmsign",
     tags = ["manual"],
 )
+
+# Binaries
+alias(
+    name = "wasmsign__wasmsign",
+    actual = "@crates_vendor__wasmsign-0.1.2//:wasmsign__bin",
+    tags = ["manual"],
+)

bazel/cargo/wasmsign/remote/BUILD.wasmsign-0.1.2.bazel

@@ -6,7 +6,11 @@
 #     bazel run //bazel/cargo/wasmsign:crates_vendor
 ###############################################################################
 
-load("@rules_rust//rust:defs.bzl", "rust_library")
+load(
+    "@rules_rust//rust:defs.bzl",
+    "rust_binary",
+    "rust_library",
+)
 
 package(default_visibility = ["//visibility:public"])
 
@@ -44,3 +48,39 @@ rust_library(
         "@crates_vendor__thiserror-1.0.63//:thiserror",
     ],
 )
+
+rust_binary(
+    name = "wasmsign__bin",
+    srcs = glob(["**/*.rs"]),
+    compile_data = glob(
+        include = ["**"],
+        exclude = [
+            "**/* *",
+            "BUILD",
+            "BUILD.bazel",
+            "WORKSPACE",
+            "WORKSPACE.bazel",
+        ],
+    ),
+    crate_root = "src/bin/wasmsign.rs",
+    edition = "2018",
+    rustc_flags = ["--cap-lints=allow"],
+    tags = [
+        "cargo-bazel",
+        "crate-name=wasmsign",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "0.1.2",
+    deps = [
+        ":wasmsign",
+        "@crates_vendor__anyhow-1.0.86//:anyhow",
+        "@crates_vendor__byteorder-1.5.0//:byteorder",
+        "@crates_vendor__clap-2.34.0//:clap",
+        "@crates_vendor__ed25519-compact-1.0.16//:ed25519_compact",
+        "@crates_vendor__hmac-sha512-1.1.5//:hmac_sha512",
+        "@crates_vendor__parity-wasm-0.42.2//:parity_wasm",
+        "@crates_vendor__thiserror-1.0.63//:thiserror",
+    ],
+)

bazel/wasm.bzl

@@ -63,7 +63,7 @@ def _wasm_attrs(transition):
     return {
         "binary": attr.label(mandatory = True, cfg = transition),
         "signing_key": attr.label_list(allow_files = True),
-        "_wasmsign_tool": attr.label(default = "//bazel/cargo/wasmsign/remote:wasmsign", executable = True, cfg = "exec"),
+        "_wasmsign_tool": attr.label(default = "//bazel/cargo/wasmsign/remote:wasmsign__wasmsign", executable = True, cfg = "exec"),
         "_whitelist_function_transition": attr.label(default = "@bazel_tools//tools/whitelists/function_transition_whitelist"),
     }