From b5930bcc55d9e241b1fe29002d5cfb8f9191407f Mon Sep 17 00:00:00 2001
From: Christopher Kolstad <chriswk@getunleash.io>
Date: Thu, 11 May 2023 12:24:08 +0200
Subject: [PATCH] ci: Prepare for 4.0.0 release

---
 Cargo.lock            | 12 ++++++------
 README.md             |  2 +-
 server/Cargo.toml     |  4 ++--
 server/src/builder.rs |  2 +-
 server/src/cli.rs     |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f4f234d5..2c53558d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2373,18 +2373,18 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
 
 [[package]]
 name = "serde"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.160"
+version = "1.0.163"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2765,9 +2765,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.28.0"
+version = "1.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f"
+checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
 dependencies = [
  "autocfg",
  "bytes",
diff --git a/README.md b/README.md
index 7013a4f8..14196266 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/3.0.0/status.svg)](https://deps.rs/crate/unleash-edge/3.0.0)
+[![Dependency Status](https://deps.rs/crate/unleash-edge/4.0.0/status.svg)](https://deps.rs/crate/unleash-edge/4.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)
diff --git a/server/Cargo.toml b/server/Cargo.toml
index f1ba790a..1e066368 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -41,11 +41,11 @@ redis = {version = "0.23.0", features = ["tokio-comp"]}
 reqwest = {version = "0.11.17", default-features = false, features = ["rustls", "json", "rustls-tls", "native-tls"]}
 rustls = "0.20.8"
 rustls-pemfile = "1.0.2"
-serde = {version = "1.0.160", features = ["derive"]}
+serde = {version = "1.0.163", features = ["derive"]}
 serde_json = "1.0.96"
 serde_qs = { version = "0.12.0", features = ["actix4", "tracing"] }
 shadow-rs = "0.21.0"
-tokio = {version = "1.28.0", features = ["macros", "rt-multi-thread", "tracing", "fs"]}
+tokio = {version = "1.28.1", features = ["macros", "rt-multi-thread", "tracing", "fs"]}
 tracing = {version = "0.1.37", features = ["log"]}
 tracing-subscriber = {version = "0.3.17", features = ["json", "env-filter"]}
 ulid = "1.0.0"
diff --git a/server/src/builder.rs b/server/src/builder.rs
index 75b48dd4..c3838e1a 100644
--- a/server/src/builder.rs
+++ b/server/src/builder.rs
@@ -133,7 +133,7 @@ async fn build_edge(args: &EdgeArgs) -> EdgeResult<EdgeInfo> {
             UnleashClient::from_url(
                 url,
                 args.skip_ssl_verification,
-                args.client_tls.clone(),
+                args.client_identity.clone(),
                 args.upstream_certificate_file.clone(),
             )
         })
diff --git a/server/src/cli.rs b/server/src/cli.rs
index 3bf631ff..8a1f2c8d 100644
--- a/server/src/cli.rs
+++ b/server/src/cli.rs
@@ -70,7 +70,7 @@ pub struct EdgeArgs {
     pub skip_ssl_verification: bool,
 
     #[clap(flatten)]
-    pub client_tls: Option<ClientIdentity>,
+    pub client_identity: Option<ClientIdentity>,
 
     /// Extra certificate passed to the client for building its trust chain. Needs to be in PEM format (crt or pem extensions usually are)
     #[clap(long, env)]