Skip to content

Commit

Permalink
add missing members (#2126)
Browse files Browse the repository at this point in the history
Fixes #2125 

See dependabot/dependabot-core#5864

I added the missing workspace members to the `members` array in the top
level `Cargo.toml`. I also put all members into `sort` order since there
were several opinions expressed in the list about the order of ASCII
(and the order of the alphabet).
  • Loading branch information
ahl authored Jan 10, 2023
1 parent 9d64ebb commit d65e6da
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 28 deletions.
42 changes: 22 additions & 20 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
[workspace]
members = [
"api_identity",
"bootstore",
"common",
"ddm-admin-client",
Expand All @@ -9,33 +10,34 @@ members = [
"gateway-cli",
"gateway-client",
"installinator",
"installinator-artifactd",
"installinator-artifact-client",
"installinator-artifactd",
"internal-dns",
"internal-dns-client",
"nexus",
"nexus-client",
"nexus/authz-macros",
"nexus/db-macros",
"nexus/db-model",
"nexus/defaults",
"nexus/passwords",
"nexus/test-interface",
"nexus/test-utils",
"nexus/test-utils-macros",
"nexus/types",
"nexus-client",
"package",
"rpaths",
"sled-agent",
"sled-agent-client",
"sp-sim",
"oxide-client",
"oximeter/oximeter",
"oximeter-client",
"oximeter/collector",
"oximeter/db",
"oximeter/instruments",
"oximeter/producer",
"oximeter/oximeter",
"oximeter/oximeter-macro-impl",
"oximeter-client",
"oximeter/producer",
"package",
"rpaths",
"sled-agent",
"sled-agent-client",
"sp-sim",
"test-utils",
"wicket",
"wicketd",
Expand All @@ -50,31 +52,31 @@ default-members = [
"gateway-cli",
"gateway-client",
"installinator",
"installinator-artifactd",
"installinator-artifact-client",
"installinator-artifactd",
"internal-dns",
"internal-dns-client",
"nexus",
"nexus-client",
"nexus/authz-macros",
"nexus/db-macros",
"nexus/db-model",
"nexus/defaults",
"nexus/passwords",
"nexus/types",
"nexus-client",
"package",
"rpaths",
"sled-agent",
"sled-agent-client",
"sp-sim",
"oxide-client",
"oximeter/oximeter",
"oximeter-client",
"oximeter/collector",
"oximeter/db",
"oximeter/instruments",
"oximeter/producer",
"oximeter/oximeter",
"oximeter/oximeter-macro-impl",
"oximeter-client",
"oximeter/producer",
"package",
"rpaths",
"sled-agent",
"sled-agent-client",
"sp-sim",
"test-utils",
"wicket",
"wicketd",
Expand Down
2 changes: 1 addition & 1 deletion api_identity/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "api_identity"
description = "macro used by for Oxide control plane resources with an identity"
description = "macro used for Oxide control plane resources with an identity"
version = "0.1.0"
authors = ["David Pacheco <dap@oxidecomputer.com>"]
edition = "2021"
Expand Down
10 changes: 5 additions & 5 deletions nexus/test-interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ edition = "2021"
license = "MPL-2.0"

[dependencies]
async-trait = "0.1.56"
dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main" , features = [ "usdt-probes" ] }
omicron-common = { path = "../../common" }
slog = { version = "2.7" }
uuid = { version = "1.2.1", features = [ "serde", "v4" ] }
async-trait.workspace = true
dropshot.workspace = true
omicron-common.workspace = true
slog.workspace = true
uuid.workspace = true
4 changes: 2 additions & 2 deletions tools/ci_check_workspace_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -u

exit=0

# Only check workspace members
# Check all workspace members
readarray -t workspace_crates < <(toml get Cargo.toml workspace.members | jq -r '.[]')

# For all the non-workspace dependencies, grab their non-workspace dependencies
Expand Down Expand Up @@ -55,4 +55,4 @@ for crate in "${!crate_deps[@]}"; do
done
done

exit $exit
exit $exit

0 comments on commit d65e6da

Please sign in to comment.