Fix vert-x3#33 - Do not fail the retrieval if the config map store is used outside of kubernetes (and marked as optional)

cescoffier · cescoffier · commit 4824def8db15 · 2018-01-11T09:49:25.000+01:00
diff --git a/vertx-config-kubernetes-configmap/src/main/java/io/vertx/config/kubernetes/ConfigMapStore.java b/vertx-config-kubernetes-configmap/src/main/java/io/vertx/config/kubernetes/ConfigMapStore.java
@@ -140,7 +140,12 @@ private Future<String> getToken() {
     // Read from file
     vertx.fileSystem().readFile(KubernetesUtils.OPENSHIFT_KUBERNETES_TOKEN_FILE, ar -> {
       if (ar.failed()) {
-        result.tryFail(ar.cause());
+        if (optional) {
+          this.token = "";
+          result.tryComplete(token);
+        } else {
+          result.tryFail(ar.cause());
+        }
       } else {
         this.token = ar.result().toString();
         result.tryComplete(ar.result().toString());
@@ -165,14 +170,19 @@ private synchronized void getOnContext(Handler<AsyncResult<Buffer>> completionHa
 
     retrieveToken
       .compose(token -> {
+        Future<Buffer> future = Future.future();
+        if (token.isEmpty()) {
+          future.complete(Buffer.buffer("{}"));
+          return future;
+        }
+
         String path = "/api/v1/namespaces/" + namespace;
         if (secret) {
           path += "/secrets/" + name;
         } else {
           path += "/configmaps/" + name;
         }
 
-        Future<Buffer> future = Future.future();
         client.get(path)
           .putHeader("Authorization", "Bearer " + token)
           .send(ar -> {
