diff --git a/.github/workflows/dockers-agent-faiss-image.yaml b/.github/workflows/dockers-agent-faiss-image.yaml index 199fa8fcdc..cbe8c856b8 100644 --- a/.github/workflows/dockers-agent-faiss-image.yaml +++ b/.github/workflows/dockers-agent-faiss-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: agent-faiss uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-agent-image.yaml b/.github/workflows/dockers-agent-image.yaml index 400f4dddb1..3a432b5219 100644 --- a/.github/workflows/dockers-agent-image.yaml +++ b/.github/workflows/dockers-agent-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: agent uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-agent-ngt-image.yaml b/.github/workflows/dockers-agent-ngt-image.yaml index 9ece9870c3..6ef690f4e0 100644 --- a/.github/workflows/dockers-agent-ngt-image.yaml +++ b/.github/workflows/dockers-agent-ngt-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: agent-ngt uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-agent-sidecar-image.yaml b/.github/workflows/dockers-agent-sidecar-image.yaml index 5d24404c24..632a68adac 100644 --- a/.github/workflows/dockers-agent-sidecar-image.yaml +++ b/.github/workflows/dockers-agent-sidecar-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: agent-sidecar uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-benchmark-job-image.yaml b/.github/workflows/dockers-benchmark-job-image.yaml index 7ef9319ee5..738f1d3b1f 100644 --- a/.github/workflows/dockers-benchmark-job-image.yaml +++ b/.github/workflows/dockers-benchmark-job-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: benchmark-job uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-benchmark-operator-image.yaml b/.github/workflows/dockers-benchmark-operator-image.yaml index 4414425e70..808fe57463 100644 --- a/.github/workflows/dockers-benchmark-operator-image.yaml +++ b/.github/workflows/dockers-benchmark-operator-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: benchmark-operator uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-binfmt-image.yaml b/.github/workflows/dockers-binfmt-image.yaml index e49b959dae..ecc1760097 100644 --- a/.github/workflows/dockers-binfmt-image.yaml +++ b/.github/workflows/dockers-binfmt-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: binfmt platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/dockers-buildbase-image.yaml b/.github/workflows/dockers-buildbase-image.yaml index 42c1aea523..3c547fec72 100644 --- a/.github/workflows/dockers-buildbase-image.yaml +++ b/.github/workflows/dockers-buildbase-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: buildbase platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/dockers-buildkit-image.yaml b/.github/workflows/dockers-buildkit-image.yaml index ed244aa50c..1a2d0dcbe0 100644 --- a/.github/workflows/dockers-buildkit-image.yaml +++ b/.github/workflows/dockers-buildkit-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: buildkit platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/dockers-buildkit-syft-scanner-image.yaml b/.github/workflows/dockers-buildkit-syft-scanner-image.yaml index e86fca5eaa..54bc849c6b 100644 --- a/.github/workflows/dockers-buildkit-syft-scanner-image.yaml +++ b/.github/workflows/dockers-buildkit-syft-scanner-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: buildkit-syft-scanner platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/dockers-dev-container-image.yaml b/.github/workflows/dockers-dev-container-image.yaml index d55dcf1302..b8a117be89 100644 --- a/.github/workflows/dockers-dev-container-image.yaml +++ b/.github/workflows/dockers-dev-container-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: dev-container uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-discoverer-k8s-image.yaml b/.github/workflows/dockers-discoverer-k8s-image.yaml index f2bea475be..28a5eed705 100644 --- a/.github/workflows/dockers-discoverer-k8s-image.yaml +++ b/.github/workflows/dockers-discoverer-k8s-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: discoverer-k8s uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-e2e-image.yaml b/.github/workflows/dockers-e2e-image.yaml index d212fde82d..472847e174 100644 --- a/.github/workflows/dockers-e2e-image.yaml +++ b/.github/workflows/dockers-e2e-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: e2e uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-example-client-image.yaml b/.github/workflows/dockers-example-client-image.yaml index bb81f28e70..9e14d981d3 100644 --- a/.github/workflows/dockers-example-client-image.yaml +++ b/.github/workflows/dockers-example-client-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: example-client uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-gateway-filter-image.yaml b/.github/workflows/dockers-gateway-filter-image.yaml index 542fab48ad..5b699ded05 100644 --- a/.github/workflows/dockers-gateway-filter-image.yaml +++ b/.github/workflows/dockers-gateway-filter-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: gateway-filter uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-gateway-lb-image.yaml b/.github/workflows/dockers-gateway-lb-image.yaml index 0df13d8f9b..4e338269db 100644 --- a/.github/workflows/dockers-gateway-lb-image.yaml +++ b/.github/workflows/dockers-gateway-lb-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: gateway-lb uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-gateway-mirror-image.yaml b/.github/workflows/dockers-gateway-mirror-image.yaml index 9dc3bcb76d..34641a864c 100644 --- a/.github/workflows/dockers-gateway-mirror-image.yaml +++ b/.github/workflows/dockers-gateway-mirror-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: gateway-mirror uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-helm-operator-image.yaml b/.github/workflows/dockers-helm-operator-image.yaml index fa2e32b251..2a4e4bb11c 100644 --- a/.github/workflows/dockers-helm-operator-image.yaml +++ b/.github/workflows/dockers-helm-operator-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: helm-operator uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-index-correction-image.yaml b/.github/workflows/dockers-index-correction-image.yaml index 61a11b0d65..5a550b9944 100644 --- a/.github/workflows/dockers-index-correction-image.yaml +++ b/.github/workflows/dockers-index-correction-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: index-correction uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-index-creation-image.yaml b/.github/workflows/dockers-index-creation-image.yaml index 082b135d54..2354068d11 100644 --- a/.github/workflows/dockers-index-creation-image.yaml +++ b/.github/workflows/dockers-index-creation-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: index-creation uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-index-deletion-image.yaml b/.github/workflows/dockers-index-deletion-image.yaml index 2252b23409..9f3bb12038 100644 --- a/.github/workflows/dockers-index-deletion-image.yaml +++ b/.github/workflows/dockers-index-deletion-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: index-deletion uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-index-exportation-image.yaml b/.github/workflows/dockers-index-exportation-image.yaml index a3736db6cc..ca8f44e4f9 100644 --- a/.github/workflows/dockers-index-exportation-image.yaml +++ b/.github/workflows/dockers-index-exportation-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: index-exportation uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-index-operator-image.yaml b/.github/workflows/dockers-index-operator-image.yaml index c4dbcf42c0..f56d1fe732 100644 --- a/.github/workflows/dockers-index-operator-image.yaml +++ b/.github/workflows/dockers-index-operator-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: index-operator uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-index-save-image.yaml b/.github/workflows/dockers-index-save-image.yaml index c15504dc1a..18cb0f23cb 100644 --- a/.github/workflows/dockers-index-save-image.yaml +++ b/.github/workflows/dockers-index-save-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: index-save uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-manager-index-image.yaml b/.github/workflows/dockers-manager-index-image.yaml index b0987ef506..cb8f0cf5c2 100644 --- a/.github/workflows/dockers-manager-index-image.yaml +++ b/.github/workflows/dockers-manager-index-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: manager-index uses: ./.github/workflows/_docker-image.yaml diff --git a/.github/workflows/dockers-readreplica-rotate-image.yaml b/.github/workflows/dockers-readreplica-rotate-image.yaml index fe495805f3..2f1a89875f 100644 --- a/.github/workflows/dockers-readreplica-rotate-image.yaml +++ b/.github/workflows/dockers-readreplica-rotate-image.yaml @@ -26,6 +26,7 @@ jobs: SLACK_NOTIFY_WEBHOOK_URL: ${{ secrets.SLACK_NOTIFY_WEBHOOK_URL }} permissions: contents: read + security-events: write with: target: readreplica-rotate uses: ./.github/workflows/_docker-image.yaml diff --git a/charts/vald/values.schema.json b/charts/vald/values.schema.json index df3d3e6be4..1e9a186711 100644 --- a/charts/vald/values.schema.json +++ b/charts/vald/values.schema.json @@ -11107,13 +11107,10 @@ "type": "string", "description": "image pull policy", "enum": ["Always", "Never", "IfNotPresent"] -<<<<<<< HEAD -======= }, "registry": { "type": "string", "description": "image registry (overrides defaults.image.registry)" ->>>>>>> d50c5e731 (add ADOPTERS.md, MAINTAINERS.md (#3556)) }, "repository": { "type": "string", diff --git a/hack/docker/gen/main.go b/hack/docker/gen/main.go index e209f26337..52928b1f8d 100644 --- a/hack/docker/gen/main.go +++ b/hack/docker/gen/main.go @@ -1030,7 +1030,8 @@ jobs: workflow.Jobs.Build.With.Platforms = data.BuildPlatforms workflow.Jobs.Build.Permissions = map[string]string{ - "contents": "read", + "contents": "read", + "security-events": "write", } workflow.Jobs.Build.Secrets = map[string]string{ diff --git a/rust/bin/agent/Cargo.toml b/rust/bin/agent/Cargo.toml index 3239343d85..f7a8547251 100644 --- a/rust/bin/agent/Cargo.toml +++ b/rust/bin/agent/Cargo.toml @@ -23,12 +23,7 @@ edition = "2024" [dependencies] algorithm = { version = "0.1.0", path = "../../libs/algorithm" } qbg = { version = "0.1.0", path = "../../libs/algorithms/qbg" } -<<<<<<< HEAD -anyhow = "1.0.102" -cargo = "0.95.0" -======= anyhow = "1.0.103" ->>>>>>> d50c5e731 (add ADOPTERS.md, MAINTAINERS.md (#3556)) chrono = "0.4.45" config = "0.15.25" flexi_logger = "0.31" diff --git a/rust/libs/kvs/src/lib.rs b/rust/libs/kvs/src/lib.rs index 02bae4783f..2cc1b764e2 100644 --- a/rust/libs/kvs/src/lib.rs +++ b/rust/libs/kvs/src/lib.rs @@ -23,14 +23,6 @@ //! //! The implementation uses `sled` as its underlying persistent storage engine to leverage //! its robust transactional capabilities, ensuring data consistency for bidirectional mappings. -<<<<<<< HEAD -use bincode::{Decode, Encode, config::standard as bincode_standard}; -use futures::{Stream, StreamExt}; -use serde::{Serialize, de::DeserializeOwned}; -use sled::{ - Db, IVec, Tree, - transaction::{ConflictableTransactionError, TransactionError, Transactional}, -======= use std::{path::Path, sync::Arc}; @@ -40,7 +32,6 @@ use crate::map::{ base::MapBase, codec::{Codec, WincodeCodec}, error::Error, ->>>>>>> eb66fdc3e (Migrate from bincode to wincode (#3448)) }; use std::borrow::Borrow; use std::fmt::Debug; @@ -54,106 +45,6 @@ use tracing::instrument; /// Custom error type for all operations within the `BidiMap`. /// -<<<<<<< HEAD -/// This enum consolidates errors from various sources into a single, well-defined -/// error type, making error handling for the library's users more straightforward. -#[derive(Error, Debug)] -pub enum BidiError { - #[error("item not found")] - NotFound, - /// Errors from the underlying `sled` database. - #[error("sled db error")] - Sled(#[from] sled::Error), - /// I/O errors. - #[error("I/O error")] - Io(#[from] std::io::Error), - /// Errors that occur during a `sled` transaction, including conflicts or custom aborts. - #[error("sled transaction error")] - SledTransaction { - #[source] - source: Box, - }, - /// Error during serialization or deserialization. - #[error("codec error")] - Codec { - #[source] - source: Box, - }, - /// Error related to internal Tokio task management, typically from `spawn_blocking`. - #[error("internal task error")] - Internal(#[from] tokio::task::JoinError), -} - -/// A trait for defining custom serialization and deserialization logic. -/// -/// This allows `BidiMap` to be generic over the data format, enabling users to -/// plug in their preferred serialization framework (e.g., Bincode, JSON, Protobuf). -pub trait Codec: Send + Sync + 'static { - /// Serializes a given value into a byte vector. - fn encode(&self, v: &T) -> Result, BidiError>; - /// Deserializes a byte slice into a value of a specific type. - fn decode>(&self, bytes: &[u8]) -> Result; -} - -/// The default codec implementation using `bincode`. -#[derive(Clone, Debug, Default)] -pub struct BincodeCodec; - -impl Codec for BincodeCodec { - fn encode(&self, v: &T) -> Result, BidiError> { - bincode::encode_to_vec(v, bincode_standard()).map_err(|e| BidiError::Codec { - source: Box::new(e), - }) - } - - fn decode>(&self, bytes: &[u8]) -> Result { - bincode::decode_from_slice(bytes, bincode_standard()) - .map(|(decoded, _)| decoded) - .map_err(|e| BidiError::Codec { - source: Box::new(e), - }) - } -} - -/// A builder for constructing a `BidiMap` instance with custom configurations. -pub struct BidiBuilder { - path: String, - codec: C, - scan_on_startup: bool, - _marker: std::marker::PhantomData<(K, V)>, -} - -impl BidiBuilder -where - K: Serialize - + DeserializeOwned - + Encode - + Decode<()> - + Eq - + Hash - + Clone - + Send - + Sync - + Debug - + 'static, - V: Serialize - + DeserializeOwned - + Encode - + Decode<()> - + Eq - + Hash - + Clone - + Send - + Sync - + Debug - + 'static, -{ - /// Creates a new `BidiBuilder` with a specified database path and the default `BincodeCodec`. - pub fn new(path: impl AsRef) -> Self { - Self { - path: path.as_ref().to_string(), - codec: BincodeCodec::default(), -======= /// This builder allows for configuration of the map before it is created, /// such as setting the path, codec, and startup behavior. pub struct MapBuilder { @@ -177,7 +68,6 @@ impl> MapBuilder { path: path.as_ref().to_string(), codec: WincodeCodec::default(), config: Config::default(), ->>>>>>> eb66fdc3e (Migrate from bincode to wincode (#3448)) scan_on_startup: true, _marker: std::marker::PhantomData, } @@ -558,17 +448,10 @@ mod integration_tests { (path, guard) } -<<<<<<< HEAD - #[tokio::test] - async fn test_crud_and_len() { - let (path, _guard) = setup("crud_and_len"); - let map = BidiBuilder::new(&path).build().await.unwrap(); -======= async fn test_crud_and_len>( path: &str, ) -> Arc { let map = MapBuilder::::new(path).build().await.unwrap(); ->>>>>>> eb66fdc3e (Migrate from bincode to wincode (#3448)) assert_eq!(map.len(), 0); map.set("alpha".to_string(), "one".to_string(), 123) @@ -597,11 +480,6 @@ mod integration_tests { } #[tokio::test] -<<<<<<< HEAD - async fn test_delete_inverse() { - let (path, _guard) = setup("delete_inverse"); - let map = BidiBuilder::new(&path).build().await.unwrap(); -======= async fn test_bidirectional_map_crud_and_len() { let (path, _guard) = setup("bidirectional_map_crud_and_len"); @@ -624,7 +502,6 @@ mod integration_tests { .build() .await .unwrap(); ->>>>>>> eb66fdc3e (Migrate from bincode to wincode (#3448)) map.set("a".to_string(), "1".to_string(), 1).await.unwrap(); assert_eq!(map.len(), 1); @@ -635,15 +512,8 @@ mod integration_tests { assert!(map.get_inverse("1").await.is_err()); } -<<<<<<< HEAD - #[tokio::test] - async fn test_range_callback() { - let (path, _guard) = setup("range_callback"); - let map = BidiBuilder::new(&path).build().await.unwrap(); -======= async fn test_range_callback>(path: &str) { let map = MapBuilder::::new(&path).build().await.unwrap(); ->>>>>>> eb66fdc3e (Migrate from bincode to wincode (#3448)) let mut expected = HashMap::new(); for i in 0..10 { let k = format!("key{}", i); @@ -667,11 +537,6 @@ mod integration_tests { } #[tokio::test] -<<<<<<< HEAD - async fn test_range_stream() { - let (path, _guard) = setup("range_stream"); - let map = BidiBuilder::new(&path).build().await.unwrap(); -======= async fn test_bidirectional_map_range_callback() { let (path, _guard) = setup("bidirectional_map_range_callback"); test_range_callback::>(&path).await; @@ -685,7 +550,6 @@ mod integration_tests { async fn test_range_stream>(path: &str) { let map = MapBuilder::::new(path).build().await.unwrap(); ->>>>>>> eb66fdc3e (Migrate from bincode to wincode (#3448)) let mut expected = HashMap::new(); for i in 0..10 { let k = format!("key{}", i); @@ -707,10 +571,6 @@ mod integration_tests { } #[tokio::test] -<<<<<<< HEAD - async fn test_disable_scan_on_startup() { - let (path, _guard) = setup("disable_scan_on_startup"); -======= async fn test_bidirectional_map_range_stream() { let (path, _guard) = setup("bidirectional_map_range_stream"); test_range_stream::>(&path).await; @@ -725,7 +585,6 @@ mod integration_tests { async fn test_disable_scan_on_startup>( path: &str, ) { ->>>>>>> eb66fdc3e (Migrate from bincode to wincode (#3448)) { let map = BidiBuilder::::new(&path) .build() @@ -749,11 +608,6 @@ mod integration_tests { } #[tokio::test] -<<<<<<< HEAD - async fn test_concurrent_access() { - let (path, _guard) = setup("concurrent_access"); - let map = BidiBuilder::new(&path).build().await.unwrap(); -======= async fn test_bidirectional_map_disable_scan_on_startup() { let (path, _guard) = setup("bidirectional_map_disable_scan_on_startup"); test_disable_scan_on_startup::>(&path).await; @@ -775,7 +629,6 @@ mod integration_tests { Fut2: Future + Send, { let map = MapBuilder::::new(&path).build().await.unwrap(); ->>>>>>> eb66fdc3e (Migrate from bincode to wincode (#3448)) let num_items = 100; let items: Vec<_> = (0..num_items) @@ -832,8 +685,6 @@ mod integration_tests { assert_eq!(map.len(), 0); } -<<<<<<< HEAD -======= #[tokio::test] async fn test_bidirectional_map_concurrent_access() { @@ -884,5 +735,4 @@ mod integration_tests { }; test_concurrent_access(&path, f1, f2).await; } ->>>>>>> eb66fdc3e (Migrate from bincode to wincode (#3448)) } diff --git a/versions/RUST_VERSION b/versions/RUST_VERSION index df83a51c6c..4d00f49dad 100644 --- a/versions/RUST_VERSION +++ b/versions/RUST_VERSION @@ -1 +1 @@ -1.94.1 +1.97.1