Everything now lives under the Vault namespace

abedra · Jan 20, 2020 · c1b119e · c1b119e
1 parent bc280b4
commit c1b119e
Show file tree

Hide file tree

Showing 25 changed files with 646 additions and 614 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -21,7 +21,7 @@ include_directories("${CMAKE_SOURCE_DIR}/lib")
 
 add_library(vault SHARED
     include/VaultClient.h
-    src/VaultHttpConsumer.cpp
+    src/HttpConsumer.cpp
     src/VaultClient.cpp
     src/HttpClient.cpp
     src/KeyValue.cpp
@@ -31,9 +31,9 @@ add_library(vault SHARED
     src/WrappedSecretAppRoleStrategy.cpp
     src/Base64.cpp
     src/LdapStrategy.cpp
-    src/VaultConfigBuilder.cpp
+    src/ConfigBuilder.cpp
     src/AppRole.cpp
-    src/Sys.cpp)
+    src/Sys.cpp )
 
 set_target_properties(vault PROPERTIES
   VERSION ${PROJECT_VERSION}

diff --git a/README.md b/README.md
@@ -27,19 +27,22 @@ The following example shows both a secret put and get. The most common scenario
 
 int main(void)
 {
-  HttpErrorCallback httpErrorCallback = [&](std::string err) {
+  Vault::HttpErrorCallback httpErrorCallback = [&](std::string err) {
     std::cout << err << std::endl;
   };
 
-  auto config = VaultConfigBuilder().build();
-  AppRoleStrategy authStrategy{Vault::RoleId{"<role_id>"}, Vault::SecretId{"<secret_id>"}};
-  VaultClient vaultClient{config, authStrategy, httpErrorCallback};
+  Vault::Config config = Vault::ConfigBuilder().build();
+  Vault::AppRoleStrategy authStrategy{
+    Vault::RoleId{"<role_id>"},
+    Vault::SecretId{"<secret_id>"}
+  };
+  Vault::Client vaultClient{config, authStrategy, httpErrorCallback};
 
-  KeyValue kv{vaultClient, KeyValue::Version::v1};
+  Vault::KeyValue kv{vaultClient, Vault::KeyValue::Version::v1};
   Vault::Path mount{"/test"};
-  KeyValue kv2{vaultClient, mount};
+  Vault::KeyValue kv2{vaultClient, mount};
 
-  Parameters parameters(
+  Vault::Parameters parameters(
     {
       {"foo","world"},
       {"baz","quux"},

diff --git a/example/example.cpp b/example/example.cpp
@@ -3,19 +3,22 @@
 
 int main(void)
 {
-  HttpErrorCallback httpErrorCallback = [&](std::string err) {
+  Vault::HttpErrorCallback httpErrorCallback = [&](std::string err) {
     std::cout << err << std::endl;
   };
 
-  auto config = VaultConfigBuilder().build();
-  AppRoleStrategy authStrategy{Vault::RoleId{"<role_id>"}, Vault::SecretId{"<secret_id>"}};
-  VaultClient vaultClient{config, authStrategy, httpErrorCallback};
+  Vault::Config config = Vault::ConfigBuilder().build();
+  Vault::AppRoleStrategy authStrategy{
+    Vault::RoleId{"<role_id>"},
+    Vault::SecretId{"<secret_id>"}
+  };
+  Vault::Client vaultClient{config, authStrategy, httpErrorCallback};
 
-  KeyValue kv{vaultClient, KeyValue::Version::v1};
+  Vault::KeyValue kv{vaultClient, Vault::KeyValue::Version::v1};
   Vault::Path mount{"/test"};
-  KeyValue kv2{vaultClient, mount};
+  Vault::KeyValue kv2{vaultClient, mount};
 
-  Parameters parameters(
+  Vault::Parameters parameters(
     {
       {"foo","world"},
       {"baz","quux"},