Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use workspace dependencies for all dependencies #70

Merged
merged 2 commits into from
Aug 12, 2024
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
4 changes: 2 additions & 2 deletions sources/Cargo.lock

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

137 changes: 137 additions & 0 deletions sources/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,142 @@ members = [
"xfscli",
]

[workspace.dependencies]
apiclient = { version = "0.1", path = "api/apiclient" }
block-party = { version = "0.1", path = "updater/block-party" }
bottlerocket-release = { version = "0.1", path = "bottlerocket-release" }
constants = { version = "0.1", path = "constants" }
datastore = { version = "0.1", path = "api/datastore" }
dogtag = { version = "0.1", path = "dogtag" }
early-boot-config-provider = { version = "0.1", path = "early-boot-config/early-boot-config-provider" }
generate-readme = { version = "0.1", path = "generate-readme" }
imdsclient = { version = "0.1", path = "imdsclient" }
models = { version = "0.1", path = "models" }
parse-datetime = { version = "0.1", path = "parse-datetime" }
retry-read = { version = "0.1", path = "retry-read" }
signpost = { version = "0.1", path = "updater/signpost" }
storewolf = { version = "0.1", path = "api/storewolf" }
simple-settings-plugin = { version = "0.1", path = "api/simple-settings-plugin" }
systemd-derive = { version = "0.1", path = "netdog/systemd-derive" }
thar-be-updates = { version = "0.1", path = "api/thar-be-updates" }
update_metadata = { version = "0.1", path = "updater/update_metadata" }
schnauzer = { version = "0.1", path = "api/schnauzer" }

abi_stable = "0.11.3"
actix = { version = "0.13", default-features = false }
actix-rt = "2"
actix-web = { version = "4", default-features = false }
actix-web-actors = { version = "4", default-features = false }
argh = "0.1"
async-trait = "0.1"
aws-config = "1"
aws-sdk-cloudformation = "1"
aws-sdk-ec2 = "1"
aws-sdk-eks = "1"
aws-smithy-runtime = "1"
aws-smithy-types = "1"
aws-types = "1"
bit_field = "0.10"
bytes = "1"
cached = "0.49"
cargo-readme = "3"
chrono = { version = "0.4", default-features = false }
darling = { version = "0.20", default-features = false }
dns-lookup = "2"
env_logger = "0.11"
envy = "0.4"
flate2 = { version = "1", default-features = false }
fs2 = "0.4"
futures = { version = "0.3", default-features = false }
futures-channel = { version = "0.3", default-features = false }
futures-core = "0.3"
futures-util = { version = "0.3", default-features = false }
glob = "0.3"
gptman = { version = "1", default-features = false }
handlebars = "4"
headers = "0.3"
hex-literal = "0.4"
http = "0.2"
httparse = "1"
httptest = "0.15"
hyper = { version = "0.14", default-features = false }
hyper-rustls = { version = "0.24", default-features = false }
hyper-unix-connector = "0.2"
indexmap = "1"
ipnet = "2"
itertools = "0.13"
lazy_static = "1"
libc = "0.2"
log = "0.4.21"
lz4 = "1"
maplit = "1.0"
nix = "0.26"
num = "0.4"
num-derive = "0.4"
num-traits = "0.2"
num_cpus = "1"
pentacle = "1"
percent-encoding = "2"
pest = "2.5"
pest_derive = "2.5"
proc-macro2 = "1"
quick-xml = "0.26"
quote = "1"
rand = { version = "0.8", default-features = false }
regex = "1"
reqwest = { version = "0.11", default-features = false }
semver = "1"
serde = "1"
serde-xml-rs = "0.6"
serde_json = "1"
serde_plain = "1"
serde_yaml = "0.9"
shell-words = "1"
shlex = "1"
signal-hook = "0.3"
simplelog = "0.12"
snafu = "0.8"
syn = { version = "2", default-features = false }
tar = { version = "0.4", default-features = false }
tempfile = "3"
tokio = { version = "~1.32", default-features = false } # LTS
tokio-retry = "0.3"
tokio-rustls = "0.24"
tokio-test = "0.4"
tokio-tungstenite = { version = "0.20", default-features = false }
tokio-util = "0.7"
toml = "0.8"
tough = "0.17"
unindent = "0.2"
url = "2"
walkdir = "2.4"
x509-parser = "0.16"
base64 = "0.22"

