Actions should receive API_HOST not EDGE_HOST.

Rename cli.api.host to whisk.api.host (which must include protocol if defined). Add openwhisk to list of packages available to node actions.
apache · Dec 20, 2016 · 68fccef · 68fccef
1 parent efa40d5
commit 68fccef
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 23 deletions.
diff --git a/ansible/templates/whisk.properties.j2 b/ansible/templates/whisk.properties.j2
@@ -13,6 +13,7 @@ whisk.version.buildno={{ docker_image_tag }}
 whisk.ssl.cert={{ openwhisk_home }}/ansible/roles/nginx/files/openwhisk-cert.pem
 whisk.ssl.key={{ openwhisk_home }}/ansible/roles/nginx/files/openwhisk-key.pem
 whisk.ssl.challenge=openwhisk
+whisk.api.host={{ whisk_api_host | default('https://' + (groups['edge'] | first)) }}
 
 defaultLimits.actions.invokes.perMinute={{ defaultLimits.actions.invokes.perMinute }}
 defaultLimits.actions.invokes.concurrent={{ defaultLimits.actions.invokes.concurrent }}
@@ -36,7 +37,6 @@ entitlement.host={{ groups["entitlement_servers"] | first }}
 kafka.host={{ groups["kafka"]|first }}
 loadbalancer.host={{ groups["controllers"]|first }}
 router.host={{ groups["edge"]|first }}
-cli.api.host={{ cli_api_host | default(groups['edge'] | first) }}
 zookeeper.host={{ groups["kafka"]|first }}
 invoker.hosts={{ groups["invokers"] | join(",") }}
 

