Skip to content

Commit 213bc8b

Browse files
rakshith-ravirakshith-ravi
committed
Refactor Dockerfile and Cargo.toml to remove server_fn and reqwest dependencies; update response handling to use BrowserResponse
1 parent 07b1f7d commit 213bc8b

File tree

2 files changed

+89
-5
lines changed

2 files changed

+89
-5
lines changed

‎Cargo.toml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,105 +20,190 @@ missing_docs_in_private_items = "warn"
2020

2121
[workspace.dependencies]
2222
argon2 = { default-features = false, version = "0.5" }
23+
argon2 = { version = "0.5", default-features = false }
2324
axum = { default-features = false, version = "0.8" }
25+
axum = { version = "0.7", default-features = false }
2426
axum-extra = { default-features = false, version = "0.10" }
27+
axum-extra = { version = "0.9", default-features = false }
2528
axum-typed-websockets = { default-features = false, git = "https://github.com/morenol/axum-typed-websockets.git", branch = "patch-1" }
29+
axum-typed-websockets = { version = "0.6", default-features = false }
2630
base32 = { default-features = false, version = "0.5" }
31+
base32 = { version = "0.5", default-features = false }
2732
base64 = { default-features = false, version = "0.22" }
33+
base64 = { version = "0.22", default-features = false }
2834
bollard = { default-features = false, version = "0.19" }
35+
bollard = { version = "0.18", default-features = false }
2936
build-print = { default-features = false, version = "1" }
3037
clap = { default-features = false, version = "4" }
38+
clap = { version = "4", default-features = false }
3139
cloudflare = { default-features = false, version = "0.14" }
3240
codee = { default-features = false, version = "0.3" }
41+
codee = { version = "0.3", default-features = false }
3342
comfy-table = { default-features = false, version = "7" }
43+
comfy-table = { version = "7", default-features = false }
3444
common = { default-features = false, path = "runners/common" }
45+
common = { path = "runners/common", default-features = false }
3546
config = { default-features = false, version = "0.15" }
47+
config = { version = "0.15", default-features = false }
3648
console_error_panic_hook = { default-features = false, version = "0.1" }
49+
console_error_panic_hook = { version = "0.1", default-features = false }
3750
convert_case = { default-features = false, version = "0.8" }
51+
convert_case = { version = "0.8" }
3852
cookie = { default-features = false, version = "0.18" }
53+
cookie = { version = "0.18", default-features = false }
3954
dashmap = { default-features = false, version = "6" }
55+
dashmap = { version = "6", default-features = false }
4056
dirs = { default-features = false, version = "6" }
57+
dirs = { version = "6", default-features = false }
4158
docker = { default-features = false, path = "runners/docker" }
4259
either = { default-features = false, version = "1" }
60+
either = { version = "1", default-features = false }
4361
flate2 = { default-features = false, version = "1" }
4462
frontend = { default-features = false, path = "frontend/common" }
63+
frontend = { path = "frontend/common", default-features = false }
4564
fslock = { default-features = false, version = "0.2" }
4665
futures = { default-features = false, version = "0.3" }
66+
futures = { version = "0.3", default-features = false }
4767
getrandom_02 = { default-features = false, package = "getrandom", version = "0.2" }
68+
getrandom_02 = { package = "getrandom", version = "0.2", default-features = false }
4869
getrandom_03 = { default-features = false, package = "getrandom", version = "0.3" }
70+
getrandom_03 = { package = "getrandom", version = "0.3", default-features = false }
4971
headers = { default-features = false, version = "0.4" }
72+
headers = { version = "0.4", default-features = false }
5073
hex = { default-features = false, version = "0.4" }
74+
hex = { version = "0.4", default-features = false }
5175
http = { default-features = false, version = "1" }
76+
http = { version = "1", default-features = false }
5277
httparse = { default-features = false, version = "1" }
78+
httparse = { version = "1", default-features = false }
5379
hyper = { default-features = false, version = "1" }
5480
inquire = { default-features = false, version = "0.7" }
81+
inquire = { version = "0.7", default-features = false }
5582
ipinfo = { default-features = false, version = "3" }
83+
ipinfo = { version = "3", default-features = false }
5684
ipnetwork = { default-features = false, version = "0.20" }
85+
ipnetwork = { version = "0.20", default-features = false }
5786
jsonwebtoken = { default-features = false, version = "9" }
87+
jsonwebtoken = { version = "9", default-features = false }
5888
k8s-openapi = { default-features = false, version = "0.26" }
89+
k8s-openapi = { version = "0.24", default-features = false }
5990
kube = { default-features = false, version = "2" }
91+
kube = { version = "0.99", default-features = false }
6092
leptos = { default-features = false, version = "0.8" }
93+
leptos = { version = "0.7", default-features = false }
6194
leptos-use = { default-features = false, version = "0.16" }
95+
leptos-use = { version = "0.15", default-features = false }
6296
leptos_axum = { default-features = false, version = "0.8" }
97+
leptos_axum = { version = "0.7", default-features = false }
6398
leptos_meta = { default-features = false, version = "0.8" }
99+
leptos_meta = { version = "0.7", default-features = false }
64100
leptos_router = { default-features = false, version = "0.8" }
101+
leptos_router = { version = "0.7", default-features = false }
65102
log = { default-features = false, version = "0.4" }
103+
log = { version = "0.4", default-features = false }
66104
macros = { default-features = false, path = "macros" }
105+
macros = { path = "macros", default-features = false }
67106
matchit = { default-features = false, version = "0.8" }
107+
matchit = { version = "0.7", default-features = false }
68108
models = { default-features = false, path = "models" }
109+
models = { path = "models", default-features = false }
69110
monostate = { default-features = false, version = "0.1" }
111+
monostate = { version = "0.1", default-features = false }
70112
nix = { default-features = false, version = "0.30" }
71113
oci-client = { default-features = false, version = "0.15" }
72114
oci-spec = { default-features = false, version = "0.8" }
73115
open = { default-features = false, version = "5" }
116+
open = { version = "5", default-features = false }
74117
opentelemetry = { default-features = false, version = "0.30" }
118+
opentelemetry = { version = "0.29", default-features = false }
75119
opentelemetry-appender-tracing = { default-features = false, version = "0.30" }
76120
opentelemetry-otlp = { default-features = false, version = "0.30" }
121+
opentelemetry-otlp = { version = "0.29", default-features = false }
77122
opentelemetry_sdk = { default-features = false, version = "0.30" }
123+
opentelemetry_sdk = { version = "0.29", default-features = false }
78124
preprocess = { default-features = false, version = "0.5" }
125+
preprocess = { version = "0.5", default-features = false }
79126
proc-macro2 = { default-features = false, version = "1" }
127+
proc-macro2 = { version = "1", default-features = false }
80128
quote = { default-features = false, version = "1" }
129+
quote = { version = "1", default-features = false }
81130
rand = { default-features = false, version = "0.8" }
131+
rand = { version = "0.8", default-features = false }
82132
regex = { default-features = false, version = "1" }
133+
regex = { version = "1", default-features = false }
83134
reqwest = { default-features = false, version = "0.12" }
135+
reqwest = { version = "0.12", default-features = false }
84136
rust-embed = { default-features = false, version = "8" }
85137
rust-s3 = { default-features = false, version = "0.36.0-beta" }
138+
rust-s3 = { version = "0.36.0-beta", default-features = false }
86139
rustis = { default-features = false, version = "0.16" }
140+
rustis = { version = "0.13", default-features = false }
87141
schemars = { default-features = false, version = "1" }
142+
schemars = { version = "0.8", default-features = false }
88143
semver = { default-features = false, version = "1" }
144+
semver = { version = "1", default-features = false }
89145
serde = { default-features = false, version = "1" }
146+
serde = { version = "1", default-features = false }
90147
serde_json = { default-features = false, version = "1" }
148+
serde_json = { version = "1", default-features = false }
91149
serde_test = { default-features = false, version = "1" }
150+
serde_test = { version = "1", default-features = false }
92151
serde_urlencoded = { default-features = false, version = "0.7" }
152+
serde_urlencoded = { version = "0.7", default-features = false }
93153
serde_yaml2 = { default-features = false, version = "0.1" }
94154
server_fn = { default-features = false, version = "0.7" }
95155
sha2 = { default-features = false, version = "0.10" }
156+
sha2 = { version = "0.10", default-features = false }
96157
sqlx = { default-features = false, version = "0.8" }
158+
sqlx = { version = "0.8", default-features = false }
97159
strum = { default-features = false, version = "0.27" }
160+
strum = { version = "0.27", default-features = false }
98161
syn = { default-features = false, version = "2" }
162+
syn = { version = "2", default-features = false }
99163
tar = { default-features = false, version = "0.4" }
100164
tempfile = { default-features = false, version = "3" }
101165
thiserror = { default-features = false, version = "2" }
166+
thiserror = { version = "2", default-features = false }
102167
time = { default-features = false, version = "0.3" }
168+
time = { version = "0.3", default-features = false }
103169
tokio = { default-features = false, version = "1" }
170+
tokio = { version = "1", default-features = false }
104171
tokio-stream = { default-features = false, version = "0.1" }
172+
tokio-stream = { version = "0.1", default-features = false }
105173
tokio-tungstenite = { default-features = false, version = "0.27" }
174+
tokio-tungstenite = { version = "0.26", default-features = false }
106175
tokio-util = { default-features = false, version = "0.7" }
176+
tokio-util = { version = "0.7", default-features = false }
107177
totp-rs = { default-features = false, version = "5" }
178+
totp-rs = { version = "5", default-features = false }
108179
tower = { default-features = false, version = "0.5" }
180+
tower = { version = "0.5", default-features = false }
109181
tower-http = { default-features = false, version = "0.6" }
182+
tower-http = { version = "0.6", default-features = false }
110183
tracing = { default-features = false, version = "0.1" }
184+
tracing = { version = "0.1", default-features = false }
111185
tracing-log = { default-features = false, version = "0.2" }
186+
tracing-log = { version = "0.2", default-features = false }
112187
tracing-opentelemetry = { default-features = false, version = "0.31" }
188+
tracing-opentelemetry = { version = "0.30", default-features = false }
113189
tracing-subscriber = { default-features = false, version = "0.3" }
190+
tracing-subscriber = { version = "0.3", default-features = false }
114191
typed-builder = { default-features = false, version = "0.21" }
192+
typed-builder = { version = "0.20", default-features = false }
115193
url = { default-features = false, version = "2" }
194+
url = { version = "2", default-features = false }
116195
uuid = { default-features = false, version = "1" }
196+
uuid = { version = "1", default-features = false }
117197
wasm-bindgen = { default-features = false, version = "0.2" }
198+
wasm-bindgen = { version = "0.2", default-features = false }
118199
wasm-logger = { default-features = false, version = "0.2" }
200+
wasm-logger = { version = "0.2", default-features = false }
119201
web-sys = { default-features = false, version = "0.3" }
202+
web-sys = { version = "0.3", default-features = false }
120203
woothee = { default-features = false, version = "0.13" }
204+
woothee = { version = "0.13", default-features = false }
121205
worker = { default-features = false, version = "0.6" }
206+
worker = { version = "0.5", default-features = false }
122207

