From fbd72a8bc8b64b388fc4fe0fc1de61bf5ff59b7f Mon Sep 17 00:00:00 2001 From: Christopher Kolstad Date: Wed, 1 Nov 2023 13:05:20 +0100 Subject: [PATCH] chore: prepare for release --- Cargo.lock | 40 ++++++++++++++++---------------- README.md | 7 +++++- server/Cargo.toml | 58 +++++++++++++++++++++++++++++++---------------- server/README.md | 7 +++++- 4 files changed, 71 insertions(+), 41 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d0c68f67..fe4e057b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1010,9 +1010,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -1025,9 +1025,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -1035,15 +1035,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", @@ -1052,15 +1052,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", @@ -1069,21 +1069,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -1388,9 +1388,9 @@ checksum = "06d198e9919d9822d5f7083ba8530e04de87841eaf21ead9af8f2304efd57c89" [[package]] name = "iter_tools" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1410c6868bcd0e7f879dc61a0b3c7950df71d5c41c4811ab09e74beea32f4e1" +checksum = "a621162e5c4229abff44d46655dcb777f6064daa851e046df17baf74c9ddf079" dependencies = [ "itertools", ] diff --git a/README.md b/README.md index 161ae2c2..7621e2a3 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![crates.io](https://img.shields.io/crates/v/unleash-edge?label=latest)](https://crates.io/crates/unleash-edge) [![Documentation](https://docs.rs/unleash-edge/badge.svg?version=latest)](https://docs.rs/unleash-edge/latest) ![MIT licensed](https://img.shields.io/crates/l/unleash-edge.svg) -[![Dependency Status](https://deps.rs/crate/unleash-edge/14.0.0/status.svg)](https://deps.rs/crate/unleash-edge/14.0.0) +[![Dependency Status](https://deps.rs/crate/unleash-edge/16.0.0/status.svg)](https://deps.rs/crate/unleash-edge/16.0.0) [![CI](https://github.com/Unleash/unleash-edge/actions/workflows/test-with-coverage.yaml/badge.svg)](https://github.com/Unleash/unleash-edge/actions/workflows/test-with-coverage.yaml) [![Coverage Status](https://coveralls.io/repos/github/Unleash/unleash-edge/badge.svg?branch=main)](https://coveralls.io/github/Unleash/unleash-edge?branch=main) ![downloads](https://img.shields.io/crates/d/unleash-edge.svg) @@ -61,6 +61,11 @@ Options: App name. Used for metrics reporting [env: APP_NAME=] [default: unleash-edge] -h, --help Print help + -l, --log-format + Which log format should Edge use + [env: LOG_FORMAT=] + [default: `plain`] + Possible values: `plain`, `json`, `pretty` ``` ### Built-in Health check diff --git a/server/Cargo.toml b/server/Cargo.toml index c4acd0aa..24a36d23 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -19,44 +19,64 @@ actix-cors = "0.6.4" actix-http = { version = "3.4.0", features = ["compress-zstd", "rustls-0_21"] } actix-middleware-etag = "0.2.0" actix-service = "2.0.2" -actix-web = {version = "4.4.0", features = ["rustls-0_21", "compress-zstd"]} +actix-web = { version = "4.4.0", features = ["rustls-0_21", "compress-zstd"] } ahash = "0.8.6" anyhow = "1.0.75" async-trait = "0.1.74" -chrono = {version = "0.4.31", features = ["serde"]} +chrono = { version = "0.4.31", features = ["serde"] } cidr = "0.2.2" -clap = {version = "4.4.7", features = ["derive", "env"]} +clap = { version = "4.4.7", features = ["derive", "env"] } clap-markdown = "0.1.3" dashmap = "5.5.3" -futures = "0.3.28" -futures-core = "0.3.28" -iter_tools = "0.2.0" +futures = "0.3.29" +futures-core = "0.3.29" +iter_tools = "0.4.0" itertools = "0.11.0" lazy_static = "1.4.0" num_cpus = "1.16.0" -opentelemetry = {version = "0.20.0", features = ["trace", "rt-tokio", "metrics"]} +opentelemetry = { version = "0.20.0", features = [ + "trace", + "rt-tokio", + "metrics", +] } opentelemetry-prometheus = "0.13.0" opentelemetry-semantic-conventions = "0.12.0" -opentelemetry_sdk = { version = "0.20.0", features = ["metrics", "serde", "serde_json", "rt-tokio-current-thread", "logs"] } -prometheus = {version = "0.13.3", features = ["process"]} +opentelemetry_sdk = { version = "0.20.0", features = [ + "metrics", + "serde", + "serde_json", + "rt-tokio-current-thread", + "logs", +] } +prometheus = { version = "0.13.3", features = ["process"] } prometheus-static-metric = "0.5.1" -redis = {version = "0.23.3", features = ["tokio-comp", "tokio-rustls-comp"]} -reqwest = {version = "0.11.22", default-features = false, features = ["rustls", "json", "rustls-tls", "native-tls"]} +redis = { version = "0.23.3", features = ["tokio-comp", "tokio-rustls-comp"] } +reqwest = { version = "0.11.22", default-features = false, features = [ + "rustls", + "json", + "rustls-tls", + "native-tls", +] } rustls = "0.21.8" rustls-pemfile = "1.0.3" -serde = {version = "1.0.189", features = ["derive"]} +serde = { version = "1.0.189", features = ["derive"] } serde_json = "1.0.107" serde_qs = { version = "0.12.0", features = ["actix4", "tracing"] } shadow-rs = "0.24.1" -tokio = {version = "1.33.0", features = ["macros", "rt-multi-thread", "tracing", "fs"]} -tracing = {version = "0.1.40", features = ["log"]} -tracing-subscriber = {version = "0.3.17", features = ["json", "env-filter"]} +tokio = { version = "1.33.0", features = [ + "macros", + "rt-multi-thread", + "tracing", + "fs", +] } +tracing = { version = "0.1.40", features = ["log"] } +tracing-subscriber = { version = "0.3.17", features = ["json", "env-filter"] } ulid = "1.1.0" -unleash-types = { version = "0.10", features = ["openapi", "hashes"]} +unleash-types = { version = "0.10", features = ["openapi", "hashes"] } unleash-yggdrasil = { version = "0.7.0" } -utoipa = {version = "4", features = ["actix_extras", "chrono"]} -utoipa-swagger-ui = {version = "4", features = ["actix-web"]} +utoipa = { version = "4", features = ["actix_extras", "chrono"] } +utoipa-swagger-ui = { version = "4", features = ["actix-web"] } [dev-dependencies] actix-http = "3.4.0" actix-http-test = "3.1.0" @@ -66,7 +86,7 @@ maplit = "1.0.2" rand = "0.8.5" test-case = "3.2.1" testcontainers = "0.15.0" -testcontainers-modules = { version = "0.1.3", features = ["redis"]} +testcontainers-modules = { version = "0.1.3", features = ["redis"] } tracing-test = "0.2.4" [build-dependencies] diff --git a/server/README.md b/server/README.md index 161ae2c2..7621e2a3 100644 --- a/server/README.md +++ b/server/README.md @@ -3,7 +3,7 @@ [![crates.io](https://img.shields.io/crates/v/unleash-edge?label=latest)](https://crates.io/crates/unleash-edge) [![Documentation](https://docs.rs/unleash-edge/badge.svg?version=latest)](https://docs.rs/unleash-edge/latest) ![MIT licensed](https://img.shields.io/crates/l/unleash-edge.svg) -[![Dependency Status](https://deps.rs/crate/unleash-edge/14.0.0/status.svg)](https://deps.rs/crate/unleash-edge/14.0.0) +[![Dependency Status](https://deps.rs/crate/unleash-edge/16.0.0/status.svg)](https://deps.rs/crate/unleash-edge/16.0.0) [![CI](https://github.com/Unleash/unleash-edge/actions/workflows/test-with-coverage.yaml/badge.svg)](https://github.com/Unleash/unleash-edge/actions/workflows/test-with-coverage.yaml) [![Coverage Status](https://coveralls.io/repos/github/Unleash/unleash-edge/badge.svg?branch=main)](https://coveralls.io/github/Unleash/unleash-edge?branch=main) ![downloads](https://img.shields.io/crates/d/unleash-edge.svg) @@ -61,6 +61,11 @@ Options: App name. Used for metrics reporting [env: APP_NAME=] [default: unleash-edge] -h, --help Print help + -l, --log-format + Which log format should Edge use + [env: LOG_FORMAT=] + [default: `plain`] + Possible values: `plain`, `json`, `pretty` ``` ### Built-in Health check