diff --git a/common/scala/src/main/scala/whisk/core/WhiskConfig.scala b/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
@@ -76,6 +76,7 @@ class WhiskConfig(
     val invokerSerializeDockerOp = this(WhiskConfig.invokerSerializeDockerOp)
     val invokerSerializeDockerPull = this(WhiskConfig.invokerSerializeDockerPull)
 
+    val wskApiHost = this(WhiskConfig.wskApiHost)
     val controllerHost = this(WhiskConfig.controllerHostName) + ":" + this(WhiskConfig.controllerHostPort)
     val controllerBlackboxFraction = this.getAsDouble(WhiskConfig.controllerBlackboxFraction, 0.10)
 
@@ -103,9 +104,6 @@ class WhiskConfig(
     val entitlementHost = this(WhiskConfig.entitlementHostName) + ":" + this(WhiskConfig.entitlementHostPort)
     val iamProviderHost = this(WhiskConfig.iamProviderHostName) + ":" + this(WhiskConfig.iamProviderHostPort)
 
-    val routerHost = this(WhiskConfig.routerHost)
-    val cliApiHost = this(WhiskConfig.cliApiHost)
-
     val edgeDockerEndpoint = this(WhiskConfig.edgeDockerEndpoint)
     val kafkaDockerEndpoint = this(WhiskConfig.kafkaDockerEndpoint)
     val mainDockerEndpoint = this(WhiskConfig.mainDockerEndpoint)
@@ -233,8 +231,7 @@ object WhiskConfig extends Logging {
     val invokerSerializeDockerOp = "invoker.serializeDockerOp"
     val invokerSerializeDockerPull = "invoker.serializeDockerPull"
 
-    val routerHost = "router.host"
-    val cliApiHost = "cli.api.host"
+    val wskApiHost = "whisk.api.host"
 
     val edgeDockerEndpoint = "edge.docker.endpoint"
     val kafkaDockerEndpoint = "kafka.docker.endpoint"

diff --git a/core/invoker/src/main/scala/whisk/core/container/ContainerPool.scala b/core/invoker/src/main/scala/whisk/core/container/ContainerPool.scala
@@ -652,7 +652,7 @@ class ContainerPool(
     }
 
     private def getContainerEnvironment(): Map[String, String] = {
-        Map("__OW_API_HOST" -> config.edgeHost)
+        Map("__OW_API_HOST" -> config.wskApiHost)
     }
 
     private val defaultMaxIdle = 10
@@ -795,7 +795,7 @@ class ContainerPool(
 object ContainerPool extends Logging {
     def requiredProperties = Map(
         selfDockerEndpoint -> "localhost",
-        edgeHostName -> null,
+        wskApiHost -> null,
         dockerRegistry -> "",
         dockerImagePrefix -> "",
         dockerImageTag -> "latest",

diff --git a/core/invoker/src/main/scala/whisk/core/invoker/Invoker.scala b/core/invoker/src/main/scala/whisk/core/invoker/Invoker.scala
@@ -36,7 +36,7 @@ import whisk.common.ConsulClient
 import whisk.common.ConsulKV.InvokerKeys
 import whisk.connector.kafka.{ KafkaConsumerConnector, KafkaProducerConnector }
 import whisk.core.WhiskConfig
-import whisk.core.WhiskConfig.{ consulServer, dockerImagePrefix, dockerRegistry, edgeHost, kafkaHost, logsDir, servicePort, whiskVersion }
+import whisk.core.WhiskConfig.{ consulServer, dockerImagePrefix, dockerRegistry, kafkaHost, logsDir, servicePort, whiskVersion }
 import whisk.core.connector.{ ActivationMessage, CompletionMessage }
 import whisk.core.container.{ BlackBoxContainerError, ContainerPool, Interval, RunResult, WhiskContainer, WhiskContainerError }
 import whisk.core.dispatcher.{ Dispatcher, MessageHandler }
@@ -488,7 +488,6 @@ object Invoker {
         WhiskActivationStore.requiredProperties ++
         ContainerPool.requiredProperties ++
         kafkaHost ++
-        edgeHost ++
         consulServer ++
         whiskVersion
 

diff --git a/core/nodejs6Action/Dockerfile b/core/nodejs6Action/Dockerfile
@@ -46,7 +46,7 @@ nano@6.2.0 \
 node-uuid@1.4.7 \
 nodemailer@2.6.4 \
 oauth2-server@2.4.1 \
-openwhisk@2.6.0 \
+openwhisk@3.0.0 \
 pkgcloud@1.4.0 \
 process@0.11.9 \
 pug@">=2.0.0-beta6 <2.0.1" \

diff --git a/core/nodejsAction/Dockerfile b/core/nodejsAction/Dockerfile
@@ -34,7 +34,7 @@ mustache@2.1.3 \
 nano@5.10.0 \
 node-uuid@1.4.2 \
 oauth2-server@2.4.0 \
-openwhisk@2.6.0 \
+openwhisk@3.0.0 \
 process@0.11.0 \
 request@2.79.0 \
 rimraf@2.5.1 \

diff --git a/core/nodejsActionBase/app.js b/core/nodejsActionBase/app.js
@@ -16,7 +16,7 @@
 
 var config = {
         'port': 8080,
-        'edgeHost': process.env.__OW_API_HOST
+        'apiHost': process.env.__OW_API_HOST
 };
 
 var bodyParser = require('body-parser');

diff --git a/core/nodejsActionBase/src/service.js b/core/nodejsActionBase/src/service.js
@@ -170,7 +170,7 @@ function NodeActionService(config, logger) {
 }
 
 function newWhiskContext(config, logger) {
-    return new whisk(config.edgeHost, logger);
+    return new whisk(config.apiHost, logger);
 }
 
 NodeActionService.getService = function(config, logger) {

diff --git a/core/nodejsActionBase/src/whisk.js b/core/nodejsActionBase/src/whisk.js
@@ -28,14 +28,6 @@ var request = require('request');
  */
 function Whisk(apihost, logger) {
 
-    // export __OW_API_HOST to environment
-    {
-        apihost = apihost || '';
-        var edgeHostParts = apihost.split(':');
-        var protocol = (edgeHostParts.length >= 2  &&  edgeHostParts[1] == '443') ? 'https' : 'http';
-        apihost = protocol + '://' + apihost;
-    }
-
     this.apikey = "uninit_apikey";
 
     var asyncSentinel = new function Async(){ async: true; };

diff --git a/docs/reference.md b/docs/reference.md
@@ -223,6 +223,7 @@ The following packages are available to be used in the Node.js 6.9.1 environment
 - node-uuid v1.4.7
 - nodemailer v2.6.4
 - oauth2-server v2.4.1
+- openwhisk v3.0.0
 - pkgcloud v1.4.0
 - process v0.11.9
 - pug v2.0.0-beta6
@@ -274,6 +275,7 @@ The following packages are available to be used in the Node.js 0.12.17 environme
 - nano v5.10.0
 - node-uuid v1.4.2
 - oauth2-server v2.4.0
+- openwhisk v3.0.0
 - process v0.11.0
 - request v2.79.0
 - rimraf v2.5.1

diff --git a/tests/src/common/WhiskProperties.java b/tests/src/common/WhiskProperties.java
@@ -211,6 +211,10 @@ public static String getRouterHost() {
         return whiskProperties.getProperty("router.host");
     }
 
+    public static String getApiHost() {
+        return whiskProperties.getProperty("whisk.api.host");
+    }
+
     public static int getEdgeHostApiPort() {
         return Integer.parseInt(whiskProperties.getProperty("edge.host.apiport"));
     }

diff --git a/tests/src/whisk/core/cli/test/WskBasicUsageTests.scala b/tests/src/whisk/core/cli/test/WskBasicUsageTests.scala
@@ -488,7 +488,7 @@ class WskBasicUsageTests
                 activation =>
                     activation.response.status shouldBe "success"
                     val fields = activation.response.result.get.convertTo[Map[String, String]]
-                    fields("api_host") shouldBe WhiskProperties.getEdgeHost + ":" + WhiskProperties.getEdgeHostApiPort
+                    fields("api_host") shouldBe WhiskProperties.getApiHost
                     fields("api_key") shouldBe wskprops.authKey
                     fields("namespace") shouldBe namespace
                     fields("action_name") shouldBe s"/$namespace/$name"