Skip to content

Commit 53d9531

Browse files
committed
crate embucketd
1 parent e153f42 commit 53d9531

File tree

12 files changed

+235
-782
lines changed

12 files changed

+235
-782
lines changed

Cargo.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,13 @@ indexmap = "2.7.1"
3838
time = "0.3.37"
3939
tower-sessions = { version = "0.14.0" }
4040
url = "2.5"
41+
tower-http = { version = "0.6.1", features = [
42+
"catch-panic",
43+
"timeout",
44+
"sensitive-headers",
45+
"cors",
46+
"trace",
47+
] }
4148
tokio = { version = "1", features = ["full"] }
4249
async-trait = { version = "0.1.84" }
4350
serde = { version = "1.0", features = ["derive"] }

bin/bucketd/build.rs

Lines changed: 0 additions & 43 deletions
This file was deleted.

bin/bucketd/src/main.rs

Lines changed: 0 additions & 83 deletions
This file was deleted.

crates/api-ui/Cargo.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,7 @@ snafu = { workspace = true }
2424
tar = { workspace = true }
2525
tokio = { workspace = true }
2626
tracing = { workspace = true }
27-
tower-http = { version = "0.6.1", features = [
28-
"catch-panic",
29-
"timeout",
30-
"sensitive-headers",
31-
"cors",
32-
"trace",
33-
] }
27+
tower-http = { workspace = true }
3428
tower-sessions = { workspace = true }
3529
time = { workspace = true }
3630
utoipa = { workspace = true }

crates/api-ui/src/tests/schemas.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,7 @@ async fn test_ui_schemas() {
6666
)
6767
.await
6868
.unwrap();
69-
// assert_eq!(http::StatusCode::OK, res.clone().status());
70-
println!("res: {:#?}", res.bytes().await.unwrap());
69+
assert_eq!(http::StatusCode::OK, res.status());
7170

7271
let schema_name = "testing2".to_string();
7372
let payload2 = SchemaCreatePayload {

crates/embucketd/Cargo.toml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,29 @@ edition = "2024"
55
license-file.workspace = true
66

77
[dependencies]
8+
core-executor = { path = "../core-executor" }
9+
core-metastore = { path = "../core-metastore" }
10+
core-utils = { path = "../core-utils" }
11+
core-history = { path = "../core-history" }
12+
api-ui = { path = "../api-ui" }
13+
api-sessions = { path = "../api-sessions" }
14+
api-snowflake-rest = { path = "../api-snowflake-rest" }
15+
api-iceberg-rest = { path = "../api-iceberg-rest" }
16+
api-internal-rest = { path = "../api-internal-rest" }
17+
18+
axum = { workspace = true }
19+
clap = { version = "4.5.27", features = ["env", "derive"] }
20+
dotenv = "0.15.0"
21+
object_store = { workspace = true }
22+
tracing = { workspace = true }
23+
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
24+
snmalloc-rs = { workspace = true }
25+
time = { workspace = true }
26+
tower = { workspace = true }
27+
tokio = { workspace = true }
28+
slatedb = { workspace = true }
29+
tower-sessions = { workspace = true }
30+
tower-http = { workspace = true }
831

932
[lints]
1033
workspace = true

bin/bucketd/src/cli.rs renamed to crates/embucketd/src/cli.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use clap::{Parser, ValueEnum};
22
use object_store::{
3-
aws::AmazonS3Builder, aws::S3ConditionalPut, local::LocalFileSystem, memory::InMemory,
4-
ObjectStore, Result as ObjectStoreResult,
3+
ObjectStore, Result as ObjectStoreResult, aws::AmazonS3Builder, aws::S3ConditionalPut,
4+
local::LocalFileSystem, memory::InMemory,
55
};
66
use std::fs;
77
use std::path::PathBuf;
@@ -213,7 +213,9 @@ impl CliOpts {
213213

214214
// method resets a secret env
215215
pub fn jwt_secret(&self) -> String {
216-
std::env::remove_var("JWT_SECRET");
216+
unsafe {
217+
std::env::remove_var("JWT_SECRET");
218+
}
217219
self.jwt_secret.clone().unwrap_or_default()
218220
}
219221
}

0 commit comments

Comments
 (0)