rvps: fixup KBS and AS tests for new RVPS config

We can just use the default config for most of the tests. Signed-off-by: Tobin Feldman-Fitzthum <[email protected]>
confidential-containers · Dec 16, 2024 · f3e2105 · f3e2105
1 parent 72e23a4
commit f3e2105
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/attestation-service/src/config.rs b/attestation-service/src/config.rs
@@ -76,24 +76,22 @@ impl TryFrom<&Path> for Config {
 
 #[cfg(test)]
 mod tests {
-    use std::path::PathBuf;
-
     use rstest::rstest;
-    use serde_json::json;
+    use std::path::PathBuf;
 
     use super::Config;
     use crate::rvps::RvpsCrateConfig;
     use crate::{
         rvps::RvpsConfig,
         token::{ear_broker, simple, AttestationTokenConfig},
     };
+    use reference_value_provider_service::storage::{local_fs, ReferenceValueStorageConfig};
 
     #[rstest]
     #[case("./tests/configs/example1.json", Config {
         work_dir: PathBuf::from("/var/lib/attestation-service/"),
         rvps_config: RvpsConfig::BuiltIn(RvpsCrateConfig {
-            store_type: "LocalFs".into(),
-            store_config: json!({}),
+            storage: ReferenceValueStorageConfig::LocalFs(local_fs::Config::default()),
         }),
         attestation_token_broker: AttestationTokenConfig::Simple(simple::Configuration {
             duration_min: 5,
@@ -105,8 +103,7 @@ mod tests {
     #[case("./tests/configs/example2.json", Config {
         work_dir: PathBuf::from("/var/lib/attestation-service/"),
         rvps_config: RvpsConfig::BuiltIn(RvpsCrateConfig {
-            store_type: "LocalFs".into(),
-            store_config: json!({}),
+            storage: ReferenceValueStorageConfig::LocalFs(local_fs::Config::default()),
         }),
         attestation_token_broker: AttestationTokenConfig::Simple(simple::Configuration {
             duration_min: 5,
@@ -122,8 +119,7 @@ mod tests {
     #[case("./tests/configs/example3.json", Config {
         work_dir: PathBuf::from("/var/lib/attestation-service/"),
         rvps_config: RvpsConfig::BuiltIn(RvpsCrateConfig {
-            store_type: "LocalFs".into(),
-            store_config: json!({}),
+            storage: ReferenceValueStorageConfig::LocalFs(local_fs::Config::default()),
         }),
         attestation_token_broker: AttestationTokenConfig::Ear(ear_broker::Configuration {
             duration_min: 5,
@@ -138,8 +134,7 @@ mod tests {
     #[case("./tests/configs/example4.json", Config {
         work_dir: PathBuf::from("/var/lib/attestation-service/"),
         rvps_config: RvpsConfig::BuiltIn(RvpsCrateConfig {
-            store_type: "LocalFs".into(),
-            store_config: json!({}),
+            storage: ReferenceValueStorageConfig::LocalFs(local_fs::Config::default()),
         }),
         attestation_token_broker: AttestationTokenConfig::Ear(ear_broker::Configuration {
             duration_min: 5,

diff --git a/kbs/src/config.rs b/kbs/src/config.rs
@@ -125,7 +125,6 @@ mod tests {
     };
 
     use rstest::rstest;
-    use serde_json::json;
 
     #[rstest]
     #[case("test_data/configs/coco-as-grpc-1.toml",         KbsConfig {
@@ -293,10 +292,7 @@ mod tests {
                 crate::attestation::config::AttestationServiceConfig::CoCoASBuiltIn(
                     attestation_service::config::Config {
                         work_dir: "/opt/confidential-containers/attestation-service".into(),
-                        rvps_config: RvpsConfig::BuiltIn(RvpsCrateConfig {
-                            store_type: "LocalFs".into(),
-                            store_config: json!({}),
-                        }),
+                        rvps_config: RvpsConfig::BuiltIn(RvpsCrateConfig::default()),
                         attestation_token_broker: AttestationTokenConfig::Simple(simple::Configuration{
                             duration_min: 5,
                             ..Default::default()
@@ -423,10 +419,7 @@ mod tests {
                 crate::attestation::config::AttestationServiceConfig::CoCoASBuiltIn(
                     attestation_service::config::Config {
                         work_dir: "/opt/confidential-containers/attestation-service".into(),
-                        rvps_config: RvpsConfig::BuiltIn(RvpsCrateConfig {
-                            store_type: "LocalFs".into(),
-                            ..Default::default()
-                        }),
+                        rvps_config: RvpsConfig::BuiltIn(RvpsCrateConfig::default()),
                         attestation_token_broker: AttestationTokenConfig::Simple(simple::Configuration {
                             duration_min: 5,
                             policy_dir: "/opt/confidential-containers/attestation-service/simple-policies".into(),