From d6f1568c9033029ed81d4c159bc86b18b1671f1e Mon Sep 17 00:00:00 2001 From: MatisseB Date: Tue, 25 Jun 2024 12:03:04 +0200 Subject: [PATCH] Feat/linting (#8) * feat: update dependencies and format code * feat: lint Dockerfile and add opencontainers labels --- Cargo.lock | 586 ++++++++++----------------- Cargo.toml | 2 +- Dockerfile | 24 +- crates/common/src/plugins/manager.rs | 2 +- src/bin/lgc.rs | 2 +- 5 files changed, 235 insertions(+), 381 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a410c79..0f6bc3c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -187,7 +187,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -198,7 +198,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -295,9 +295,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitmaps" @@ -372,9 +372,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.16.0" +version = "1.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5" +checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" [[package]] name = "byteorder" @@ -467,9 +467,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.99" +version = "1.0.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" +checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b" dependencies = [ "jobserver", "libc", @@ -534,7 +534,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -853,6 +853,20 @@ dependencies = [ "parking_lot_core 0.9.10", ] +[[package]] +name = "dashmap" +version = "6.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core 0.9.10", +] + [[package]] name = "debugid" version = "0.8.0" @@ -989,13 +1003,13 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" [[package]] name = "displaydoc" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1339,7 +1353,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -1396,7 +1410,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27d12c0aed7f1e24276a241aadc4cb8ea9f83000f34bc062b7cc2d51e3b0fabd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "debugid", "fxhash", "serde", @@ -1622,9 +1636,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.9.3" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1661,19 +1675,20 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.26.0" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" dependencies = [ "futures-util", "http", "hyper", "hyper-util", - "rustls", + "rustls 0.23.10", "rustls-pki-types", "tokio", - "tokio-rustls", + "tokio-rustls 0.26.0", "tower-service", + "webpki-roots", ] [[package]] @@ -1735,124 +1750,6 @@ dependencies = [ "cc", ] -[[package]] -name = "icu_collections" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locid" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_locid_transform" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_locid_transform_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_locid_transform_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" - -[[package]] -name = "icu_normalizer" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "utf16_iter", - "utf8_iter", - "write16", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" - -[[package]] -name = "icu_properties" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036" -dependencies = [ - "displaydoc", - "icu_collections", - "icu_locid_transform", - "icu_properties_data", - "icu_provider", - "tinystr", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" - -[[package]] -name = "icu_provider" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" -dependencies = [ - "displaydoc", - "icu_locid", - "icu_provider_macros", - "stable_deref_trait", - "tinystr", - "writeable", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_provider_macros" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "id-arena" version = "2.2.1" @@ -1861,14 +1758,12 @@ checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005" [[package]] name = "idna" -version = "1.0.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" dependencies = [ - "icu_normalizer", - "icu_properties", - "smallvec", - "utf8_iter", + "unicode-bidi", + "unicode-normalization", ] [[package]] @@ -1952,7 +1847,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossterm", "dyn-clone", "fuzzy-matcher", @@ -2149,14 +2044,14 @@ dependencies = [ [[package]] name = "kcl-language-server" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "anyhow", "chrono", "clap", "compiler_base_session", "crossbeam-channel", - "dashmap", + "dashmap 5.5.3", "env_logger", "im-rc", "indexmap 1.9.3", @@ -2193,7 +2088,7 @@ dependencies = [ [[package]] name = "kclvm-api" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "anyhow", "futures", @@ -2232,7 +2127,7 @@ dependencies = [ [[package]] name = "kclvm-ast" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "compiler_base_span", "kclvm-error", @@ -2247,7 +2142,7 @@ dependencies = [ [[package]] name = "kclvm-ast-pretty" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "compiler_base_macros", "compiler_base_session", @@ -2261,7 +2156,7 @@ dependencies = [ [[package]] name = "kclvm-compiler" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "ahash 0.7.8", "bit-set", @@ -2281,7 +2176,7 @@ dependencies = [ [[package]] name = "kclvm-config" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "ahash 0.7.8", "anyhow", @@ -2305,7 +2200,7 @@ dependencies = [ [[package]] name = "kclvm-driver" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "anyhow", "flate2", @@ -2330,7 +2225,7 @@ dependencies = [ [[package]] name = "kclvm-error" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "annotate-snippets", "anyhow", @@ -2353,7 +2248,7 @@ dependencies = [ [[package]] name = "kclvm-evaluator" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "anyhow", "generational-arena", @@ -2367,7 +2262,7 @@ dependencies = [ [[package]] name = "kclvm-lexer" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "kclvm-error", "rustc_lexer", @@ -2377,7 +2272,7 @@ dependencies = [ [[package]] name = "kclvm-loader" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "anyhow", "indexmap 1.9.3", @@ -2393,18 +2288,18 @@ dependencies = [ [[package]] name = "kclvm-macros" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "proc-macro2", "quote", "syn 1.0.109", - "synstructure 0.12.6", + "synstructure", ] [[package]] name = "kclvm-parser" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "anyhow", "bstr", @@ -2435,7 +2330,7 @@ dependencies = [ [[package]] name = "kclvm-query" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "anyhow", "compiler_base_macros", @@ -2455,7 +2350,7 @@ dependencies = [ [[package]] name = "kclvm-runner" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "anyhow", "cc", @@ -2490,7 +2385,7 @@ dependencies = [ [[package]] name = "kclvm-runtime" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "ahash 0.7.8", "base64 0.13.1", @@ -2523,7 +2418,7 @@ dependencies = [ [[package]] name = "kclvm-sema" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "ahash 0.7.8", "anyhow", @@ -2556,7 +2451,7 @@ dependencies = [ [[package]] name = "kclvm-span" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "compiler_base_span", "kclvm-macros", @@ -2567,7 +2462,7 @@ dependencies = [ [[package]] name = "kclvm-tools" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "anyhow", "compiler_base_session", @@ -2598,7 +2493,7 @@ dependencies = [ [[package]] name = "kclvm-utils" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "anyhow", "fslock", @@ -2608,7 +2503,7 @@ dependencies = [ [[package]] name = "kclvm-version" version = "0.9.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "vergen", ] @@ -2616,7 +2511,7 @@ dependencies = [ [[package]] name = "kclvm_runtime_internal_macros" version = "0.5.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "proc-macro2", "quote", @@ -2645,9 +2540,9 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "leb128" @@ -2662,7 +2557,7 @@ dependencies = [ "anyhow", "clap", "console", - "dashmap", + "dashmap 6.0.1", "dialoguer", "figment", "futures", @@ -2711,7 +2606,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "libc", ] @@ -2730,12 +2625,6 @@ version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" -[[package]] -name = "litemap" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" - [[package]] name = "located_yaml" version = "0.2.1" @@ -2770,7 +2659,7 @@ dependencies = [ "anyhow", "async-trait", "console", - "dashmap", + "dashmap 6.0.1", "dialoguer", "futures", "inquire", @@ -2946,9 +2835,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] @@ -3030,7 +2919,7 @@ version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "crossbeam-channel", "filetime", "fsevent-sys", @@ -3190,7 +3079,7 @@ version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -3207,7 +3096,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3293,7 +3182,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.5.1", + "redox_syscall 0.5.2", "smallvec", "windows-targets 0.52.5", ] @@ -3330,7 +3219,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3370,7 +3259,7 @@ dependencies = [ "pest_meta", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3455,7 +3344,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3533,9 +3422,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -3548,7 +3437,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "version_check", "yansi 1.0.1", ] @@ -3556,11 +3445,11 @@ dependencies = [ [[package]] name = "proc_macro_crate" version = "0.1.0" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -3620,7 +3509,7 @@ dependencies = [ [[package]] name = "prost-wkt" version = "0.4.1" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "chrono", "inventory", @@ -3634,7 +3523,7 @@ dependencies = [ [[package]] name = "prost-wkt-build" version = "0.4.1" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "heck 0.4.1", "prost", @@ -3646,7 +3535,7 @@ dependencies = [ [[package]] name = "prost-wkt-types" version = "0.4.1" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "chrono", "prost", @@ -3720,6 +3609,53 @@ dependencies = [ "cc", ] +[[package]] +name = "quinn" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +dependencies = [ + "bytes", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash", + "rustls 0.23.10", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand", + "ring", + "rustc-hash", + "rustls 0.23.10", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + +[[package]] +name = "quinn-udp" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +dependencies = [ + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "1.0.36" @@ -3854,11 +3790,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" +checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -3931,9 +3867,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.12.4" +version = "0.12.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" dependencies = [ "base64 0.22.1", "bytes", @@ -3956,7 +3892,8 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "quinn", + "rustls 0.23.10", "rustls-pemfile", "rustls-pki-types", "serde", @@ -3966,7 +3903,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.26.0", "tokio-util 0.7.11", "tower-service", "url", @@ -4154,7 +4091,7 @@ version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "errno", "itoa", "libc", @@ -4177,6 +4114,20 @@ dependencies = [ "zeroize", ] +[[package]] +name = "rustls" +version = "0.23.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05cff451f60db80f490f3c182b77c35260baace73209e9cdbbe526bfe3a4d402" +dependencies = [ + "once_cell", + "ring", + "rustls-pki-types", + "rustls-webpki", + "subtle", + "zeroize", +] + [[package]] name = "rustls-pemfile" version = "2.1.2" @@ -4281,7 +4232,7 @@ version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -4351,7 +4302,7 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4373,7 +4324,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4413,7 +4364,7 @@ dependencies = [ [[package]] name = "serde_yaml" version = "0.9.34+deprecated" -source = "git+https://github.com/kcl-lang/kcl#6fd3a095760bb0e7349882194a71bf7a32fa45d9" +source = "git+https://github.com/kcl-lang/kcl#82bff23308f571db016e20960f71c7f6aea82328" dependencies = [ "indexmap 2.2.6", "itoa", @@ -4700,9 +4651,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "subtle" -version = "2.5.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" +checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "suggestions" @@ -4726,9 +4677,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" dependencies = [ "proc-macro2", "quote", @@ -4737,9 +4688,9 @@ dependencies = [ [[package]] name = "sync_wrapper" -version = "0.1.2" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" [[package]] name = "synstructure" @@ -4753,17 +4704,6 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "synstructure" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "system-configuration" version = "0.5.1" @@ -4791,7 +4731,7 @@ version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b858526d22750088a9b3cf2e3c2aacebd5377f13adeec02860c30d09113010a6" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cap-fs-ext", "cap-std", "fd-lock", @@ -4866,7 +4806,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -4966,14 +4906,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ "displaydoc", - "zerovec", ] [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" dependencies = [ "tinyvec_macros", ] @@ -5011,7 +4950,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5030,7 +4969,18 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls", + "rustls 0.22.4", + "rustls-pki-types", + "tokio", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.10", "rustls-pki-types", "tokio", ] @@ -5176,7 +5126,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5266,7 +5216,7 @@ checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5355,7 +5305,7 @@ checksum = "1ed7f4237ba393424195053097c1516bd4590dc82b84f2f97c5c69e12704555b" dependencies = [ "proc-macro-hack", "quote", - "syn 2.0.66", + "syn 2.0.68", "unic-langid-impl", ] @@ -5400,6 +5350,12 @@ dependencies = [ "version_check", ] +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + [[package]] name = "unicode-casing" version = "0.1.0" @@ -5459,9 +5415,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna", @@ -5469,18 +5425,6 @@ dependencies = [ "serde", ] -[[package]] -name = "utf16_iter" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" - -[[package]] -name = "utf8_iter" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" - [[package]] name = "utf8parse" version = "0.2.2" @@ -5489,9 +5433,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.8.0" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" +checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" dependencies = [ "getrandom", "serde", @@ -5574,7 +5518,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-shared", ] @@ -5608,7 +5552,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -5628,15 +5572,6 @@ dependencies = [ "leb128", ] -[[package]] -name = "wasm-encoder" -version = "0.210.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e3764d9d6edabd8c9e16195e177be0d20f6ab942ad18af52860f12f82bc59a" -dependencies = [ - "leb128", -] - [[package]] name = "wasm-encoder" version = "0.211.1" @@ -5683,7 +5618,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07035cc9a9b41e62d3bb3a3815a66ab87c993c06fe1cf6b2a3f2a18499d937db" dependencies = [ "ahash 0.8.11", - "bitflags 2.5.0", + "bitflags 2.6.0", "hashbrown 0.14.5", "indexmap 2.2.6", "semver 1.0.23", @@ -5697,7 +5632,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3189cc8a91f547390e2f043ca3b3e3fe0892f7d581767fd4e4b7f3dc3fe8e561" dependencies = [ "ahash 0.8.11", - "bitflags 2.5.0", + "bitflags 2.6.0", "hashbrown 0.14.5", "indexmap 2.2.6", "semver 1.0.23", @@ -5808,7 +5743,7 @@ dependencies = [ "anyhow", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wasmtime-component-util", "wasmtime-wit-bindgen", "wit-parser 0.209.1", @@ -5935,7 +5870,7 @@ checksum = "de5a9bc4f44ceeb168e9e8e3be4e0b4beb9095b468479663a9e24c667e36826f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", ] [[package]] @@ -5946,7 +5881,7 @@ checksum = "8abb1301089ed8e0b4840f539cba316a73ac382090f1b25d22d8c8eed8df49c7" dependencies = [ "anyhow", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "bytes", "cap-fs-ext", "cap-net-ext", @@ -5983,9 +5918,9 @@ dependencies = [ "http-body", "http-body-util", "hyper", - "rustls", + "rustls 0.22.4", "tokio", - "tokio-rustls", + "tokio-rustls 0.25.0", "tracing", "wasmtime", "wasmtime-wasi", @@ -6032,24 +5967,24 @@ dependencies = [ [[package]] name = "wast" -version = "210.0.0" +version = "211.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa835c59bd615e00f16be65705d85517d40b44b3c831d724e450244685176c3c" +checksum = "b25506dd82d00da6b14a87436b3d52b1d264083fa79cdb72a0d1b04a8595ccaa" dependencies = [ "bumpalo", "leb128", "memchr", "unicode-width", - "wasm-encoder 0.210.0", + "wasm-encoder 0.211.1", ] [[package]] name = "wat" -version = "1.210.0" +version = "1.211.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67faece8487996430c6812be7f8776dc563ca0efcd3db77f8839070480c0d1a6" +checksum = "eb716ca6c86eecac2d82541ffc39860118fc0af9309c4f2670637bea2e1bdd7d" dependencies = [ - "wast 210.0.0", + "wast 211.0.1", ] [[package]] @@ -6064,9 +5999,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.2" +version = "0.26.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c452ad30530b54a4d8e71952716a212b08efd0f3562baa66c29a618b07da7c3" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" dependencies = [ "rustls-pki-types", ] @@ -6091,7 +6026,7 @@ checksum = "29830e5d01c182d24b94092c697aa7ab0ee97d22e78a2bf40ca91eae6ebca5c2" dependencies = [ "anyhow", "async-trait", - "bitflags 2.5.0", + "bitflags 2.6.0", "thiserror", "tracing", "wasmtime", @@ -6109,7 +6044,7 @@ dependencies = [ "proc-macro2", "quote", "shellexpand", - "syn 2.0.66", + "syn 2.0.68", "witx", ] @@ -6121,7 +6056,7 @@ checksum = "cc26129a8aea20b62c961d1b9ab4a3c3b56b10042ed85d004f8678af0f21ba6e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.68", "wiggle-generate", ] @@ -6427,7 +6362,7 @@ version = "0.36.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9643b83820c0cd246ecabe5fa454dd04ba4fa67996369466d0747472d337346" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "windows-sys 0.52.0", ] @@ -6438,7 +6373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "079a38b7d679867424bf2bcbdd553a2acf364525307e43dfb910fa4a2c6fd9f2" dependencies = [ "anyhow", - "bitflags 2.5.0", + "bitflags 2.6.0", "indexmap 2.2.6", "log", "serde", @@ -6498,18 +6433,6 @@ dependencies = [ "wast 35.0.2", ] -[[package]] -name = "write16" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" - -[[package]] -name = "writeable" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" - [[package]] name = "xattr" version = "1.3.1" @@ -6551,30 +6474,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "yoke" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" -dependencies = [ - "serde", - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure 0.13.1", -] - [[package]] name = "zerocopy" version = "0.7.34" @@ -6592,28 +6491,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", -] - -[[package]] -name = "zerofrom" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", - "synstructure 0.13.1", + "syn 2.0.68", ] [[package]] @@ -6622,28 +6500,6 @@ version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" -[[package]] -name = "zerovec" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - [[package]] name = "zstd" version = "0.13.1" @@ -6664,9 +6520,9 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.10+zstd.1.5.6" +version = "2.0.11+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" +checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" dependencies = [ "cc", "pkg-config", diff --git a/Cargo.toml b/Cargo.toml index af36e9f..b137b1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -82,7 +82,7 @@ inquire = "0.7" console = "0.15" dialoguer = "0.11" rayon = "1.10.0" -dashmap = "5.5" +dashmap = "6.0" tracing = {version = "0.1", features = ["log"] } tracing-subscriber = {version = "0.3", features = ["env-filter", "fmt", "std"] } diff --git a/Dockerfile b/Dockerfile index fb39565..76fd189 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,10 +10,8 @@ ENV SYSROOT=/dummy RUN apk update && apk add --no-cache \ g++ \ musl-dev \ - pkgconfig \ libressl-dev \ - protobuf-dev \ - protoc + protobuf-dev ENV PROTOC=/usr/bin/protoc @@ -23,16 +21,16 @@ COPY . /wd RUN cargo build --bin lgc --release # ----- -FROM cgr.dev/chainguard/wolfi-base - -ARG description="Easily build Detection-as-Code pipelines for modern security tools (SIEM, EDR, XDR, ...)" -LABEL name="lgc" \ - maintainer="dev@logcraft.io" \ - vendor="LogCraft" \ - license="MPL-2.0" \ - summary="Detection-as-Code CLI" \ - description=${description} -LABEL org.opencontainers.image.description ${description} +FROM cgr.dev/chainguard/wolfi-base:latest + +LABEL org.opencontainers.image.title "LogCraft CLI" +LABEL org.opencontainers.image.authors "LogCraft " +LABEL org.opencontainers.image.url "https://github.com/LogCraftIO/logcraft-cli/pkgs/container/logcraft-cli" +LABEL org.opencontainers.image.documentation "https://docs.logcraft.io/" +LABEL org.opencontainers.image.source "https://github.com/LogCraftIO/logcraft-cli" +LABEL org.opencontainers.image.vendor "LogCraft" +LABEL org.opencontainers.image.licenses "MPL-2.0" +LABEL org.opencontainers.image.description "Easily build Detection-as-Code pipelines for modern security tools (SIEM, EDR, XDR, ...)" WORKDIR /wd RUN chown -R nonroot.nonroot /wd/ diff --git a/crates/common/src/plugins/manager.rs b/crates/common/src/plugins/manager.rs index 01ad383..d2c25cf 100644 --- a/crates/common/src/plugins/manager.rs +++ b/crates/common/src/plugins/manager.rs @@ -85,7 +85,7 @@ impl PluginManager { ); let (interface, _) = - Plugins::instantiate_async(&mut store, &component, &self.engine.linker).await?; + Plugins::instantiate_async(&mut store, &component, &self.engine.linker).await?; let metadata = interface .logcraft_lgc_plugin() diff --git a/src/bin/lgc.rs b/src/bin/lgc.rs index 1f37209..93e4f8b 100644 --- a/src/bin/lgc.rs +++ b/src/bin/lgc.rs @@ -15,9 +15,9 @@ use lgc::commands::{ services::ServicesCommands, validate::ValidateCommand, }; use logcraft_common::configuration::{ProjectConfiguration, LGC_CONFIG_PATH}; +use std::path::PathBuf; use tracing::Level; use tracing_subscriber::EnvFilter; -use std::path::PathBuf; #[forbid(unsafe_code)] #[tokio::main]