[workspace.dependencies.bottlerocket-modeled-types]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.2.0"
version = "0.2.0"

[workspace.dependencies.bottlerocket-settings-models]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.2.0"
version = "0.2.0"

[workspace.dependencies.bottlerocket-settings-plugin]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-plugin-v0.1.0"
version = "0.1.0"

[workspace.dependencies.settings-extension-oci-defaults]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.2.0"
version = "0.1.0"

[workspace.dependencies.settings-extension-updates]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.2.0"
version = "0.1.0"

[profile.release]
debug = true
54 changes: 27 additions & 27 deletions sources/api/apiclient/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,32 @@ build = "build.rs"
exclude = ["README.md"]

[dependencies]
base64 = "0.22"
constants = { path = "../../constants", version = "0.1" }
datastore = { path = "../datastore", version = "0.1" }
futures = { version = "0.3", default-features = false }
futures-channel = { version = "0.3", default-features = false }
http = "0.2"
httparse = "1"
hyper = { version = "0.14", default-features = false, features = ["client", "http1", "http2"] }
hyper-unix-connector = "0.2"
libc = "0.2"
log = "0.4"
models = { path = "../../models", version = "0.1" }
nix = "0.26"
rand = "0.8"
reqwest = { version = "0.11", default-features = false, features = ["rustls-tls-native-roots"] }
retry-read = { path = "../../retry-read", version = "0.1" }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
signal-hook = "0.3"
simplelog = "0.12"
snafu = { version = "0.8", features = ["futures"] }
tokio = { version = "~1.32", default-features = false, features = ["fs", "io-std", "io-util", "macros", "rt-multi-thread", "time"] } # LTS
tokio-tungstenite = { version = "0.20", default-features = false, features = ["connect"] }
toml = "0.8"
unindent = "0.2"
url = "2"
base64.workspace = true
constants.workspace = true
datastore.workspace = true
futures.workspace = true
futures-channel.workspace = true
http.workspace = true
httparse.workspace = true
hyper = { workspace = true, features = ["client", "http1", "http2"] }
hyper-unix-connector.workspace = true
libc.workspace = true
log.workspace = true
models.workspace = true
nix.workspace = true
rand = { workspace = true, features = ["default"] }
reqwest = { workspace = true, features = ["rustls-tls-native-roots"] }
retry-read.workspace = true
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
signal-hook.workspace = true
simplelog.workspace = true
snafu = { workspace = true, features = ["futures"] }
tokio = { workspace = true, features = ["fs", "io-std", "io-util", "macros", "rt-multi-thread", "time"] }
tokio-tungstenite = { workspace = true, features = ["connect"] }
toml.workspace = true
unindent.workspace = true
url.workspace = true

[build-dependencies]
generate-readme = { version = "0.1", path = "../../generate-readme" }
generate-readme.workspace = true
50 changes: 25 additions & 25 deletions sources/api/apiserver/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,32 @@ build = "build.rs"
exclude = ["README.md"]

