Merge remote-tracking branch 'origin/main'

Author: gangb-tech

.github/workflows/build-with-coverage.yml

@@ -24,7 +24,7 @@ jobs:
   coverage:
     runs-on: ubuntu-latest
     container:
-      image: xd009642/tarpaulin:develop-nightly
+      image: xd009642/tarpaulin:develop
       options: --security-opt seccomp=unconfined
     steps:
       - name: checkout repository
@@ -34,7 +34,7 @@ jobs:
 
       - name: generate code coverage
         run: |
-          cargo +nightly tarpaulin --verbose --workspace --timeout 120 --out Xml
+          cargo tarpaulin --verbose --workspace --timeout 120 --out Xml
 
       - name: upload to codecov.io
         uses: codecov/codecov-action@v2

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "feature-probe-server-sdk"
-version = "1.2.9"
+version = "1.2.10"
 license = "Apache-2.0"
 authors = ["[email protected]"]
 description = "FeatureProbe Server Side SDK for Rust"

Cargo.toml

@@ -109,7 +109,7 @@ impl Distribution {
 fn salt_hash(key: &str, salt: &str, bucket_size: u64) -> u32 {
     let size = 4;
     let mut hasher = sha1::Sha1::new();
-    let data = format!("{}{}", key, salt);
+    let data = format!("{key}{salt}");
     hasher.update(data);
     let hax_value = hasher.finalize();
     let mut v = Vec::with_capacity(size);
@@ -145,6 +145,8 @@ pub struct EvalDetail<T> {
 pub struct Toggle {
     key: String,
     enabled: bool,
+    track_access_events: Option<bool>,
+    last_modified: Option<u64>,
     version: u64,
     for_client: bool,
     disabled_serve: Serve,
@@ -211,7 +213,7 @@ impl Toggle {
                             variation_index: Some(v.index),
                             rule_index: Some(i),
                             version: Some(self.version),
-                            reason: format!("rule {}", i),
+                            reason: format!("rule {i}"),
                         };
                     }
                 }
@@ -220,7 +222,7 @@ impl Toggle {
                     return EvalDetail {
                         rule_index: Some(i),
                         version: Some(self.version),
-                        reason: format!("{:?}", e),
+                        reason: format!("{e:?}"),
                         ..Default::default()
                     };
                 }
@@ -237,7 +239,7 @@ impl Toggle {
             },
             Err(e) => EvalDetail {
                 version: Some(self.version),
-                reason: format!("{:?}", e),
+                reason: format!("{e:?}"),
                 ..Default::default()
             },
         }
@@ -265,6 +267,8 @@ impl Toggle {
         Self {
             key,
             enabled: true,
+            track_access_events: None,
+            last_modified: None,
             default_serve: Serve::Select(0),
             disabled_serve: Serve::Select(0),
             variations: vec![val],
@@ -483,6 +487,7 @@ impl Segment {
 pub struct Repository {
     pub segments: HashMap<String, Segment>,
     pub toggles: HashMap<String, Toggle>,
+    pub events: Option<Value>,
     // TODO: remove option next release
     pub version: Option<u128>,
 }
@@ -492,6 +497,7 @@ impl Default for Repository {
         Repository {
             segments: Default::default(),
             toggles: Default::default(),
+            events: Default::default(),
             version: Some(0),
         }
     }

src/evaluate.rs

@@ -171,7 +171,7 @@ impl FeatureProbe {
         let (value, reason, detail) = match self.eval_detail(toggle, user) {
             None => (
                 default,
-                Some(format!("Toggle:[{}] not exist", toggle)),
+                Some(format!("Toggle:[{toggle}] not exist")),
                 Default::default(),
             ),
             Some(mut d) => match d.value.take() {