Skip to content

Commit 6774f93

Browse files
gzgz
committed
Split rest-api from fda into separate crate.
Fixes #3872. Signed-off-by: Gerd Zellweger <mail@gerdzellweger.com>
1 parent 0340226 commit 6774f93

File tree

12 files changed

+99
-69
lines changed

12 files changed

+99
-69
lines changed

‎.github/workflows/ci-post-release.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ jobs:
4242
cargo set-version --bump ${{ vars.RELEASE_NEXT_VERSION }} -p feldera-types
4343
cargo set-version --bump ${{ vars.RELEASE_NEXT_VERSION }} -p feldera-storage
4444
cargo set-version --bump ${{ vars.RELEASE_NEXT_VERSION }} -p dbsp
45+
cargo set-version --bump ${{ vars.RELEASE_NEXT_VERSION }} -p feldera-rest-api
4546
cargo set-version --bump ${{ vars.RELEASE_NEXT_VERSION }} -p fda
4647
cargo set-version --bump ${{ vars.RELEASE_NEXT_VERSION }} -p pipeline-manager
4748
cargo set-version --bump ${{ vars.RELEASE_NEXT_VERSION }} -p feldera-sqllib
@@ -62,4 +63,4 @@ jobs:
6263
message: "ci: Prepare for v${{ env.NEXT_VERSION }}"
6364
author_name: feldera-ci
6465
author_email: feldera-ci-noreply@feldera.io
65-
push: origin main
66+
push: origin main

‎.github/workflows/publish-crates.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ jobs:
2828
run: |
2929
cargo publish ${{ vars.CARGO_PUBLISH_FLAGS }} --package feldera-types
3030
cargo publish ${{ vars.CARGO_PUBLISH_FLAGS }} --package feldera-storage
31+
cargo publish ${{ vars.CARGO_PUBLISH_FLAGS }} --package feldera-rest-api
3132
cargo publish ${{ vars.CARGO_PUBLISH_FLAGS }} --package dbsp
3233
cargo publish ${{ vars.CARGO_PUBLISH_FLAGS }} --package fda
3334
cargo publish ${{ vars.CARGO_PUBLISH_FLAGS }} --package feldera-sqllib
3435
env:
35-
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
36+
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}

‎Cargo.lock‎

Lines changed: 17 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ members = [
1212
"crates/datagen",
1313
"crates/iceberg",
1414
"crates/storage"
15-
]
15+
, "crates/rest-api"]
1616
exclude = [
1717
"sql-to-dbsp-compiler/temp",
1818
"sql-to-dbsp-compiler/experiments",
@@ -90,6 +90,7 @@ feldera-iceberg = { path = "crates/iceberg" }
9090
feldera-sqllib = { path = "crates/sqllib" }
9191
feldera-storage = { version = "0.45.0", path = "crates/storage" }
9292
feldera-types = { version = "0.45.0", path = "crates/feldera-types" }
93+
feldera-rest-api = { version = "0.45.0", path = "crates/rest-api" }
9394
flate2 = "1.1.0"
9495
form_urlencoded = "1.2.0"
9596
futures = "0.3.30"
@@ -233,4 +234,4 @@ datafusion-sql = { git = "https://github.com/ryzhyk/datafusion.git", rev = "f561
233234
release = false
234235

235236
[profile.bench]
236-
debug = true
237+
debug = true

‎crates/fda/Cargo.toml‎

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ clap = { workspace = true, features = ["color"] }
1515
clap_complete = { workspace = true, features = ["unstable-dynamic"] }
1616
progenitor-client = { workspace = true }
1717
reqwest = { workspace = true, features = ["json", "stream"] }
18-
serde = { workspace = true, features = ["derive"] }
1918
serde_json = { workspace = true }
20-
chrono = { workspace = true, features = ["serde"] }
21-
uuid = { workspace = true, features = ["serde", "v7"] }
2219
tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-std", "process"] }
2320
feldera-types = { workspace = true }
21+
feldera-rest-api = { workspace = true }
2422
env_logger = { workspace = true }
2523
tabled = { workspace = true, features = ["macros", "ansi"] }
2624
json_to_table = { workspace = true }
@@ -31,13 +29,4 @@ futures = { workspace = true }
3129
tokio-util = { workspace = true }
3230
tempfile = { workspace = true }
3331
rmpv = { workspace = true, features = ["with-serde"] }
34-
arrow = { workspace = true, features = ["ipc", "prettyprint"] }
35-
36-
[build-dependencies]
37-
prettyplease = { workspace = true }
38-
progenitor = { workspace = true }
39-
serde_json = { workspace = true }
40-
syn = { workspace = true }
41-
42-
[package.metadata.cargo-machete]
43-
ignored = ["progenitor-client", "chrono", "prettytable-rs", "serde", "serde_json", "uuid"]
32+
arrow = { workspace = true, features = ["ipc", "prettyprint"] }

‎crates/fda/src/cli.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use clap_complete::engine::{ArgValueCompleter, CompletionCandidate};
33
use std::fmt::Display;
44
use std::path::PathBuf;
55

6-
use crate::cd::types::{CompilationProfile, ProgramConfig};
76
use crate::make_client;
7+
use feldera_rest_api::types::{CompilationProfile, ProgramConfig};
88

99
/// Autocompletion for pipeline names by trying to fetch them from the server.
1010
fn pipeline_names(current: &std::ffi::OsStr) -> Vec<CompletionCandidate> {

0 commit comments

Comments
 (0)