Skip to content

Commit b4af4d8

Browse files
benjamin-747benjamin-747
committed
chore: bump qlean to 0.3.0
1 parent 1b42854 commit b4af4d8

10 files changed

Lines changed: 255 additions & 74 deletions

‎Cargo.lock‎

Lines changed: 195 additions & 57 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 & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,10 @@ dashmap = "6.2.1"
110110
once_cell = "1.21.4"
111111
serial_test = "3.4.0"
112112
sysinfo = "0.39.2"
113-
http = "1.4.0"
113+
http = "1.4.1"
114114
url = "2.5.8"
115115
jemallocator = "0.5.4"
116-
mimalloc = "0.1.51"
116+
mimalloc = "0.1.52"
117117
dotenvy = "0.15.7"
118118
tokio-tungstenite = "0.29"
119119
tungstenite = "0.29"
@@ -127,7 +127,7 @@ redis-test = "1.0.3"
127127
rustls = "0.23"
128128
object_store = "0.13.2"
129129
parse-display = "0.11.0"
130-
qlean = "0.2.3"
130+
qlean = "0.3.0"
131131
toml = "1.1.2"
132132
rkyv = "0.8.16"
133133
percent-encoding = "2.3"

‎mono/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ tracing = { workspace = true }
3939
tracing-subscriber = { workspace = true }
4040
tracing-appender = { workspace = true }
4141
russh = { workspace = true }
42+
rand = { workspace = true }
4243
serde = { workspace = true, features = ["derive"] }
4344
serde_json = { workspace = true }
4445
serde_urlencoded = { workspace = true }

‎mono/tests/buck_service_tests.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use std::path::Path;
3434

3535
use anyhow::{Context, Result};
3636
use common::*;
37-
use qlean::{Distro, MachineConfig, create_image, with_machine};
37+
use qlean::{Distro, GuestArch, Image, ImageConfig, MachineConfig, with_machine};
3838

