[incubator-openwhisk-runtime-ballerina] branch master updated: update run handler to accept more environment variables (#7)

[vv...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vvraskin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-ballerina.git


The following commit(s) were added to refs/heads/master by this push:
     new 0e9f4e7  update run handler to accept more environment variables (#7)
0e9f4e7 is described below

commit 0e9f4e73ef42df965de8695ab701cd1c0e8359f8
Author: Carlos Santana <cs...@apache.org>
AuthorDate: Tue Aug 14 09:51:01 2018 -0400

    update run handler to accept more environment variables (#7)
---
 .../org/ballerinalang/openwhisk/runtime/BallerinaProxy.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ballerina/proxy/src/main/java/org/ballerinalang/openwhisk/runtime/BallerinaProxy.java b/ballerina/proxy/src/main/java/org/ballerinalang/openwhisk/runtime/BallerinaProxy.java
index f03366e..1734ad0 100644
--- a/ballerina/proxy/src/main/java/org/ballerinalang/openwhisk/runtime/BallerinaProxy.java
+++ b/ballerina/proxy/src/main/java/org/ballerinalang/openwhisk/runtime/BallerinaProxy.java
@@ -17,6 +17,7 @@
 
 package org.ballerinalang.openwhisk.runtime;
 
+import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import org.ballerinalang.BLangProgramLoader;
 import org.ballerinalang.logging.BLogManager;
@@ -38,6 +39,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.logging.LogManager;
+import java.util.Set;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.core.Context;
@@ -168,11 +170,12 @@ import javax.ws.rs.core.Response;
      */
     @SuppressWarnings({ "unchecked", "rawtypes" })
     private static void augmentEnv(JsonObject requestElements) {
-        HashMap<String, String> env = new HashMap<>();
-        for (String p : new String[] { "api_key", "namespace", "action_name", "activation_id", "deadline" }) {
+        HashMap<String, String> env = new HashMap<String, String>();
+        Set<Map.Entry<String, JsonElement>> entrySet = requestElements.entrySet();
+        for(Map.Entry<String, JsonElement> entry : entrySet){
             try {
-                String val = requestElements.getAsJsonPrimitive(p).getAsString();
-                env.put(String.format("__OW_%s", p.toUpperCase()), val);
+                if(!entry.getKey().equalsIgnoreCase("value"))
+                    env.put(String.format("__OW_%s", entry.getKey().toUpperCase()), entry.getValue().getAsString());
             } catch (Exception ignored) {
             }
         }