feat(encryption): add kms key management

apache · Jan 18, 2024 · 3124db3 · 3124db3
1 parent 0f32e2c
commit 3124db3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/src/replica/replica_stub.cpp b/src/replica/replica_stub.cpp
@@ -327,12 +327,12 @@ DSN_DEFINE_group_validator(encrypt_data_at_rest_pre_check, [](std::string &messa
     return true;
 });
 
-DSN_DEFINE_group_validator(encrypt_data_not_support_close, [](std::string &message) -> bool {
-    std::string data_dirs;
+DSN_DEFINE_group_validator(encrypt_data_is_irreversible, [](std::string &message) -> bool {
 // In some unit test FLAGS_data_dirs may not set.
-#ifndef MOCK_TEST
+#ifdef MOCK_TEST
     return true;
 #endif
+    std::string data_dirs;
     data_dirs = FLAGS_data_dirs;
     std::vector<std::string> dirs;
     ::absl::StrSplit(data_dirs.c_str(), dirs, ',');

diff --git a/src/security/kms_client.cpp b/src/security/kms_client.cpp
@@ -32,7 +32,6 @@
 #include "security/kms_client.h"
 #include "utils/error_code.h"
 #include "utils/fmt_logging.h"
-#include "utils/ports.h"
 
 namespace dsn {
 namespace security {

diff --git a/src/security/test/CMakeLists.txt b/src/security/test/CMakeLists.txt
@@ -27,7 +27,8 @@ set(MY_PROJ_LIBS
         dsn_replication_common
         dsn_runtime
         dsn_utils
-        gtest)
+        gtest
+        rocksdb)
 set(MY_BINPLACES
         config.ini
         run.sh)

diff --git a/src/test/function_test/security/CMakeLists.txt b/src/test/function_test/security/CMakeLists.txt
@@ -41,6 +41,7 @@ set(MY_PROJ_LIBS
         krb5
         gtest
         function_test_utils
+        rocksdb
         test_utils)
 
 set(MY_BOOST_LIBS Boost::system Boost::filesystem)
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,6 +41,7 @@ set(MY_PROJ_LIBS @@
             krb5
             gtest
             function_test_utils
+            rocksdb
             test_utils)
     set(MY_BOOST_LIBS Boost::system Boost::filesystem)
@@ Expand Down @@