3939
// Test authentication tokens
4040
const TEST_TOKEN: &str = "test-token-12345678-1234-1234-1234-123456789012";
@@ -1584,12 +1584,18 @@ async fn phase17_test_complete_idempotency(vm: &mut qlean::Machine) -> Result<()
15841584
async fn test_buck_service_with_postgres() -> Result<()> {
15851585
tracing_subscriber_init();
15861586

1587-
let image = create_image(Distro::Debian, "debian-13-generic-amd64").await?;
1587+
let image = Image::new(
1588+
ImageConfig::default()
1589+
.with_distro(Distro::Debian)
1590+
.with_arch(GuestArch::Amd64),
1591+
)
1592+
.await?;
15881593
let config = MachineConfig {
15891594
core: 2,
15901595
mem: 2048,
15911596
disk: Some(15),
15921597
clear: true,
1598+
..Default::default()
15931599
};
15941600

15951601
with_machine(&image, &config, |vm| {

‎mono/tests/campsite_api_store_tests.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ mod common;
3838

3939
use anyhow::{Context, Result};
4040
use common::*;
41-
use qlean::{Distro, MachineConfig, create_image, with_machine};
41+
use qlean::{Distro, GuestArch, Image, ImageConfig, MachineConfig, with_machine};
4242
use serde_json::Value;
4343

4444
const TEST_COOKIE: &str = "test_session_cookie";
@@ -237,12 +237,18 @@ async fn phase5_test_network_error(vm: &mut qlean::Machine) -> Result<()> {
237237
async fn test_campsite_api_store_integration() -> Result<()> {
238238
tracing_subscriber_init();
239239

240-
let image = create_image(Distro::Debian, "debian-13-generic-amd64").await?;
240+
let image = Image::new(
241+
ImageConfig::default()
242+
.with_distro(Distro::Debian)
243+
.with_arch(GuestArch::Amd64),
244+
)
245+
.await?;
241246
let config = MachineConfig {
242247
core: 2,
243248
mem: 2048,
244249
disk: Some(10),
245250
clear: true,
251+
..Default::default()
246252
};
247253

248254
with_machine(&image, &config, |vm| {

‎mono/tests/cl_merge_integration.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ use std::{path::Path, time::Duration};
4949

5050
use anyhow::{Context, Result};
5151
use common::*;
52-
use qlean::{Distro, MachineConfig, create_image, with_machine};
52+
use qlean::{Distro, GuestArch, Image, ImageConfig, MachineConfig, with_machine};
5353
use serde_json::Value;
5454

5555
// Timing constants for test operations
@@ -912,12 +912,18 @@ async fn phase12_verify_cl2_merge(vm: &mut qlean::Machine, cl2: &str) -> Result<
912912
async fn test_cl_merge_integration() -> Result<()> {
913913
tracing_subscriber_init();
914914

915-
let image = create_image(Distro::Debian, "debian-13-generic-amd64").await?;
915+
let image = Image::new(
916+
ImageConfig::default()
917+
.with_distro(Distro::Debian)
918+
.with_arch(GuestArch::Amd64),
919+
)
920+
.await?;
916921
let config = MachineConfig {
917922
core: 2,
918923
mem: 2048,
919924
disk: Some(15),
920925
clear: true,
926+
..Default::default()
921927
};
922928

923929
with_machine(&image, &config, |vm| {

‎mono/tests/http_server_session_tests.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use std::time::Duration;
3636

3737
use anyhow::{Context, Result};
3838
use common::*;
39-
use qlean::{Distro, MachineConfig, create_image, with_machine};
39+
use qlean::{Distro, GuestArch, Image, ImageConfig, MachineConfig, with_machine};
4040

4141
// ============================================================================
4242
// Test Scenarios - All in one function to avoid multiple VM startups
@@ -254,12 +254,18 @@ async fn phase5_test_session_without_data(vm: &mut qlean::Machine) -> Result<()>
254254
async fn test_http_server_session_with_redis() -> Result<()> {
255255
tracing_subscriber_init();
256256

257-
let image = create_image(Distro::Debian, "debian-13-generic-amd64").await?;
257+
let image = Image::new(
258+
ImageConfig::default()
259+
.with_distro(Distro::Debian)
260+
.with_arch(GuestArch::Amd64),
261+
)
262+
.await?;
258263
let config = MachineConfig {
259264
core: 2,
260265
mem: 2048,
261266
disk: Some(15),
262267
clear: true,
268+
..Default::default()
263269
};
264270

265271
with_machine(&image, &config, |vm| {

‎mono/tests/login_user_extractor_tests.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use std::time::Duration;
3636

3737
use anyhow::{Context, Result};
3838
use common::*;
39-
use qlean::{Distro, MachineConfig, create_image, with_machine};
39+
use qlean::{Distro, GuestArch, Image, ImageConfig, MachineConfig, with_machine};
4040
use serde_json::Value;
4141

4242
// Docker service names (must match docker-compose.demo.yml)
@@ -273,12 +273,18 @@ async fn phase5_test_network_error(vm: &mut qlean::Machine) -> Result<()> {
273273
async fn test_login_user_extractor_integration() -> Result<()> {
274274
tracing_subscriber_init();
275275

276-
let image = create_image(Distro::Debian, "debian-13-generic-amd64").await?;
276+
let image = Image::new(
277+
ImageConfig::default()
278+
.with_distro(Distro::Debian)
279+
.with_arch(GuestArch::Amd64),
280+
)
281+
.await?;
277282
let config = MachineConfig {
278283
core: 2,
279284
mem: 2048,
280285
disk: Some(15),
281286
clear: true,
287+
..Default::default()
282288
};
283289

284290
with_machine(&image, &config, |vm| {

‎mono/tests/qlean_integration.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use std::{
1414

1515
use anyhow::Result;
1616
use common::*;
17-
use qlean::{Distro, MachineConfig, create_image, with_machine};
17+
use qlean::{Distro, GuestArch, Image, ImageConfig, MachineConfig, with_machine};
1818

1919
const TEST_USER: &str = "mega";
2020
const TEST_TOKEN: &str = "mega";
@@ -600,7 +600,12 @@ pub async fn setup_mega_orion_environment(vm: &mut qlean::Machine) -> Result<()>
600600
async fn test_qlean_dev_environment() -> Result<()> {
601601
init_tracing();
602602

603-
let image = create_image(Distro::Debian, "debian-13-generic-amd64").await?;
603+
let image = Image::new(
604+
ImageConfig::default()
605+
.with_distro(Distro::Debian)
606+
.with_arch(GuestArch::Amd64),
607+
)
608+
.await?;
604609

605610
with_machine(
606611
&image,
@@ -609,6 +614,7 @@ async fn test_qlean_dev_environment() -> Result<()> {
609614
mem: 8192,
610615
disk: Some(20),
611616
clear: true,
617+
..Default::default()
612618
},
613619
|vm| {
614620
Box::pin(async {

‎mono/tests/session_management_tests.rs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ mod common;
3434

3535
use anyhow::{Context, Result};
3636
use common::*;
37-
use qlean::{Distro, MachineConfig, create_image, with_machine};
37+
use qlean::{Distro, GuestArch, Image, ImageConfig, MachineConfig, with_machine};
3838

3939
// ============================================================================
4040
// Test Scenarios - All in one function to avoid multiple VM startups
@@ -215,12 +215,18 @@ async fn phase4_test_session_id_generation(vm: &mut qlean::Machine) -> Result<()
215215
async fn test_session_management_with_redis() -> Result<()> {
216216
tracing_subscriber_init();
217217

218-
let image = create_image(Distro::Debian, "debian-13-generic-amd64").await?;
218+
let image = Image::new(
219+
ImageConfig::default()
220+
.with_distro(Distro::Debian)
221+
.with_arch(GuestArch::Amd64),
222+
)
223+
.await?;
219224
let config = MachineConfig {
220225
core: 2,
221226
mem: 2048,
222227
disk: Some(15),
223228
clear: true,
229+
..Default::default()
224230
};
225231

226232
with_machine(&image, &config, |vm| {

0 commit comments

Comments
 (0)