123208
[workspace.dev-dependencies]
124209
k8s-openapi = { features = ["latest"] }

‎models/src/response.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@ use axum::{Json, http::StatusCode, response::IntoResponse};
44
use leptos::server_fn::{
55
ServerFnError,
66
codec::{FromRes, IntoRes},
7-
response::ClientRes,
7+
response::{ClientRes, browser::BrowserResponse},
88
};
99
use preprocess::Preprocessable;
10-
use reqwest::Response as ReqwestResponse;
1110
use serde::{Deserialize, Serialize, de::DeserializeOwned};
1211
use typed_builder::TypedBuilder;
1312

@@ -90,15 +89,15 @@ where
9089
}
9190
}
9291

93-
impl<E> FromRes<ApiEncoding<E>, ReqwestResponse, ErrorType> for AppResponse<E>
92+
impl<E> FromRes<ApiEncoding<E>, BrowserResponse, ErrorType> for AppResponse<E>
9493
where
9594
E: ApiEndpoint,
9695
<E::RequestBody as Preprocessable>::Processed: Send,
9796
E::RequestBody: Serialize + DeserializeOwned,
9897
E::ResponseBody: Serialize + DeserializeOwned,
9998
{
100-
async fn from_res(res: ReqwestResponse) -> Result<Self, ServerFnError<ErrorType>> {
101-
let status_code = <ReqwestResponse as ClientRes<ErrorType>>::status(&res);
99+
async fn from_res(res: BrowserResponse) -> Result<Self, ServerFnError<ErrorType>> {
100+
let status_code = <BrowserResponse as ClientRes<ErrorType>>::status(&res);
102101
let status_code = StatusCode::from_u16(status_code)
103102
.map_err(|err| ServerFnError::Response(err.to_string()))?;
104103
let headers = E::ResponseHeaders::from_header_map(res.headers())

0 commit comments

Comments
 (0)