[dependencies]
actix = { version = "0.13", default-features = false, features = ["macros"] }
actix-rt = "2"
actix-web = { version = "4", default-features = false }
actix-web-actors = { version = "4", default-features = false }
bytes = "1"
bottlerocket-release = { path = "../../bottlerocket-release", version = "0.1" }
datastore = { path = "../datastore", version = "0.1" }
fs2 = "0.4"
http = "0.2"
libc = "0.2"
log = "0.4"
models = { path = "../../models", version = "0.1" }
nix = "0.26"
num = "0.4"
rand = "0.8"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
simplelog = "0.12"
snafu = "0.8"
thar-be-updates = { path = "../thar-be-updates", version = "0.1" }
tokio = { version = "~1.32", default-features = false, features = ["process"] }
actix = { workspace = true, features = ["macros"] }
actix-rt.workspace = true
actix-web.workspace = true
actix-web-actors.workspace = true
bytes.workspace = true
bottlerocket-release.workspace = true
datastore.workspace = true
fs2.workspace = true
http.workspace = true
libc.workspace = true
log.workspace = true
models.workspace = true
nix.workspace = true
num.workspace = true
rand = { workspace = true, features = ["default"] }
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
simplelog.workspace = true
snafu.workspace = true
thar-be-updates.workspace = true
tokio = { workspace = true, features = ["process"] }

[build-dependencies]
generate-readme = { version = "0.1", path = "../../generate-readme" }
generate-readme.workspace = true

[dev-dependencies]
maplit = "1"
toml = "0.8"
simple-settings-plugin = { path = "../simple-settings-plugin", version = "0.1" }
maplit.workspace = true
toml.workspace = true
simple-settings-plugin.workspace = true
24 changes: 10 additions & 14 deletions sources/api/bootstrap-containers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,15 @@ build = "build.rs"
exclude = ["README.md"]

[dependencies]
base64 = "0.22"
constants = { path = "../../constants", version = "0.1" }
log = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1"
simplelog = "0.12"
snafu = "0.8"
toml = "0.8"

[dependencies.bottlerocket-modeled-types]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.2.0"
version = "0.2.0"
base64.workspace = true
constants.workspace = true
log.workspace = true
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
simplelog.workspace = true
snafu.workspace = true
toml.workspace = true
bottlerocket-modeled-types.workspace = true

[build-dependencies]
generate-readme = { version = "0.1", path = "../../generate-readme" }
generate-readme.workspace = true
10 changes: 3 additions & 7 deletions sources/api/bork/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ publish = false
exclude = ["README.md"]

[dependencies]
rand = "0.8"
serde_json = "1"

[dependencies.settings-extension-updates]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.2.0"
version = "0.1.0"
rand = { workspace = true, features = ["default"] }
serde_json.workspace = true
settings-extension-updates.workspace = true
28 changes: 12 additions & 16 deletions sources/api/certdog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,19 @@ build = "build.rs"
exclude = ["README.md"]

[dependencies]
argh = "0.1"
base64 = "0.21"
constants = { path = "../../constants", version = "0.1" }
log = "0.4"
serde = { version = "1.0", features = ["derive"] }
simplelog = "0.12"
snafu = "0.8"
toml = "0.8"
x509-parser = "0.16"

[dependencies.bottlerocket-modeled-types]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.2.0"
version = "0.2.0"
argh.workspace = true
base64.workspace = true
constants.workspace = true
log.workspace = true
serde = { workspace = true, features = ["derive"] }
simplelog.workspace = true
snafu.workspace = true
toml.workspace = true
x509-parser.workspace = true
bottlerocket-modeled-types.workspace = true

[dev-dependencies]
tempfile = "3"
tempfile.workspace = true

[build-dependencies]
generate-readme = { version = "0.1", path = "../../generate-readme" }
generate-readme.workspace = true
20 changes: 8 additions & 12 deletions sources/api/corndog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,13 @@ build = "build.rs"
exclude = ["README.md"]

[dependencies]
log = "0.4"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1"
simplelog = "0.12"
snafu = "0.8"
toml = "0.8"

[dependencies.bottlerocket-modeled-types]
git = "https://github.com/bottlerocket-os/bottlerocket-settings-sdk"
tag = "bottlerocket-settings-models-v0.2.0"
version = "0.2.0"
log.workspace = true
serde = { workspace = true, features = ["derive"] }
serde_json.workspace = true
simplelog.workspace = true
snafu.workspace = true
toml.workspace = true
bottlerocket-modeled-types.workspace = true

[build-dependencies]
generate-readme = { version = "0.1", path = "../../generate-readme" }
generate-readme.workspace = true
Loading