Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ members = [
"nexus",
"nexus/src/db/db-macros",
"nexus-client",
"package",
"rpaths",
"sled-agent",
"sled-agent-client",
Expand All @@ -21,6 +22,7 @@ default-members = [
"common",
"nexus",
"nexus/src/db/db-macros",
"package",
"rpaths",
"sled-agent",
"sled-agent-client",
Expand Down
77 changes: 12 additions & 65 deletions common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,87 +6,34 @@ license = "MPL-2.0"

[dependencies]
anyhow = "1.0"
async-trait = "0.1.51"
api_identity = { path = "../api_identity" }
backoff = { version = "0.3.0", features = [ "tokio" ] }
chrono = { version = "0.4", features = [ "serde" ] }
dropshot = { git = "https://github.com/oxidecomputer/dropshot", branch = "main" }
futures = "0.3.18"
http = "0.2.5"
hyper = "0.14"
ipnetwork = "0.18"
propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "00ec8cf18f6a2311b0907f0b16b0ff8a327944d1" }
rayon = "1.5"
macaddr = { version = "1.0.1", features = [ "serde_std" ] }
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }
ring = "0.16"
schemars = { version = "0.8", features = [ "chrono", "uuid" ] }
serde = { version = "1.0", features = [ "derive" ] }
serde_derive = "1.0"
serde_json = "1.0"
serde_with = "1.11.0"
slog = { version = "2.5", features = [ "max_level_trace", "release_max_level_debug" ] }
smf = "0.2"
steno = { git = "https://github.com/oxidecomputer/steno", branch = "main" }
structopt = "0.3"
tar = "0.4"
tempfile = "3.0"
thiserror = "1.0"
toml = "0.5.6"
walkdir = "2.3"
tokio = { version = "1.14", features = [ "full" ] }
tokio-postgres = { version = "0.7", features = [ "with-chrono-0_4", "with-uuid-0_8" ] }
uuid = { version = "0.8", features = [ "serde", "v4" ] }
parse-display = "0.5.3"
progenitor = { git = "https://github.com/oxidecomputer/progenitor" }
percent-encoding = "2.1.0"

[dependencies.api_identity]
path = "../api_identity"

[dependencies.backoff]
version = "0.3.0"
features = [ "tokio" ]

[dependencies.chrono]
version = "0.4"
features = [ "serde" ]

[dependencies.dropshot]
git = "https://github.com/oxidecomputer/dropshot"
branch = "main"

[dependencies.ipnet]
version = "2.3.1"
features = [ "serde" ]

[dependencies.macaddr]
version = "1.0.1"
features = [ "serde_std" ]

[dependencies.schemars]
version = "0.8"
features = [ "chrono", "uuid" ]

[dependencies.serde]
version = "1.0"
features = [ "derive" ]

[dependencies.slog]
version = "2.5"
features = [ "max_level_trace", "release_max_level_debug" ]

[dependencies.steno]
git = "https://github.com/oxidecomputer/steno"
branch = "main"

[dependencies.tokio]
version = "1.14"
features = [ "full" ]

[dependencies.tokio-postgres]
version = "0.7"
features = [ "with-chrono-0_4", "with-uuid-0_8" ]

[dependencies.uuid]
version = "0.8"
features = [ "serde", "v4" ]

[dev-dependencies]
expectorate = "1.0.4"
serde_urlencoded = "0.7.0"
tokio = { version = "1.14", features = [ "test-util" ] }

# Disable doc builds by default for our binaries to work around issue
# rust-lang/cargo#8373. These docs would not be very useful anyway.
[[bin]]
name = "omicron-package"
doc = false
1 change: 1 addition & 0 deletions package/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/target
30 changes: 30 additions & 0 deletions package/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
[package]
name = "omicron-package"
version = "0.1.0"
edition = "2018"
license = "MPL-2.0"

[dependencies]
anyhow = "1.0"
omicron-common = { path = "../common" }
# We depend on the propolis-server here -- a binary, not a library -- to
# make it visible to the packaging tool, which can compile it and shove
# it in a tarball.
propolis-server = { git = "https://github.com/oxidecomputer/propolis", rev = "00ec8cf18f6a2311b0907f0b16b0ff8a327944d1" }
rayon = "1.5"
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] }
serde = { version = "1.0", features = [ "derive" ] }
serde_derive = "1.0"
smf = "0.2"
structopt = "0.3"
tar = "0.4"
thiserror = "1.0"
tokio = { version = "1.14", features = [ "full" ] }
toml = "0.5.6"
walkdir = "2.3"

# Disable doc builds by default for our binaries to work around issue
# rust-lang/cargo#8373. These docs would not be very useful anyway.
[[bin]]
name = "omicron-package"
doc = false
File renamed without changes.