Skip to content

Commit 7d0db6b

Browse files
authored
chore(dev): Install dd-rust-license-tool from crates.io (#18025)
And update vdev as well as the docs to use the new binary name. Signed-off-by: Jesse Szwedko <[email protected]> Signed-off-by: Jesse Szwedko <[email protected]>
1 parent b00727e commit 7d0db6b

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ When deprecating functionality in Vector, see [DEPRECATION.md](DEPRECATION.md).
230230

231231
When adding, modifying, or removing a dependency in Vector you may find that you need to update the
232232
inventory of third-party licenses maintained in `LICENSE-3rdparty.csv`. This file is generated using
233-
[rust-license-tool](https://github.com/DataDog/rust-license-tool.git) and can be updated using
233+
[dd-rust-license-tool](https://github.com/DataDog/rust-license-tool.git) and can be updated using
234234
`cargo vdev build licenses`.
235235

236236
## Next steps

docs/DEVELOPING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ Loosely, you'll need the following:
124124
- **To run `make test`:** Install [`cargo-nextest`](https://nexte.st/)
125125
- **To run integration tests:** Have `docker` available, or a real live version of that service. (Use `AUTOSPAWN=false`)
126126
- **To run `make check-component-features`:** Have `remarshal` installed.
127-
- **To run `make check-licenses` or `cargo vdev build licenses`:** Have `rust-license-tool` [installed](https://github.com/DataDog/rust-license-tool).
127+
- **To run `make check-licenses` or `cargo vdev build licenses`:** Have `dd-rust-license-tool` [installed](https://github.com/DataDog/rust-license-tool).
128128
- **To run `cargo vdev build component-docs`:** Have `cue` [installed](https://cuelang.org/docs/install/).
129129

130130
If you find yourself needing to run something inside the Docker environment described above, that's totally fine, they won't collide or hurt each other. In this case, you'd just run `make environment-generate`.

scripts/environment/prepare.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ fi
1717
if ! cargo deny --version >& /dev/null ; then
1818
rustup run stable cargo install cargo-deny --force --locked
1919
fi
20-
if ! rust-license-tool --help >& /dev/null ; then
21-
cargo install --git https://github.com/DataDog/rust-license-tool
20+
if ! dd-rust-license-tool --help >& /dev/null ; then
21+
rustup run stable cargo install dd-rust-license-tool --version 1.0.1 --force --locked
2222
fi
2323

2424
# Currently fixing this to version 0.30 since version 0.31 has introduced

vdev/src/commands/build/licenses.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ pub struct Cli {}
99

1010
impl Cli {
1111
pub fn exec(self) -> Result<()> {
12-
app::exec("rust-license-tool", ["write"], true)
12+
app::exec("dd-rust-license-tool", ["write"], true)
1313
}
1414
}

vdev/src/commands/check/licenses.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pub struct Cli {}
99

1010
impl Cli {
1111
pub fn exec(self) -> Result<()> {
12-
app::exec("rust-license-tool", ["check"], true).map_err(|err| {
12+
app::exec("dd-rust-license-tool", ["check"], true).map_err(|err| {
1313
info!("Run `cargo vdev build licenses` to regenerate the file");
1414
err
1515
})

0 commit comments

Comments
 (0)