CR1 updates

Author: artem-v

config-vault/src/main/java/io/scalecube/config/vault/VaultConfigSource.java

@@ -2,7 +2,6 @@
 
 import com.bettercloud.vault.EnvironmentLoader;
 import com.bettercloud.vault.VaultConfig;
-import com.bettercloud.vault.VaultException;
 import com.bettercloud.vault.response.LogicalResponse;
 import io.scalecube.config.ConfigProperty;
 import io.scalecube.config.ConfigSourceNotAvailableException;
@@ -45,16 +44,13 @@ private VaultConfigSource(VaultInvoker vault, String secretsPath) {
   public Map<String, ConfigProperty> loadConfig() {
     try {
       LogicalResponse response = vault.invoke(vault -> vault.logical().read(secretsPath));
-      if (response.getRestResponse().getStatus() == 404) {
-        throw new ConfigSourceNotAvailableException("unable to load config properties");
-      }
       return response.getData().entrySet().stream()
           .map(LoadedConfigProperty::withNameAndValue)
           .map(LoadedConfigProperty.Builder::build)
           .collect(Collectors.toMap(LoadedConfigProperty::name, Function.identity()));
-    } catch (VaultException vaultException) {
-      LOGGER.warn("unable to load config properties", vaultException);
-      throw new ConfigSourceNotAvailableException(vaultException);
+    } catch (Exception ex) {
+      LOGGER.warn("unable to load config properties", ex);
+      throw new ConfigSourceNotAvailableException(ex);
     }
   }
 

config-vault/src/main/java/io/scalecube/config/vault/VaultInvoker.java

@@ -8,7 +8,7 @@
 import com.bettercloud.vault.response.LookupResponse;
 import com.bettercloud.vault.response.VaultResponse;
 import com.bettercloud.vault.rest.RestResponse;
-import io.scalecube.config.ConfigSourceNotAvailableException;
+import io.scalecube.config.utils.ThrowableUtil;
 import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.Timer;
@@ -23,6 +23,11 @@ public class VaultInvoker {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(VaultInvoker.class);
 
+  private static final int STATUS_CODE_FORBIDDEN = 403;
+  public static final int STATUS_CODE_HELTH_OK = 200;
+  public static final int STATUS_CODE_RESPONSE_OK = 200;
+  public static final int STATUS_CODE_RESPONSE_NO_DATA = 204;
+
   private static final long MIN_REFRESH_MARGIN = TimeUnit.MINUTES.toSeconds(10);
 
   private final Builder config;
@@ -55,7 +60,7 @@ public <T extends VaultResponse> T invoke(VaultCall<T> call) throws VaultExcepti
       return response;
     } catch (VaultException e) {
       // try recreate Vault according to https://www.vaultproject.io/api/overview#http-status-codes
-      if (e.getHttpStatusCode() == 403) {
+      if (e.getHttpStatusCode() == STATUS_CODE_FORBIDDEN) {
         LOGGER.warn("Authentication details are incorrect, occurred during invoking Vault", e);
         vault = recreateVault(vault);
         return call.apply(vault);
@@ -64,7 +69,7 @@ public <T extends VaultResponse> T invoke(VaultCall<T> call) throws VaultExcepti
     }
   }
 
-  private synchronized Vault recreateVault(Vault prev) {
+  private synchronized Vault recreateVault(Vault prev) throws VaultException {
     try {
       if (!Objects.equals(prev, vault) && vault != null) {
         return vault;
@@ -101,12 +106,12 @@ private synchronized Vault recreateVault(Vault prev) {
       this.vault = vault;
     } catch (VaultException e) {
       LOGGER.error("Could not initialize and validate the vault", e);
-      throw new ConfigSourceNotAvailableException(e);
+      throw e;
     }
     return vault;
   }
 
-  private void renewToken() {
+  private void renewToken() throws VaultException {
     Vault vault = this.vault;
     if (vault == null) {
       return;
@@ -133,7 +138,7 @@ private void renewToken() {
       }
     } catch (VaultException e) {
       // try recreate Vault according to https://www.vaultproject.io/api/overview#http-status-codes
-      if (e.getHttpStatusCode() == 403) {
+      if (e.getHttpStatusCode() == STATUS_CODE_FORBIDDEN) {
         LOGGER.warn("Could not renew the Vault token", e);
         //noinspection UnusedAssignment
         vault = recreateVault(vault);
@@ -149,7 +154,7 @@ private void renewToken() {
    */
   private void checkVault(Vault vault) throws VaultException {
     RestResponse restResponse = vault.debug().health().getRestResponse();
-    if (restResponse.getStatus() == 200) {
+    if (restResponse.getStatus() == STATUS_CODE_HELTH_OK) {
       return;
     }
     throw new VaultException(bodyAsString(restResponse), restResponse.getStatus());
@@ -166,13 +171,8 @@ private void checkResponse(RestResponse restResponse) throws VaultException {
     }
     int status = restResponse.getStatus();
     switch (status) {
-      case 200:
-      case 204:
-        return;
-      case 404:
-        LOGGER.warn(
-            "Invalid path (non-existent or have no permissions to view), message: {}",
-            bodyAsString(restResponse));
+      case STATUS_CODE_RESPONSE_OK:
+      case STATUS_CODE_RESPONSE_NO_DATA:
         return;
       default:
         String body = bodyAsString(restResponse);
@@ -202,7 +202,11 @@ private class RenewTokenTask extends TimerTask {
 
     @Override
     public void run() {
-      renewToken();
+      try {
+        renewToken();
+      } catch (Exception e) {
+        throw ThrowableUtil.propagate(e);
+      }
     }
   }