From c72f6c91d78efbfacaff5d663eff6d8b07e53843 Mon Sep 17 00:00:00 2001 From: Christoph Herzog Date: Thu, 21 Mar 2024 14:35:34 +0100 Subject: [PATCH] deps: Upgrade edge-schema to 0.0.3 Needed for some upstream schema changes. --- Cargo.lock | 40 ++++++------------------------ Cargo.toml | 1 + lib/backend-api/Cargo.toml | 2 +- lib/cli/Cargo.toml | 4 +-- lib/cli/src/commands/app/create.rs | 6 +++++ 5 files changed, 18 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8c21f8bfeb1..9db1b7bbf84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1395,33 +1395,9 @@ dependencies = [ [[package]] name = "edge-schema" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37f4d009ae866a6010c28fc2590976fdc35c81544000604f0137277c0153d165" -dependencies = [ - "anyhow", - "bytesize", - "once_cell", - "parking_lot 0.12.1", - "rand_chacha", - "rand_core", - "schemars", - "serde", - "serde_json", - "serde_path_to_error", - "serde_yaml 0.8.26", - "sparx", - "time 0.3.34", - "url", - "uuid", - "wcgi-host", -] - -[[package]] -name = "edge-schema" -version = "0.0.2" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9be9b51f4fab3714afc1957b7b609211e428c897fb06df0f6aadb3405a424f3" +checksum = "183ddfb52c2441be9d8c3c870632135980ba98e0c4f688da11bcbebb4e26f128" dependencies = [ "anyhow", "bytesize", @@ -1443,14 +1419,14 @@ dependencies = [ [[package]] name = "edge-util" -version = "0.0.1" +version = "0.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d665cdd8fd34e6faf57815d007ec4d5853f2c79d8cb37b9293225f3555ed239" +checksum = "47d29c2fd3544d92e77002ed246751fa6f46aa46eab1e01d3f8ea2b5beeb2f39" dependencies = [ - "edge-schema 0.0.1", + "edge-schema", "http", "serde", - "wasmparser 0.95.0", + "wasmparser 0.121.2", ] [[package]] @@ -6183,7 +6159,7 @@ dependencies = [ "anyhow", "base64 0.13.1", "cynic", - "edge-schema 0.0.2", + "edge-schema", "futures 0.3.30", "harsh", "pin-project-lite", @@ -6299,7 +6275,7 @@ dependencies = [ "comfy-table", "dialoguer", "dirs", - "edge-schema 0.0.2", + "edge-schema", "edge-util", "flate2", "fuse", diff --git a/Cargo.toml b/Cargo.toml index 94ccd81d580..12ed269ed95 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -91,6 +91,7 @@ webc = { version = "5.8.0", default-features = false, features = ["package"] } shared-buffer = "0.1.4" rkyv = { version = "0.7.40", features = ["indexmap", "validation", "strict"] } memmap2 = { version = "0.6.2" } +edge-schema = { version = "=0.0.3" } [build-dependencies] test-generator = { path = "tests/lib/test-generator" } diff --git a/lib/backend-api/Cargo.toml b/lib/backend-api/Cargo.toml index e299190e030..1e7f6fe5a54 100644 --- a/lib/backend-api/Cargo.toml +++ b/lib/backend-api/Cargo.toml @@ -16,7 +16,7 @@ rust-version.workspace = true [dependencies] # Wasmer dependencies. -edge-schema = "0.0.2" +edge-schema.workspace = true webc = "5" # crates.io dependencies. diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml index ea784e5f0b3..33972648367 100644 --- a/lib/cli/Cargo.toml +++ b/lib/cli/Cargo.toml @@ -103,8 +103,8 @@ virtual-mio = { version = "0.3.0", path = "../virtual-io" } webc = { workspace = true } wasmer-api = { version = "=0.0.24", path = "../backend-api" } -edge-schema = { version = "=0.0.2" } -edge-util = { version = "=0.0.1" } +edge-schema.workspace = true +edge-util = { version = "=0.0.2" } # Used by the mount command diff --git a/lib/cli/src/commands/app/create.rs b/lib/cli/src/commands/app/create.rs index 041f92de15f..0e6a576863c 100644 --- a/lib/cli/src/commands/app/create.rs +++ b/lib/cli/src/commands/app/create.rs @@ -202,6 +202,8 @@ impl AppCreator { cli_args: None, env: Default::default(), volumes: None, + domains: None, + owner: None, package: edge_schema::schema::StringWebcIdent(edge_schema::schema::WebcIdent { repository: None, namespace: self.owner, @@ -211,6 +213,7 @@ impl AppCreator { capabilities: None, scheduled_tasks: None, debug: Some(false), + extra: Default::default(), }; Ok(AppCreatorOutput { @@ -336,6 +339,7 @@ impl AppCreator { // TODO: check if name already exists. let cfg = AppConfigV1 { app_id: None, + owner: None, volumes: None, name, env: Default::default(), @@ -347,6 +351,8 @@ impl AppCreator { capabilities: None, scheduled_tasks: None, debug: Some(false), + domains: None, + extra: Default::default(), }; Ok(AppCreatorOutput {