From 0716cc1bcc1807dc6bf6aab164a0170ae0036735 Mon Sep 17 00:00:00 2001
From: Tobin Feldman-Fitzthum <tobin@ibm.com>
Date: Mon, 16 Dec 2024 16:16:58 -0600
Subject: [PATCH] rvps: adjust docker compose and k8s configs for rvps

Adjust various configs to match the new RVPS config

Signed-off-by: Tobin Feldman-Fitzthum <tobin@ibm.com>
---
 docker-compose.yml                         | 5 +++++
 kbs/config/kbs-config.toml                 | 1 -
 kbs/config/kubernetes/base/kbs-config.toml | 1 -
 kbs/config/rvps.json                       | 9 ++++-----
 kbs/test/config/kbs.toml                   | 1 -
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7d72c7f7a..1e1b7e34a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -52,6 +52,11 @@ services:
     volumes:
       - ./kbs/data/reference-values:/opt/confidential-containers/attestation-service/reference_values:rw
       - ./kbs/config/rvps.json:/etc/rvps.json:rw
+    command: [
+      "rvps",
+      "--address",
+      "0.0.0.0:50003"
+    ]
 
   keyprovider:
     image: ghcr.io/confidential-containers/coco-keyprovider:latest
diff --git a/kbs/config/kbs-config.toml b/kbs/config/kbs-config.toml
index f4f17b704..c5823fec5 100644
--- a/kbs/config/kbs-config.toml
+++ b/kbs/config/kbs-config.toml
@@ -15,7 +15,6 @@ duration_min = 5
 
 [attestation_service.rvps_config]
 type = "BuiltIn"
-store_type = "LocalFs"
 
 [policy_engine]
 policy_path = "/opa/confidential-containers/kbs/policy.rego"
diff --git a/kbs/config/kubernetes/base/kbs-config.toml b/kbs/config/kubernetes/base/kbs-config.toml
index dbad9b055..5d1b228d1 100644
--- a/kbs/config/kubernetes/base/kbs-config.toml
+++ b/kbs/config/kubernetes/base/kbs-config.toml
@@ -20,7 +20,6 @@ key_path = "/kbs/as-private-key.pem"
 
 [attestation_service.rvps_config]
 type = "BuiltIn"
-store_type = "LocalFs"
 
 [admin]
 auth_public_key = "/kbs/kbs.pem"
diff --git a/kbs/config/rvps.json b/kbs/config/rvps.json
index fd0bdac3f..13e84414a 100644
--- a/kbs/config/rvps.json
+++ b/kbs/config/rvps.json
@@ -1,7 +1,6 @@
 {
-    "address": "0.0.0.0:50003",
-    "store_type": "LocalFs",
-    "store_config": {
-        "file_path": "/opt/confidential-containers/attestation-service/reference_values"
+    "storage": {
+	"type":"LocalFs",
+	"file_path": "/opt/confidential-containers/attestation-service/reference_values"
     }
-}
\ No newline at end of file
+}
diff --git a/kbs/test/config/kbs.toml b/kbs/test/config/kbs.toml
index f2f0d26dd..386d18390 100644
--- a/kbs/test/config/kbs.toml
+++ b/kbs/test/config/kbs.toml
@@ -22,7 +22,6 @@ cert_path = "./work/token-cert-chain.pem"
 
 [attestation_service.rvps_config]
 type = "BuiltIn"
-store_type = "LocalFs"
 
 [policy_engine]
 policy_path = "./work/kbs-policy.rego"