From f4d28547682176ee9f26198d1e9586b75e991fe9 Mon Sep 17 00:00:00 2001 From: Lann Martin Date: Wed, 28 Aug 2024 09:48:40 -0400 Subject: [PATCH] Add taplo.toml and format tomls Signed-off-by: Lann Martin --- .cargo/config.toml | 8 +++--- Cargo.toml | 28 +++++++++---------- Cross.toml | 8 +++--- crates/build/Cargo.toml | 6 ++-- crates/common/Cargo.toml | 2 +- crates/componentize/Cargo.toml | 12 ++++---- crates/compose/Cargo.toml | 4 +-- crates/compose/deny-all/Cargo.toml | 2 +- crates/core/Cargo.toml | 4 +-- crates/expressions/Cargo.toml | 4 +-- crates/factor-key-value/Cargo.toml | 6 ++-- crates/factor-llm/Cargo.toml | 2 +- crates/factor-outbound-mqtt/Cargo.toml | 2 +- crates/factor-outbound-mysql/Cargo.toml | 4 +-- crates/factor-outbound-networking/Cargo.toml | 2 +- crates/factor-outbound-redis/Cargo.toml | 8 +++--- crates/factor-sqlite/Cargo.toml | 12 ++++---- crates/factor-variables/Cargo.toml | 2 +- crates/http/Cargo.toml | 6 ++-- crates/key-value-azure/Cargo.toml | 4 +-- crates/key-value-redis/Cargo.toml | 4 +-- crates/key-value-sqlite/Cargo.toml | 6 ++-- crates/key-value/Cargo.toml | 4 +-- crates/llm-local/Cargo.toml | 4 +-- crates/llm-remote-http/Cargo.toml | 2 +- crates/loader/Cargo.toml | 4 +-- crates/locked-app/Cargo.toml | 2 +- crates/manifest/Cargo.toml | 2 +- crates/oci/Cargo.toml | 2 +- crates/outbound-networking/Cargo.toml | 2 +- crates/plugins/Cargo.toml | 2 +- crates/runtime-config/Cargo.toml | 8 +++--- crates/serde/Cargo.toml | 2 +- crates/sqlite-inproc/Cargo.toml | 8 +++--- crates/sqlite-libsql/Cargo.toml | 4 +-- crates/sqlite/Cargo.toml | 2 +- crates/telemetry/Cargo.toml | 10 +++---- crates/terminal/Cargo.toml | 4 +-- crates/trigger-http/Cargo.toml | 4 +-- crates/trigger-redis/Cargo.toml | 4 +-- crates/trigger/Cargo.toml | 10 +++---- crates/ui-testing/Cargo.toml | 2 +- examples/spin-wagi-http/http-rust/Cargo.toml | 2 +- examples/vault-variable-test/Cargo.toml | 2 +- .../vault-variable-test/runtime_config.toml | 2 +- examples/wagi-http-rust/Cargo.toml | 2 +- examples/wagi-http-rust/spin.toml | 2 +- taplo.toml | 15 ++++++++++ 48 files changed, 129 insertions(+), 114 deletions(-) create mode 100644 taplo.toml diff --git a/.cargo/config.toml b/.cargo/config.toml index c390ab08e..00b96c3e8 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,11 +1,11 @@ [net] - git-fetch-with-cli = true +git-fetch-with-cli = true [target.aarch64-unknown-linux-gnu] - rustflags = ["-C", "target-feature=+fp16"] +rustflags = ["-C", "target-feature=+fp16"] [target.aarch64-unknown-linux-musl] - rustflags = ["-C", "target-feature=+fp16", "-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"] +rustflags = ["-C", "target-feature=+fp16", "-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"] [target.x86_64-unknown-linux-musl] - rustflags = ["-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"] +rustflags = ["-C", "target-feature=+crt-static", "-C", "link-self-contained=yes"] diff --git a/Cargo.toml b/Cargo.toml index c32cfc09c..171d57d3d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,8 +21,8 @@ bytes = "1.1" chrono = "0.4" clap = { version = "3.2.24", features = ["derive", "env"] } clearscreen = "2.0.1" -command-group = "2.1" comfy-table = "5.0" +command-group = "2.1" ctrlc = { version = "3.2", features = ["termination"] } dialoguer = "0.10" dirs = "4.0" @@ -35,8 +35,6 @@ itertools = "0.11.0" lazy_static = "1.4.0" levenshtein = "1.0.5" nix = { version = "0.24", features = ["signal"] } -spin-key-value = { path = "crates/key-value" } -spin-key-value-sqlite = { path = "crates/key-value-sqlite" } path-absolutize = "3.0.11" rand = "0.8" regex = "1.5.5" @@ -46,13 +44,14 @@ semver = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0.82" sha2 = "0.10.2" -terminal = { path = "crates/terminal" } spin-app = { path = "crates/app" } spin-build = { path = "crates/build" } spin-common = { path = "crates/common" } spin-doctor = { path = "crates/doctor" } spin-expressions = { path = "crates/expressions" } spin-http = { path = "crates/http" } +spin-key-value = { path = "crates/key-value" } +spin-key-value-sqlite = { path = "crates/key-value-sqlite" } spin-loader = { path = "crates/loader" } spin-locked-app = { path = "crates/locked-app" } spin-manifest = { path = "crates/manifest" } @@ -65,7 +64,9 @@ spin-templates = { path = "crates/templates" } spin-trigger = { path = "crates/trigger" } spin-trigger-http = { path = "crates/trigger-http" } spin-trigger-redis = { path = "crates/trigger-redis" } +terminal = { path = "crates/terminal" } +subprocess = "0.2.9" tempfile = "3.8.0" tokio = { version = "1.23", features = ["full"] } toml = "0.6" @@ -75,7 +76,6 @@ uuid = { version = "^1.0", features = ["v4"] } wasmtime = { workspace = true } watchexec = { git = "https://github.com/watchexec/watchexec.git", rev = "8e91d26ef6400c1e60b32a8314cbb144fa33f288" } watchexec-filterer-globset = { git = "https://github.com/watchexec/watchexec.git", rev = "8e91d26ef6400c1e60b32a8314cbb144fa33f288" } -subprocess = "0.2.9" [target.'cfg(target_os = "linux")'.dependencies] # This needs to be an explicit dependency to enable @@ -84,20 +84,20 @@ openssl = { version = "0.10" } [dev-dependencies] anyhow = { workspace = true, features = ["backtrace"] } +conformance = { path = "tests/conformance-tests" } +conformance-tests = { workspace = true } hex = "0.4.3" -hyper = { workspace = true } -sha2 = "0.10.1" -which = "4.2.5" http-body-util = { workspace = true } -testing-framework = { path = "tests/testing-framework" } +hyper = { workspace = true } hyper-util = { version = "0.1.2", features = ["tokio"] } redis = "0.24" runtime-tests = { path = "tests/runtime-tests" } -test-components = { path = "tests/test-components" } +sha2 = "0.10.1" test-codegen-macro = { path = "crates/test-codegen-macro" } +test-components = { path = "tests/test-components" } test-environment = { workspace = true } -conformance-tests = { workspace = true } -conformance = { path = "tests/conformance-tests" } +testing-framework = { path = "tests/testing-framework" } +which = "4.2.5" [build-dependencies] cargo-target-dep = { git = "https://github.com/fermyon/cargo-target-dep", rev = "482f269eceb7b1a7e8fc618bf8c082dd24979cf1" } @@ -127,12 +127,12 @@ members = [ [workspace.dependencies] anyhow = "1.0.75" +conformance-tests = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" } http-body-util = "0.1.0" hyper = { version = "1.0.0", features = ["full"] } reqwest = { version = "0.12", features = ["stream", "blocking"] } -tracing = { version = "0.1", features = ["log"] } -conformance-tests = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" } test-environment = { git = "https://github.com/fermyon/conformance-tests", rev = "387b7f375df59e6254a7c29cf4a53507a9f46d32" } +tracing = { version = "0.1", features = ["log"] } wasi-common-preview1 = { version = "22.0.0", package = "wasi-common", features = [ "tokio", diff --git a/Cross.toml b/Cross.toml index b8b2392ec..84ffc5fbd 100644 --- a/Cross.toml +++ b/Cross.toml @@ -1,9 +1,9 @@ [build] - default-target = "x86_64-unknown-linux-musl" +default-target = "x86_64-unknown-linux-musl" [build.env] - passthrough = [ "BUILD_SPIN_EXAMPLES", "RUSTFLAGS", ] +passthrough = ["BUILD_SPIN_EXAMPLES", "RUSTFLAGS"] [target.aarch64-unknown-linux-musl] - dockerfile.file = "./cross/Dockerfile" - dockerfile.context = "./cross/" \ No newline at end of file +dockerfile.file = "./cross/Dockerfile" +dockerfile.context = "./cross/" diff --git a/crates/build/Cargo.toml b/crates/build/Cargo.toml index b48418ad1..5b3f00c47 100644 --- a/crates/build/Cargo.toml +++ b/crates/build/Cargo.toml @@ -7,11 +7,11 @@ edition = { workspace = true } [dependencies] anyhow = "1.0.57" futures = "0.3.21" -serde = { version = "1.0", features = [ "derive" ] } +serde = { version = "1.0", features = ["derive"] } spin-common = { path = "../common" } spin-manifest = { path = "../manifest" } -terminal = { path = "../terminal" } subprocess = "0.2.8" -tokio = { version = "1.23", features = [ "full" ] } +terminal = { path = "../terminal" } +tokio = { version = "1.23", features = ["full"] } toml = "0.5" tracing = { workspace = true } diff --git a/crates/common/Cargo.toml b/crates/common/Cargo.toml index fb60b1f4d..2471b4eae 100644 --- a/crates/common/Cargo.toml +++ b/crates/common/Cargo.toml @@ -10,4 +10,4 @@ dirs = "5.0.1" sha2 = "0.10" tempfile = "3.5" tokio = { version = "1", features = ["rt", "time"] } -url = "2" \ No newline at end of file +url = "2" diff --git a/crates/componentize/Cargo.toml b/crates/componentize/Cargo.toml index 1f62620f1..e9a17de0b 100644 --- a/crates/componentize/Cargo.toml +++ b/crates/componentize/Cargo.toml @@ -11,23 +11,23 @@ rust-version.workspace = true [dependencies] anyhow = { workspace = true } tracing = "0.1" -wasmparser = "0.200.0" wasm-encoder = "0.200.0" wasm-metadata = "0.200.0" +wasmparser = "0.200.0" wit-component = "0.200.0" wit-parser = "0.200.0" [dev-dependencies] -wasmtime = { workspace = true } -wasmtime-wasi = { workspace = true } -tokio = { version = "1.36.0", features = ["macros", "rt", "fs"] } async-trait = "0.1.77" cap-std = "2.0.1" rand = "0.8.5" rand_chacha = "0.3.1" rand_core = "0.6.4" serde = { version = "1.0.197", features = ["derive"] } +serde_json = "1.0" tempfile = "3.10.0" +tokio = { version = "1.36.0", features = ["macros", "rt", "fs"] } toml = "0.8.10" -serde_json = "1.0" -wat = "1.200.0" \ No newline at end of file +wasmtime = { workspace = true } +wasmtime-wasi = { workspace = true } +wat = "1.200.0" diff --git a/crates/compose/Cargo.toml b/crates/compose/Cargo.toml index f6d9a7b83..a10102cba 100644 --- a/crates/compose/Cargo.toml +++ b/crates/compose/Cargo.toml @@ -12,10 +12,10 @@ rust-version.workspace = true anyhow = { workspace = true } async-trait = "0.1" indexmap = "2.2.6" +semver = "1" spin-app = { path = "../app" } -spin-serde = { path = "../serde" } spin-componentize = { workspace = true } -semver = "1" +spin-serde = { path = "../serde" } thiserror = "1" tokio = { version = "1.23", features = ["fs"] } wac-graph = "0.5.0" diff --git a/crates/compose/deny-all/Cargo.toml b/crates/compose/deny-all/Cargo.toml index 931bc4d5f..a3199be82 100644 --- a/crates/compose/deny-all/Cargo.toml +++ b/crates/compose/deny-all/Cargo.toml @@ -31,4 +31,4 @@ world = "deny-all" "wasi:cli" = { path = "wit/deps/wasi/cli.wasm" } "wasi:io" = { path = "wit/deps/wasi/io.wasm" } -[workspace] \ No newline at end of file +[workspace] diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 53ab5f387..50fc6f1e5 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -13,9 +13,9 @@ wasmtime = { workspace = true } [dev-dependencies] serde_json = "1" spin-componentize = { workspace = true } -tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] } spin-factor-wasi = { path = "../factor-wasi" } spin-factors = { path = "../factors" } spin-factors-test = { path = "../factors-test" } spin-locked-app = { path = "../locked-app" } -wasmtime-wasi = { workspace = true } \ No newline at end of file +tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] } +wasmtime-wasi = { workspace = true } diff --git a/crates/expressions/Cargo.toml b/crates/expressions/Cargo.toml index c1129b703..342591b17 100644 --- a/crates/expressions/Cargo.toml +++ b/crates/expressions/Cargo.toml @@ -9,10 +9,10 @@ anyhow = "1.0" async-trait = "0.1" dotenvy = "0.15" once_cell = "1" +serde = "1.0.188" spin-locked-app = { path = "../locked-app" } thiserror = "1" -serde = "1.0.188" [dev-dependencies] -toml = "0.5" tokio = { version = "1", features = ["macros", "rt-multi-thread"] } +toml = "0.5" diff --git a/crates/factor-key-value/Cargo.toml b/crates/factor-key-value/Cargo.toml index 64df40352..9efd51b70 100644 --- a/crates/factor-key-value/Cargo.toml +++ b/crates/factor-key-value/Cargo.toml @@ -14,11 +14,11 @@ spin-world = { path = "../world" } toml = "0.8" [dev-dependencies] -spin-factors-test = { path = "../factors-test" } -tokio = { version = "1", features = ["macros", "rt"] } -spin-factor-key-value-spin = { path = "../factor-key-value-spin" } spin-factor-key-value-redis = { path = "../factor-key-value-redis" } +spin-factor-key-value-spin = { path = "../factor-key-value-spin" } +spin-factors-test = { path = "../factors-test" } tempfile = "3.12.0" +tokio = { version = "1", features = ["macros", "rt"] } [lints] diff --git a/crates/factor-llm/Cargo.toml b/crates/factor-llm/Cargo.toml index b7f0e4107..5989e1ad6 100644 --- a/crates/factor-llm/Cargo.toml +++ b/crates/factor-llm/Cargo.toml @@ -22,9 +22,9 @@ spin-llm-local = { path = "../llm-local", optional = true } spin-llm-remote-http = { path = "../llm-remote-http" } spin-locked-app = { path = "../locked-app" } spin-world = { path = "../world" } -tracing = { workspace = true } tokio = { version = "1", features = ["sync"] } toml = "0.8" +tracing = { workspace = true } url = { version = "2", features = ["serde"] } [dev-dependencies] diff --git a/crates/factor-outbound-mqtt/Cargo.toml b/crates/factor-outbound-mqtt/Cargo.toml index 95d7dce53..d9dfa04f8 100644 --- a/crates/factor-outbound-mqtt/Cargo.toml +++ b/crates/factor-outbound-mqtt/Cargo.toml @@ -7,9 +7,9 @@ edition = { workspace = true } [dependencies] anyhow = "1.0" rumqttc = { version = "0.24", features = ["url"] } +spin-core = { path = "../core" } spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-factors = { path = "../factors" } -spin-core = { path = "../core" } spin-world = { path = "../world" } table = { path = "../table" } tokio = { version = "1.0", features = ["sync"] } diff --git a/crates/factor-outbound-mysql/Cargo.toml b/crates/factor-outbound-mysql/Cargo.toml index da9324eab..083807cf1 100644 --- a/crates/factor-outbound-mysql/Cargo.toml +++ b/crates/factor-outbound-mysql/Cargo.toml @@ -12,7 +12,7 @@ anyhow = "1.0" flate2 = "1.0.17" # Removing default features for mysql_async to remove flate2/zlib feature mysql_async = { version = "0.33.0", default-features = false, features = [ - "native-tls-tls", + "native-tls-tls", ] } # Removing default features for mysql_common to remove flate2/zlib feature mysql_common = { version = "0.31.0", default-features = false } @@ -20,7 +20,7 @@ spin-app = { path = "../app" } spin-core = { path = "../core" } spin-expressions = { path = "../expressions" } spin-factor-outbound-networking = { path = "../factor-outbound-networking" } -spin-factors = { path = "../factors"} +spin-factors = { path = "../factors" } spin-outbound-networking = { path = "../outbound-networking" } spin-world = { path = "../world" } table = { path = "../table" } diff --git a/crates/factor-outbound-networking/Cargo.toml b/crates/factor-outbound-networking/Cargo.toml index 03fd55e4c..66e1d054f 100644 --- a/crates/factor-outbound-networking/Cargo.toml +++ b/crates/factor-outbound-networking/Cargo.toml @@ -33,7 +33,7 @@ wasmtime-wasi = { workspace = true } default = ["spin-cli"] # Includes the runtime configuration handling used by the Spin CLI spin-cli = [ - "dep:rustls-pemfile", + "dep:rustls-pemfile", ] [lints] workspace = true diff --git a/crates/factor-outbound-redis/Cargo.toml b/crates/factor-outbound-redis/Cargo.toml index 0dffe6ea4..b46a273bc 100644 --- a/crates/factor-outbound-redis/Cargo.toml +++ b/crates/factor-outbound-redis/Cargo.toml @@ -6,19 +6,19 @@ edition = { workspace = true } [dependencies] anyhow = "1.0" +redis = { version = "0.21", features = ["tokio-comp", "tokio-native-tls-comp", "aio"] } +spin-core = { path = "../core" } spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-factors = { path = "../factors" } -spin-core = { path = "../core" } spin-world = { path = "../world" } -tracing = { workspace = true } table = { path = "../table" } -redis = { version = "0.21", features = ["tokio-comp", "tokio-native-tls-comp", "aio"] } +tracing = { workspace = true } [dev-dependencies] +spin-factor-variables = { path = "../factor-variables" } spin-factors-test = { path = "../factors-test" } tokio = { version = "1", features = ["macros", "rt"] } -spin-factor-variables = { path = "../factor-variables" } # wasmtime-wasi-http = { workspace = true } [lints] diff --git a/crates/factor-sqlite/Cargo.toml b/crates/factor-sqlite/Cargo.toml index 3b45dcf3c..4919a7305 100644 --- a/crates/factor-sqlite/Cargo.toml +++ b/crates/factor-sqlite/Cargo.toml @@ -13,13 +13,13 @@ async-trait = "0.1" serde = { version = "1.0", features = ["rc"] } spin-factors = { path = "../factors" } spin-locked-app = { path = "../locked-app" } +spin-sqlite = { path = "../sqlite", optional = true } +spin-sqlite-inproc = { path = "../sqlite-inproc", optional = true } +spin-sqlite-libsql = { path = "../sqlite-libsql", optional = true } spin-world = { path = "../world" } table = { path = "../table" } tokio = "1" toml = "0.8" -spin-sqlite = { path = "../sqlite", optional = true } -spin-sqlite-inproc = { path = "../sqlite-inproc", optional = true } -spin-sqlite-libsql = { path = "../sqlite-libsql", optional = true } [dev-dependencies] spin-factors-test = { path = "../factors-test" } @@ -29,9 +29,9 @@ tokio = { version = "1", features = ["macros", "rt"] } default = ["spin-cli"] # Includes the runtime configuration handling used by the Spin CLI spin-cli = [ - "dep:spin-sqlite", - "dep:spin-sqlite-inproc", - "dep:spin-sqlite-libsql", + "dep:spin-sqlite", + "dep:spin-sqlite-inproc", + "dep:spin-sqlite-libsql", ] [lints] diff --git a/crates/factor-variables/Cargo.toml b/crates/factor-variables/Cargo.toml index 60e0f507b..0cf4ab089 100644 --- a/crates/factor-variables/Cargo.toml +++ b/crates/factor-variables/Cargo.toml @@ -5,9 +5,9 @@ authors = { workspace = true } edition = { workspace = true } [dependencies] -azure_security_keyvault = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" } azure_core = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" } azure_identity = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" } +azure_security_keyvault = { git = "https://github.com/azure/azure-sdk-for-rust", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" } dotenvy = "0.15" serde = { version = "1.0", features = ["rc"] } spin-expressions = { path = "../expressions" } diff --git a/crates/http/Cargo.toml b/crates/http/Cargo.toml index 4c993a13f..60b58f03f 100644 --- a/crates/http/Cargo.toml +++ b/crates/http/Cargo.toml @@ -7,16 +7,16 @@ edition = { workspace = true } [dependencies] anyhow = "1.0" http = "1.0.0" -hyper = { workspace = true } http-body-util = { workspace = true } -wasmtime-wasi-http = { workspace = true, optional = true } +hyper = { workspace = true } indexmap = "1" percent-encoding = "2" routefinder = "0.5.4" serde = { version = "1.0", features = ["derive"] } -tracing = { workspace = true } spin-app = { path = "../app", optional = true } spin-locked-app = { path = "../locked-app" } +tracing = { workspace = true } +wasmtime-wasi-http = { workspace = true, optional = true } [dev-dependencies] toml = "0.8.2" diff --git a/crates/key-value-azure/Cargo.toml b/crates/key-value-azure/Cargo.toml index fc119f574..13804c3b2 100644 --- a/crates/key-value-azure/Cargo.toml +++ b/crates/key-value-azure/Cargo.toml @@ -10,11 +10,11 @@ azure_data_cosmos = { git = "https://github.com/azure/azure-sdk-for-rust.git", r azure_identity = { git = "https://github.com/azure/azure-sdk-for-rust.git", rev = "8c4caa251c3903d5eae848b41bb1d02a4d65231c" } futures = "0.3.28" serde = { version = "1.0", features = ["derive"] } -spin-key-value = { path = "../key-value" } spin-core = { path = "../core" } +spin-key-value = { path = "../key-value" } tokio = "1" -url = "2" tracing = { workspace = true } +url = "2" [lints] workspace = true diff --git a/crates/key-value-redis/Cargo.toml b/crates/key-value-redis/Cargo.toml index 119d4dd2e..baf71731f 100644 --- a/crates/key-value-redis/Cargo.toml +++ b/crates/key-value-redis/Cargo.toml @@ -7,12 +7,12 @@ edition = { workspace = true } [dependencies] anyhow = "1" redis = { version = "0.21", features = ["tokio-comp", "tokio-native-tls-comp"] } -spin-key-value = { path = "../key-value" } spin-core = { path = "../core" } +spin-key-value = { path = "../key-value" } spin-world = { path = "../world" } tokio = "1" -url = "2" tracing = { workspace = true } +url = "2" [lints] workspace = true diff --git a/crates/key-value-sqlite/Cargo.toml b/crates/key-value-sqlite/Cargo.toml index eed418a9c..63f51862d 100644 --- a/crates/key-value-sqlite/Cargo.toml +++ b/crates/key-value-sqlite/Cargo.toml @@ -7,11 +7,11 @@ edition = { workspace = true } [dependencies] anyhow = "1" once_cell = "1" -rusqlite = { version = "0.29.0", features = [ "bundled" ] } -tokio = "1" -spin-key-value = { path = "../key-value" } +rusqlite = { version = "0.29.0", features = ["bundled"] } spin-core = { path = "../core" } +spin-key-value = { path = "../key-value" } spin-world = { path = "../world" } +tokio = "1" tracing = { workspace = true } [lints] diff --git a/crates/key-value/Cargo.toml b/crates/key-value/Cargo.toml index e5b53aec5..0d13e95c7 100644 --- a/crates/key-value/Cargo.toml +++ b/crates/key-value/Cargo.toml @@ -9,10 +9,10 @@ doctest = false [dependencies] anyhow = "1.0" -tokio = { version = "1", features = ["macros", "sync", "rt"] } +lru = "0.9.0" spin-app = { path = "../app" } spin-core = { path = "../core" } spin-world = { path = "../world" } table = { path = "../table" } +tokio = { version = "1", features = ["macros", "sync", "rt"] } tracing = { workspace = true } -lru = "0.9.0" diff --git a/crates/llm-local/Cargo.toml b/crates/llm-local/Cargo.toml index 5b7331642..9e559d76a 100644 --- a/crates/llm-local/Cargo.toml +++ b/crates/llm-local/Cargo.toml @@ -10,8 +10,8 @@ candle = { git = "https://github.com/huggingface/candle", rev = "b80348d22f8f0da candle-nn = { git = "https://github.com/huggingface/candle", rev = "b80348d22f8f0dadb6cc4101bde031d5de69a9a5" } chrono = "0.4.26" llm = { git = "https://github.com/rustformers/llm", rev = "2f6ffd4435799ceaa1d1bcb5a8790e5b3e0c5663", features = [ - "tokenizers-remote", - "llama", + "tokenizers-remote", + "llama", ], default-features = false } lru = "0.9.0" num_cpus = "1" diff --git a/crates/llm-remote-http/Cargo.toml b/crates/llm-remote-http/Cargo.toml index af05459e5..c0fa4b478 100644 --- a/crates/llm-remote-http/Cargo.toml +++ b/crates/llm-remote-http/Cargo.toml @@ -7,11 +7,11 @@ edition = { workspace = true } [dependencies] anyhow = "1.0" http = "0.2" +reqwest = { version = "0.11", features = ["gzip", "json"] } serde = { version = "1.0.150", features = ["derive"] } serde_json = "1.0" spin-telemetry = { path = "../telemetry" } spin-world = { path = "../world" } -reqwest = { version = "0.11", features = ["gzip", "json"] } tracing = { workspace = true } [lints] diff --git a/crates/loader/Cargo.toml b/crates/loader/Cargo.toml index 2b49dca9c..c56899882 100644 --- a/crates/loader/Cargo.toml +++ b/crates/loader/Cargo.toml @@ -16,7 +16,6 @@ indexmap = { version = "1" } itertools = "0.10.3" lazy_static = "1.4.0" mime_guess = { version = "2.0" } -spin-outbound-networking = { path = "../outbound-networking" } path-absolutize = { version = "3.0.11", features = ["use_unix_paths_on_wasm"] } regex = "1.5.4" reqwest = "0.11.9" @@ -25,9 +24,10 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" sha2 = "0.10.8" shellexpand = "3.1" -spin-locked-app = { path = "../locked-app" } spin-common = { path = "../common" } +spin-locked-app = { path = "../locked-app" } spin-manifest = { path = "../manifest" } +spin-outbound-networking = { path = "../outbound-networking" } spin-serde = { path = "../serde" } tempfile = "3.8.0" terminal = { path = "../terminal" } diff --git a/crates/locked-app/Cargo.toml b/crates/locked-app/Cargo.toml index cc4d7ae6e..d0531c52a 100644 --- a/crates/locked-app/Cargo.toml +++ b/crates/locked-app/Cargo.toml @@ -10,4 +10,4 @@ async-trait = "0.1" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" spin-serde = { path = "../serde" } -thiserror = "1.0" \ No newline at end of file +thiserror = "1.0" diff --git a/crates/manifest/Cargo.toml b/crates/manifest/Cargo.toml index 8ae06ffed..dc18ef8ab 100644 --- a/crates/manifest/Cargo.toml +++ b/crates/manifest/Cargo.toml @@ -10,8 +10,8 @@ indexmap = { version = "1", features = ["serde"] } semver = { version = "1.0", features = ["serde"] } serde = { version = "1.0", features = ["derive"] } spin-serde = { path = "../serde" } -thiserror = "1" terminal = { path = "../terminal" } +thiserror = "1" toml = { version = "0.8.0", features = ["preserve_order"] } url = "2.4.1" wasm-pkg-common = "0.4.1" diff --git a/crates/oci/Cargo.toml b/crates/oci/Cargo.toml index 92ac7ae6e..2077b3e87 100644 --- a/crates/oci/Cargo.toml +++ b/crates/oci/Cargo.toml @@ -13,9 +13,9 @@ base64 = "0.21" chrono = "0.4" # Fork with updated auth to support ACR login # Ref https://github.com/camallo/dkregistry-rs/pull/263 +dirs = "4.0" dkregistry = { git = "https://github.com/fermyon/dkregistry-rs", rev = "161cf2b66996ed97c7abaf046e38244484814de3" } docker_credential = "1.0" -dirs = "4.0" futures-util = "0.3" itertools = "0.12.1" oci-distribution = { git = "https://github.com/fermyon/oci-distribution", rev = "7e4ce9be9bcd22e78a28f06204931f10c44402ba" } diff --git a/crates/outbound-networking/Cargo.toml b/crates/outbound-networking/Cargo.toml index 0505f5f00..d630181eb 100644 --- a/crates/outbound-networking/Cargo.toml +++ b/crates/outbound-networking/Cargo.toml @@ -8,7 +8,7 @@ edition.workspace = true anyhow = "1.0" http = "1.0.0" ipnet = "2.9.0" -spin-expressions = { path = "../expressions" } +spin-expressions = { path = "../expressions" } spin-locked-app = { path = "../locked-app" } terminal = { path = "../terminal" } url = "2.4.1" diff --git a/crates/plugins/Cargo.toml b/crates/plugins/Cargo.toml index 896d6590e..165fc88ee 100644 --- a/crates/plugins/Cargo.toml +++ b/crates/plugins/Cargo.toml @@ -22,6 +22,6 @@ tar = "0.4.38" tempfile = "3.3.0" terminal = { path = "../terminal" } thiserror = "1" -tokio = { version = "1.23", features = [ "fs", "process", "rt", "macros" ] } +tokio = { version = "1.23", features = ["fs", "process", "rt", "macros"] } tracing = { workspace = true } url = { version = "2.2.2", features = ["serde"] } diff --git a/crates/runtime-config/Cargo.toml b/crates/runtime-config/Cargo.toml index 267dfdec7..9ca8e5e8d 100644 --- a/crates/runtime-config/Cargo.toml +++ b/crates/runtime-config/Cargo.toml @@ -10,21 +10,21 @@ rust-version.workspace = true [dependencies] anyhow = { workspace = true } -spin-factors = { path = "../factors" } spin-factor-key-value = { path = "../factor-key-value" } -spin-factor-key-value-spin = { path = "../factor-key-value-spin" } -spin-factor-key-value-redis = { path = "../factor-key-value-redis" } spin-factor-key-value-azure = { path = "../factor-key-value-azure" } +spin-factor-key-value-redis = { path = "../factor-key-value-redis" } +spin-factor-key-value-spin = { path = "../factor-key-value-spin" } spin-factor-llm = { path = "../factor-llm" } spin-factor-outbound-http = { path = "../factor-outbound-http" } spin-factor-outbound-mqtt = { path = "../factor-outbound-mqtt" } +spin-factor-outbound-mysql = { path = "../factor-outbound-mysql" } spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-factor-outbound-pg = { path = "../factor-outbound-pg" } -spin-factor-outbound-mysql = { path = "../factor-outbound-mysql" } spin-factor-outbound-redis = { path = "../factor-outbound-redis" } spin-factor-sqlite = { path = "../factor-sqlite" } spin-factor-variables = { path = "../factor-variables" } spin-factor-wasi = { path = "../factor-wasi" } +spin-factors = { path = "../factors" } toml = "0.8" [lints] diff --git a/crates/serde/Cargo.toml b/crates/serde/Cargo.toml index cf7ad7b16..89f8a918b 100644 --- a/crates/serde/Cargo.toml +++ b/crates/serde/Cargo.toml @@ -9,4 +9,4 @@ anyhow = "1.0" base64 = "0.22.1" semver = { version = "1.0", features = ["serde"] } serde = "1.0.189" -wasm-pkg-common = "0.4.1" \ No newline at end of file +wasm-pkg-common = "0.4.1" diff --git a/crates/sqlite-inproc/Cargo.toml b/crates/sqlite-inproc/Cargo.toml index 874eafd3e..12fe8fc55 100644 --- a/crates/sqlite-inproc/Cargo.toml +++ b/crates/sqlite-inproc/Cargo.toml @@ -5,13 +5,13 @@ authors = { workspace = true } edition = { workspace = true } [dependencies] +anyhow = "1.0" async-trait = "0.1.68" +once_cell = "1" +rand = "0.8" +rusqlite = { version = "0.29.0", features = ["bundled"] } spin-sqlite = { path = "../sqlite" } spin-world = { path = "../world" } -anyhow = "1.0" -rusqlite = { version = "0.29.0", features = [ "bundled" ] } -rand = "0.8" -once_cell = "1" tokio = "1" tracing = { workspace = true } diff --git a/crates/sqlite-libsql/Cargo.toml b/crates/sqlite-libsql/Cargo.toml index d754418c9..0d2f27920 100644 --- a/crates/sqlite-libsql/Cargo.toml +++ b/crates/sqlite-libsql/Cargo.toml @@ -5,15 +5,15 @@ authors = { workspace = true } edition = { workspace = true } [dependencies] -async-trait = "0.1.68" anyhow = "1.0" +async-trait = "0.1.68" # We don't actually use rusqlite itself, but we'd like the same bundled # libsqlite3-sys as used by spin-sqlite-inproc. +libsql = { version = "0.3.2", features = ["remote"], default-features = false } rusqlite = { version = "0.29.0", features = ["bundled"] } spin-sqlite = { path = "../sqlite" } spin-world = { path = "../world" } sqlparser = "0.34" -libsql = { version = "0.3.2", features = ["remote"], default-features = false } tokio = { version = "1", features = ["full"] } tracing = { workspace = true } diff --git a/crates/sqlite/Cargo.toml b/crates/sqlite/Cargo.toml index 6a5b5e8b0..0cb7b12b4 100644 --- a/crates/sqlite/Cargo.toml +++ b/crates/sqlite/Cargo.toml @@ -7,8 +7,8 @@ edition = { workspace = true } [dependencies] anyhow = "1.0" async-trait = "0.1.68" -spin-core = { path = "../core" } spin-app = { path = "../app" } +spin-core = { path = "../core" } spin-world = { path = "../world" } table = { path = "../table" } tokio = "1" diff --git a/crates/telemetry/Cargo.toml b/crates/telemetry/Cargo.toml index 4e63a6e8f..095936d07 100644 --- a/crates/telemetry/Cargo.toml +++ b/crates/telemetry/Cargo.toml @@ -8,16 +8,16 @@ edition = { workspace = true } anyhow = { workspace = true } http0 = { version = "0.2.9", package = "http" } http1 = { version = "1.0.0", package = "http" } -opentelemetry = { version = "0.22.0", features = [ "metrics", "trace", "logs"] } -opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio", "logs_level_enabled"] } -opentelemetry-otlp = { version = "0.15.0", default-features=false, features = ["http-proto", "trace", "http", "reqwest-client", "metrics", "grpc-tonic", "logs"] } +opentelemetry = { version = "0.22.0", features = ["metrics", "trace", "logs"] } +opentelemetry-otlp = { version = "0.15.0", default-features = false, features = ["http-proto", "trace", "http", "reqwest-client", "metrics", "grpc-tonic", "logs"] } opentelemetry-semantic-conventions = "0.14.0" +opentelemetry_sdk = { version = "0.22.1", features = ["rt-tokio", "logs_level_enabled"] } +terminal = { path = "../terminal" } tracing = { version = "0.1.37", features = ["log"] } tracing-appender = "0.2.2" -tracing-opentelemetry = { version = "0.23.0", default-features = false, features = ["metrics"] } +tracing-opentelemetry = { version = "0.23.0", default-features = false, features = ["metrics"] } tracing-subscriber = { version = "0.3.17", default-features = false, features = ["smallvec", "fmt", "ansi", "std", "env-filter", "json", "registry"] } url = "2.2.2" -terminal = { path = "../terminal" } [features] tracing-log-compat = ["tracing-subscriber/tracing-log", "tracing-opentelemetry/tracing-log"] diff --git a/crates/terminal/Cargo.toml b/crates/terminal/Cargo.toml index d40dc8f7b..52f66dbe7 100644 --- a/crates/terminal/Cargo.toml +++ b/crates/terminal/Cargo.toml @@ -5,6 +5,6 @@ authors = { workspace = true } edition = { workspace = true } [dependencies] -termcolor = "1.2" -once_cell = "1.0" atty = "0.2" +once_cell = "1.0" +termcolor = "1.2" diff --git a/crates/trigger-http/Cargo.toml b/crates/trigger-http/Cargo.toml index 65030acc6..c273b1db2 100644 --- a/crates/trigger-http/Cargo.toml +++ b/crates/trigger-http/Cargo.toml @@ -19,9 +19,9 @@ clap = "3" futures = "0.3" futures-util = "0.3.8" http = "1.0.0" +http-body-util = { workspace = true } hyper = { workspace = true } hyper-util = { version = "0.1.2", features = ["tokio"] } -http-body-util = { workspace = true } indexmap = "1" percent-encoding = "2" rustls = { version = "0.22.4" } @@ -42,8 +42,8 @@ terminal = { path = "../terminal" } tls-listener = { version = "0.10.0", features = ["rustls"] } tokio = { version = "1.23", features = ["full"] } tokio-rustls = { version = "0.25.0" } -url = "2.4.1" tracing = { workspace = true } +url = "2.4.1" wasmtime = { workspace = true } wasmtime-wasi = { workspace = true } wasmtime-wasi-http = { workspace = true } diff --git a/crates/trigger-redis/Cargo.toml b/crates/trigger-redis/Cargo.toml index 0ace95427..f399afeb4 100644 --- a/crates/trigger-redis/Cargo.toml +++ b/crates/trigger-redis/Cargo.toml @@ -11,14 +11,14 @@ doctest = false anyhow = "1.0" async-trait = "0.1" futures = "0.3" +redis = { version = "0.26.1", features = ["tokio-comp"] } serde = "1.0.188" spin-factor-variables = { path = "../factor-variables" } spin-telemetry = { path = "../telemetry" } spin-trigger = { path = "../trigger" } spin-world = { path = "../world" } -redis = { version = "0.26.1", features = ["tokio-comp"] } -tracing = { workspace = true } tokio = { version = "1.39.3", features = ["macros", "rt"] } +tracing = { workspace = true } [lints] workspace = true diff --git a/crates/trigger/Cargo.toml b/crates/trigger/Cargo.toml index c8f6b5c8b..d022d1534 100644 --- a/crates/trigger/Cargo.toml +++ b/crates/trigger/Cargo.toml @@ -18,31 +18,31 @@ anyhow = "1" clap = { version = "3.1.18", features = ["derive", "env"] } ctrlc = { version = "3.2", features = ["termination"] } futures = "0.3" -spin-runtime-config = { path = "../runtime-config" } sanitize-filename = "0.5" serde = { version = "1", features = ["derive"] } serde_json = "1" spin-app = { path = "../app" } spin-common = { path = "../common" } -spin-compose = { path = "../compose" } spin-componentize = { path = "../componentize" } +spin-compose = { path = "../compose" } spin-core = { path = "../core" } spin-factor-key-value = { path = "../factor-key-value" } -spin-factor-outbound-http = { path = "../factor-outbound-http" } spin-factor-llm = { path = "../factor-llm" } +spin-factor-outbound-http = { path = "../factor-outbound-http" } spin-factor-outbound-mqtt = { path = "../factor-outbound-mqtt" } +spin-factor-outbound-mysql = { path = "../factor-outbound-mysql" } spin-factor-outbound-networking = { path = "../factor-outbound-networking" } spin-factor-outbound-pg = { path = "../factor-outbound-pg" } -spin-factor-outbound-mysql = { path = "../factor-outbound-mysql" } spin-factor-outbound-redis = { path = "../factor-outbound-redis" } spin-factor-sqlite = { path = "../factor-sqlite" } spin-factor-variables = { path = "../factor-variables" } spin-factor-wasi = { path = "../factor-wasi" } spin-factors = { path = "../factors" } spin-factors-executor = { path = "../factors-executor" } +spin-runtime-config = { path = "../runtime-config" } spin-telemetry = { path = "../telemetry" } -tokio = { version = "1.23", features = ["fs"] } terminal = { path = "../terminal" } +tokio = { version = "1.23", features = ["fs"] } tracing = { workspace = true } [lints] diff --git a/crates/ui-testing/Cargo.toml b/crates/ui-testing/Cargo.toml index ad0d9021b..ad2a7316a 100644 --- a/crates/ui-testing/Cargo.toml +++ b/crates/ui-testing/Cargo.toml @@ -9,4 +9,4 @@ anyhow = "1.0" dirs = "4.0" libtest-mimic = "0.6.1" snapbox = "0.4.12" -tokio = { version = "1", features = ["macros", "rt"] } \ No newline at end of file +tokio = { version = "1", features = ["macros", "rt"] } diff --git a/examples/spin-wagi-http/http-rust/Cargo.toml b/examples/spin-wagi-http/http-rust/Cargo.toml index 71644ebd0..b5fb3c8d3 100644 --- a/examples/spin-wagi-http/http-rust/Cargo.toml +++ b/examples/spin-wagi-http/http-rust/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2021" [lib] -crate-type = [ "cdylib" ] +crate-type = ["cdylib"] [dependencies] # Useful crate to handle errors. diff --git a/examples/vault-variable-test/Cargo.toml b/examples/vault-variable-test/Cargo.toml index 21c657581..d50a940b2 100644 --- a/examples/vault-variable-test/Cargo.toml +++ b/examples/vault-variable-test/Cargo.toml @@ -10,7 +10,7 @@ crate-type = ["cdylib"] [dependencies] anyhow = "1" -spin-sdk = "2.2.0" constant_time_eq = "0.3.0" +spin-sdk = "2.2.0" [workspace] diff --git a/examples/vault-variable-test/runtime_config.toml b/examples/vault-variable-test/runtime_config.toml index e8cb07657..002db0d7c 100644 --- a/examples/vault-variable-test/runtime_config.toml +++ b/examples/vault-variable-test/runtime_config.toml @@ -2,4 +2,4 @@ type = "vault" url = "http://127.0.0.1:8200" token = "root" -mount = "secret" \ No newline at end of file +mount = "secret" diff --git a/examples/wagi-http-rust/Cargo.toml b/examples/wagi-http-rust/Cargo.toml index 9e98c0368..4c5da453f 100644 --- a/examples/wagi-http-rust/Cargo.toml +++ b/examples/wagi-http-rust/Cargo.toml @@ -6,4 +6,4 @@ edition = "2021" [dependencies] miniserde = "0.1" -[workspace] \ No newline at end of file +[workspace] diff --git a/examples/wagi-http-rust/spin.toml b/examples/wagi-http-rust/spin.toml index c5d1a7821..bae10e49a 100644 --- a/examples/wagi-http-rust/spin.toml +++ b/examples/wagi-http-rust/spin.toml @@ -9,7 +9,7 @@ version = "1.0.0" [[trigger.http]] route = "/env" component = "env" -executor = { type = "wagi" } +executor = { type = "wagi" } [component.env] source = "target/wasm32-wasi/release/wagihelloworld.wasm" diff --git a/taplo.toml b/taplo.toml new file mode 100644 index 000000000..1cd2a08e2 --- /dev/null +++ b/taplo.toml @@ -0,0 +1,15 @@ +exclude = [ + ".git/**/*.toml", + "**/tests/**/*.toml", + "templates/**/*.toml", +] + +[formatting] +array_auto_collapse = false +array_auto_expand = false + +[[rule]] +include = ["Cargo.toml", "**/Cargo.toml"] +keys = ["dependencies", "workspace.dependencies", "dev-dependencies"] +[rule.formatting] +reorder_keys = true