From f1debe6cc91d8c2fddd5f29a012a6b31f41be505 Mon Sep 17 00:00:00 2001 From: Eyal Bukchin Date: Sun, 22 Sep 2024 13:47:12 +0300 Subject: [PATCH] Update to 3.118.0 (#2772) --- CHANGELOG.md | 41 +++++++++ Cargo.lock | 102 ++++++++-------------- Cargo.toml | 2 +- changelog.d/+bump-dependencies.changed.md | 1 - changelog.d/+sqs-tests.internal.md | 1 - changelog.d/2652.changed.md | 1 - changelog.d/2750.changed.md | 1 - changelog.d/2756.added.md | 10 --- changelog.d/2759.fixed.md | 1 - 9 files changed, 78 insertions(+), 82 deletions(-) delete mode 100644 changelog.d/+bump-dependencies.changed.md delete mode 100644 changelog.d/+sqs-tests.internal.md delete mode 100644 changelog.d/2652.changed.md delete mode 100644 changelog.d/2750.changed.md delete mode 100644 changelog.d/2756.added.md delete mode 100644 changelog.d/2759.fixed.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 20e6acf7bf2..f5493681be6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,47 @@ This project uses [*towncrier*](https://towncrier.readthedocs.io/) and the chang +## [3.118.0](https://github.com/metalbear-co/mirrord/tree/3.118.0) - 2024-09-22 + + +### Added + +- Add `cli_extra_args` field to `container` config to allow specifing custom + arguments for `mirrord container` sidecar container. + + ```json + { + "container": { + "cli_extra_args": ["--network", "host"] + } + } + ``` + this config will spawn mirrord cli container with ` run --network + host --rm -d ...`. + [#2756](https://github.com/metalbear-co/mirrord/issues/2756) + + +### Changed + +- Increase timeout of layer-intproxy socket connection to a ludicrous amount. + [#2652](https://github.com/metalbear-co/mirrord/issues/2652) +- Have intproxy log to a file in /tmp by default. + [#2750](https://github.com/metalbear-co/mirrord/issues/2750) +- Bump dependencies + + +### Fixed + +- Add a retry for port-forward agent connection if error was recived via error + channel after websocket was established. + [#2759](https://github.com/metalbear-co/mirrord/issues/2759) + + +### Internal + +- E2E tests for SQS splitting. + + ## [3.117.0](https://github.com/metalbear-co/mirrord/tree/3.117.0) - 2024-09-12 diff --git a/Cargo.lock b/Cargo.lock index 2999668bc43..8ea7131df4b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2442,7 +2442,7 @@ dependencies = [ [[package]] name = "fileops" -version = "3.117.0" +version = "3.118.0" dependencies = [ "libc", ] @@ -3456,7 +3456,7 @@ checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" [[package]] name = "issue1317" -version = "3.117.0" +version = "3.118.0" dependencies = [ "actix-web", "env_logger 0.11.5", @@ -3466,7 +3466,7 @@ dependencies = [ [[package]] name = "issue1776" -version = "3.117.0" +version = "3.118.0" dependencies = [ "errno 0.3.9", "libc", @@ -3475,7 +3475,7 @@ dependencies = [ [[package]] name = "issue1776portnot53" -version = "3.117.0" +version = "3.118.0" dependencies = [ "libc", "socket2", @@ -3483,14 +3483,14 @@ dependencies = [ [[package]] name = "issue1899" -version = "3.117.0" +version = "3.118.0" dependencies = [ "libc", ] [[package]] name = "issue2001" -version = "3.117.0" +version = "3.118.0" dependencies = [ "libc", ] @@ -3815,7 +3815,7 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "listen_ports" -version = "3.117.0" +version = "3.118.0" [[package]] name = "local-channel" @@ -4053,7 +4053,7 @@ checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" [[package]] name = "mirrord" -version = "3.117.0" +version = "3.118.0" dependencies = [ "actix-codec", "clap", @@ -4085,7 +4085,7 @@ dependencies = [ "rcgen", "regex", "reqwest 0.12.7", - "rstest 0.21.0", + "rstest", "rustls 0.23.13", "rustls-pemfile 2.1.3", "semver 1.0.23", @@ -4107,7 +4107,7 @@ dependencies = [ [[package]] name = "mirrord-agent" -version = "3.117.0" +version = "3.118.0" dependencies = [ "actix-codec", "async-trait", @@ -4141,7 +4141,7 @@ dependencies = [ "rawsocket", "rcgen", "regex", - "rstest 0.21.0", + "rstest", "rustls 0.23.13", "semver 1.0.23", "serde", @@ -4164,7 +4164,7 @@ dependencies = [ [[package]] name = "mirrord-analytics" -version = "3.117.0" +version = "3.118.0" dependencies = [ "assert-json-diff", "base64 0.22.1", @@ -4178,7 +4178,7 @@ dependencies = [ [[package]] name = "mirrord-auth" -version = "3.117.0" +version = "3.118.0" dependencies = [ "bcder", "chrono", @@ -4199,7 +4199,7 @@ dependencies = [ [[package]] name = "mirrord-config" -version = "3.117.0" +version = "3.118.0" dependencies = [ "bimap", "bitflags 2.6.0", @@ -4208,7 +4208,7 @@ dependencies = [ "mirrord-analytics", "mirrord-config-derive", "nom", - "rstest 0.21.0", + "rstest", "schemars", "serde", "serde_json", @@ -4221,7 +4221,7 @@ dependencies = [ [[package]] name = "mirrord-config-derive" -version = "3.117.0" +version = "3.118.0" dependencies = [ "proc-macro2", "proc-macro2-diagnostics", @@ -4231,7 +4231,7 @@ dependencies = [ [[package]] name = "mirrord-console" -version = "3.117.0" +version = "3.118.0" dependencies = [ "bincode", "drain", @@ -4247,7 +4247,7 @@ dependencies = [ [[package]] name = "mirrord-intproxy" -version = "3.117.0" +version = "3.118.0" dependencies = [ "bytes", "futures", @@ -4274,7 +4274,7 @@ dependencies = [ [[package]] name = "mirrord-intproxy-protocol" -version = "3.117.0" +version = "3.118.0" dependencies = [ "bincode", "mirrord-protocol", @@ -4284,7 +4284,7 @@ dependencies = [ [[package]] name = "mirrord-kube" -version = "3.117.0" +version = "3.118.0" dependencies = [ "actix-codec", "async-stream", @@ -4301,7 +4301,7 @@ dependencies = [ "pin-project-lite", "rand", "regex", - "rstest 0.22.0", + "rstest", "serde", "serde_json", "shellexpand", @@ -4314,7 +4314,7 @@ dependencies = [ [[package]] name = "mirrord-layer" -version = "3.117.0" +version = "3.118.0" dependencies = [ "actix-codec", "base64 0.22.1", @@ -4346,7 +4346,7 @@ dependencies = [ "rand", "regex", "resolv-conf", - "rstest 0.22.0", + "rstest", "serde_json", "socket2", "syscalls", @@ -4362,7 +4362,7 @@ dependencies = [ [[package]] name = "mirrord-layer-macro" -version = "3.117.0" +version = "3.118.0" dependencies = [ "proc-macro2", "quote", @@ -4371,7 +4371,7 @@ dependencies = [ [[package]] name = "mirrord-macros" -version = "3.117.0" +version = "3.118.0" dependencies = [ "proc-macro2", "proc-macro2-diagnostics", @@ -4381,7 +4381,7 @@ dependencies = [ [[package]] name = "mirrord-operator" -version = "3.117.0" +version = "3.118.0" dependencies = [ "base64 0.22.1", "bincode", @@ -4401,7 +4401,7 @@ dependencies = [ "mirrord-protocol", "rand", "reqwest 0.12.7", - "rstest 0.21.0", + "rstest", "schemars", "semver 1.0.23", "serde", @@ -4415,7 +4415,7 @@ dependencies = [ [[package]] name = "mirrord-progress" -version = "3.117.0" +version = "3.118.0" dependencies = [ "enum_dispatch", "indicatif", @@ -4449,7 +4449,7 @@ dependencies = [ [[package]] name = "mirrord-sip" -version = "3.117.0" +version = "3.118.0" dependencies = [ "apple-codesign", "object 0.36.4", @@ -4462,7 +4462,7 @@ dependencies = [ [[package]] name = "mirrord-vpn" -version = "3.117.0" +version = "3.118.0" dependencies = [ "futures", "ipnet", @@ -4812,7 +4812,7 @@ dependencies = [ [[package]] name = "outgoing" -version = "3.117.0" +version = "3.118.0" [[package]] name = "outref" @@ -5851,19 +5851,7 @@ checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" dependencies = [ "futures", "futures-timer", - "rstest_macros 0.21.0", - "rustc_version", -] - -[[package]] -name = "rstest" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b423f0e62bdd61734b67cd21ff50871dfaeb9cc74f869dcd6af974fbcb19936" -dependencies = [ - "futures", - "futures-timer", - "rstest_macros 0.22.0", + "rstest_macros", "rustc_version", ] @@ -5885,34 +5873,16 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "rstest_macros" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e1711e7d14f74b12a58411c542185ef7fb7f2e7f8ee6e2940a883628522b42" -dependencies = [ - "cfg-if", - "glob", - "proc-macro-crate", - "proc-macro2", - "quote", - "regex", - "relative-path", - "rustc_version", - "syn 2.0.77", - "unicode-ident", -] - [[package]] name = "rust-bypassed-unix-socket" -version = "3.117.0" +version = "3.118.0" dependencies = [ "tokio", ] [[package]] name = "rust-e2e-fileops" -version = "3.117.0" +version = "3.118.0" dependencies = [ "libc", ] @@ -5928,7 +5898,7 @@ dependencies = [ [[package]] name = "rust-unix-socket-client" -version = "3.117.0" +version = "3.118.0" dependencies = [ "tokio", ] @@ -6908,7 +6878,7 @@ dependencies = [ "rand", "regex", "reqwest 0.12.7", - "rstest 0.21.0", + "rstest", "rustls 0.23.13", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index a2dd1b002f5..41296645d3a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ resolver = "2" # latest commits on rustls suppress certificate verification [workspace.package] -version = "3.117.0" +version = "3.118.0" edition = "2021" license = "MIT" readme = "README.md" diff --git a/changelog.d/+bump-dependencies.changed.md b/changelog.d/+bump-dependencies.changed.md deleted file mode 100644 index d2e6dfe6315..00000000000 --- a/changelog.d/+bump-dependencies.changed.md +++ /dev/null @@ -1 +0,0 @@ -Bump dependencies \ No newline at end of file diff --git a/changelog.d/+sqs-tests.internal.md b/changelog.d/+sqs-tests.internal.md deleted file mode 100644 index cb69846bf66..00000000000 --- a/changelog.d/+sqs-tests.internal.md +++ /dev/null @@ -1 +0,0 @@ -E2E tests for SQS splitting. diff --git a/changelog.d/2652.changed.md b/changelog.d/2652.changed.md deleted file mode 100644 index dd12b53ea5c..00000000000 --- a/changelog.d/2652.changed.md +++ /dev/null @@ -1 +0,0 @@ -Increase timeout of layer-intproxy socket connection to a ludicrous amount. \ No newline at end of file diff --git a/changelog.d/2750.changed.md b/changelog.d/2750.changed.md deleted file mode 100644 index e3df17fce49..00000000000 --- a/changelog.d/2750.changed.md +++ /dev/null @@ -1 +0,0 @@ -Have intproxy log to a file in /tmp by default. \ No newline at end of file diff --git a/changelog.d/2756.added.md b/changelog.d/2756.added.md deleted file mode 100644 index b06a66ebc48..00000000000 --- a/changelog.d/2756.added.md +++ /dev/null @@ -1,10 +0,0 @@ -Add `cli_extra_args` field to `container` config to allow specifing custom arguments for `mirrord container` sidecar container. - -```json -{ - "container": { - "cli_extra_args": ["--network", "host"] - } -} -``` -this config will spawn mirrord cli container with ` run --network host --rm -d ...`. diff --git a/changelog.d/2759.fixed.md b/changelog.d/2759.fixed.md deleted file mode 100644 index b4b10c1a92c..00000000000 --- a/changelog.d/2759.fixed.md +++ /dev/null @@ -1 +0,0 @@ -Add a retry for port-forward agent connection if error was recived via error channel after websocket was established.