You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cs...@apache.org on 2018/12/17 12:48:19 UTC
[incubator-openwhisk-cli] branch master updated (a596544 -> 5bfb1c0)
This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git.
from a596544 update test to allow for environment specific concurrency limit (#392)
new a11330e Add a failing test which test `since` timings being changed or not
new 2bf1dc7 Change the pollSince time based on last activation start
new 28fcb93 Inline SSL context logic as to avoid loading of https config
new 5bfb1c0 Fix test name
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
commands/activation.go | 3 +
tests/src/test/scala/system/basic/HttpProxy.scala | 117 +++++++++++++++++++++
.../scala/system/basic/WskCliActivationTests.scala | 103 ++++++++++++++++++
3 files changed, 223 insertions(+)
create mode 100644 tests/src/test/scala/system/basic/HttpProxy.scala
create mode 100644 tests/src/test/scala/system/basic/WskCliActivationTests.scala
[incubator-openwhisk-cli] 03/04: Inline SSL context logic as to
avoid loading of https config
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git
commit 28fcb93c0f574076e9e951f7e1531d32c0ee10de
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Fri Dec 14 11:17:11 2018 +0530
Inline SSL context logic as to avoid loading of https config
---
tests/src/test/scala/system/basic/HttpProxy.scala | 17 ++++++++++++++---
.../test/scala/system/basic/WskCliActivationTests.scala | 1 +
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/tests/src/test/scala/system/basic/HttpProxy.scala b/tests/src/test/scala/system/basic/HttpProxy.scala
index 98b9a55..c0aa0e8 100644
--- a/tests/src/test/scala/system/basic/HttpProxy.scala
+++ b/tests/src/test/scala/system/basic/HttpProxy.scala
@@ -17,14 +17,16 @@
package system.basic
import java.net.ServerSocket
-import akka.http.scaladsl.Http
+import akka.http.scaladsl.{Http, HttpsConnectionContext}
import akka.http.scaladsl.model.{HttpRequest, HttpResponse, Uri}
import akka.http.scaladsl.model.Uri.Authority
import akka.http.scaladsl.server.Route
import akka.stream.ActorMaterializer
import akka.stream.scaladsl.{Sink, Source}
+import com.typesafe.sslconfig.akka.AkkaSSLConfig
import common.{WskActorSystem, WskProps}
-import common.rest.SSL
+import common.rest.{AcceptAllHostNameVerifier, SSL}
+import javax.net.ssl.HostnameVerifier
import org.scalatest.Suite
import org.scalatest.concurrent.ScalaFutures
@@ -85,12 +87,21 @@ trait HttpProxy extends WskActorSystem with ScalaFutures {
Http(actorSystem).outgoingConnectionHttps(
uri.authority.host.address(),
uri.effectivePort,
- connectionContext = SSL.httpsConnectionContext)
+ connectionContext = httpsConnectionContext())
} else {
Http(actorSystem).outgoingConnection(uri.authority.host.address(), uri.effectivePort)
}
}
+ private def httpsConnectionContext() = {
+ val sslConfig = AkkaSSLConfig().mapSettings { s =>
+ s.withHostnameVerifierClass(classOf[AcceptAllHostNameVerifier].asInstanceOf[Class[HostnameVerifier]])
+ }
+ //SSL.httpsConnectionContext initializes config which is not there in cli test
+ //So inline the flow as we do not need client auth for this case
+ new HttpsConnectionContext(SSL.nonValidatingContext(false), Some(sslConfig))
+ }
+
private def proxyRequest(req: HttpRequest, uri: Uri): HttpRequest = {
//https://github.com/akka/akka-http/issues/64
req
diff --git a/tests/src/test/scala/system/basic/WskCliActivationTests.scala b/tests/src/test/scala/system/basic/WskCliActivationTests.scala
index 7eb8765..f840c3e 100644
--- a/tests/src/test/scala/system/basic/WskCliActivationTests.scala
+++ b/tests/src/test/scala/system/basic/WskCliActivationTests.scala
@@ -60,6 +60,7 @@ class WskCliActivationTests extends TestHelpers with WskTestHelpers with HttpPro
println(s"Running poll for $pollDuration")
val consoleFuture = Future {
+ //pass the `proxyProps` such that calls from poll cli command go via our proxy
wsk.activation.console(pollDuration, actionName = Some(name))(proxyProps)
}
[incubator-openwhisk-cli] 02/04: Change the pollSince time based on
last activation start
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git
commit 2bf1dc7c6dbb0e5bada24eb99ef59516df537f8e
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Fri Dec 14 10:31:30 2018 +0530
Change the pollSince time based on last activation start
---
commands/activation.go | 3 +++
1 file changed, 3 insertions(+)
diff --git a/commands/activation.go b/commands/activation.go
index dcf1ffa..9c0fe20 100644
--- a/commands/activation.go
+++ b/commands/activation.go
@@ -387,6 +387,9 @@ var activationPollCmd = &cobra.Command{
printJSON(activation.Logs)
reported[activation.ActivationID] = true
}
+ if activation.Start > pollSince {
+ pollSince = activation.Start
+ }
}
time.Sleep(time.Second * 2)
}
[incubator-openwhisk-cli] 01/04: Add a failing test which test
`since` timings being changed or not
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git
commit a11330e6ea411747feab1e47d04f06ea11af2457
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Fri Dec 14 10:30:39 2018 +0530
Add a failing test which test `since` timings being changed or not
---
tests/src/test/scala/system/basic/HttpProxy.scala | 106 +++++++++++++++++++++
.../scala/system/basic/WskCliActivationTests.scala | 102 ++++++++++++++++++++
2 files changed, 208 insertions(+)
diff --git a/tests/src/test/scala/system/basic/HttpProxy.scala b/tests/src/test/scala/system/basic/HttpProxy.scala
new file mode 100644
index 0000000..98b9a55
--- /dev/null
+++ b/tests/src/test/scala/system/basic/HttpProxy.scala
@@ -0,0 +1,106 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package system.basic
+import java.net.ServerSocket
+
+import akka.http.scaladsl.Http
+import akka.http.scaladsl.model.{HttpRequest, HttpResponse, Uri}
+import akka.http.scaladsl.model.Uri.Authority
+import akka.http.scaladsl.server.Route
+import akka.stream.ActorMaterializer
+import akka.stream.scaladsl.{Sink, Source}
+import common.{WskActorSystem, WskProps}
+import common.rest.SSL
+import org.scalatest.Suite
+import org.scalatest.concurrent.ScalaFutures
+
+import scala.collection.mutable.ListBuffer
+import scala.concurrent.duration._
+
+/**
+ * A minimal reverse proxy implementation for test purpose which intercepts the
+ * request and responses and then make them available to test for validation.
+ *
+ * It also allows connecting to https endpoint while still expose a http endpoint
+ * to local client
+ */
+trait HttpProxy extends WskActorSystem with ScalaFutures {
+ self: Suite =>
+
+ implicit val materializer: ActorMaterializer = ActorMaterializer()
+ implicit val testConfig: PatienceConfig = PatienceConfig(1.minute)
+
+ def withProxy(check: (WskProps, ListBuffer[(HttpRequest, HttpResponse)]) => Unit)(implicit wp: WskProps): Unit = {
+ val uri = getTargetUri(wp)
+ val requests = new ListBuffer[(HttpRequest, HttpResponse)]
+ val port = freePort()
+ val proxy = Route { context =>
+ val request = context.request
+ val handler = Source
+ .single(proxyRequest(request, uri))
+ .via(makeHttpFlow(uri))
+ .runWith(Sink.head)
+ .map { response =>
+ requests += ((request, response))
+ response
+ }
+ .flatMap(context.complete(_))
+ handler
+ }
+
+ val binding = Http(actorSystem).bindAndHandle(handler = proxy, interface = "localhost", port = port)
+ binding.map { b =>
+ val proxyProps = wp.copy(apihost = s"http://localhost:$port")
+ check(proxyProps, requests)
+ b.unbind()
+ }.futureValue
+ }
+
+ private def getTargetUri(wp: WskProps) = {
+ // startsWith(http) includes https
+ if (wp.apihost.startsWith("http")) {
+ Uri(wp.apihost)
+ } else {
+ Uri().withScheme("https").withHost(wp.apihost)
+ }
+ }
+
+ private def makeHttpFlow(uri: Uri) = {
+ if (uri.scheme == "https") {
+ //Use ssl config which does not validate anything
+ Http(actorSystem).outgoingConnectionHttps(
+ uri.authority.host.address(),
+ uri.effectivePort,
+ connectionContext = SSL.httpsConnectionContext)
+ } else {
+ Http(actorSystem).outgoingConnection(uri.authority.host.address(), uri.effectivePort)
+ }
+ }
+
+ private def proxyRequest(req: HttpRequest, uri: Uri): HttpRequest = {
+ //https://github.com/akka/akka-http/issues/64
+ req
+ .copy(headers = req.headers.filterNot(h => h.is("timeout-access")))
+ .copy(uri = req.uri.copy(scheme = "", authority = Authority.Empty)) //Strip the authority as it refers to proxy
+ }
+
+ private def freePort(): Int = {
+ val socket = new ServerSocket(0)
+ try socket.getLocalPort
+ finally if (socket != null) socket.close()
+ }
+}
diff --git a/tests/src/test/scala/system/basic/WskCliActivationTests.scala b/tests/src/test/scala/system/basic/WskCliActivationTests.scala
new file mode 100644
index 0000000..7eb8765
--- /dev/null
+++ b/tests/src/test/scala/system/basic/WskCliActivationTests.scala
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package system.basic
+
+import akka.stream.scaladsl.{Sink, Source}
+import common.rest.WskRestOperations
+import common.{TestHelpers, TestUtils, Wsk, WskProps, WskTestHelpers}
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+import spray.json.DefaultJsonProtocol._
+import spray.json._
+
+import scala.concurrent._
+import scala.concurrent.duration._
+import scala.concurrent.Future
+
+@RunWith(classOf[JUnitRunner])
+class WskCliActivationTests extends TestHelpers with WskTestHelpers with HttpProxy {
+ val wsk = new Wsk
+ val wskRest = new WskRestOperations
+ val defaultAction = Some(TestUtils.getTestActionFilename("hello.js"))
+
+ behavior of "Wsk poll"
+
+ implicit val wskprops: WskProps = WskProps()
+
+ it should "create, and invoke an action that utilizes a docker container" in withAssetCleaner(wskprops) {
+ val name = "dockerContainer"
+ (wp, assetHelper) =>
+ assetHelper.withCleaner(wsk.action, name) {
+ // this docker image will be need to be pulled from dockerhub and hence has to be published there first
+ (action, _) =>
+ action.create(name, None, docker = Some("openwhisk/example"))
+ }
+
+ val args = Map("payload" -> "test".toJson)
+ //This test spin up 2 parallel tasks
+ // 1. Perform blocking invocations with 1 second interval
+ // 2. Perform poll to pick up those activation results
+ // For poll it inserts a proxy which intercepts the request sent to server
+ // and then it asserts if the request sent have there `since` time getting changed or not
+ withProxy { (proxyProps, requests) =>
+ //It may taken some time for the activations to show up in poll result
+ //based on view lag. So keep a bit longer time span for the poll
+ val pollDuration = 10.seconds
+ println(s"Running poll for $pollDuration")
+
+ val consoleFuture = Future {
+ wsk.activation.console(pollDuration, actionName = Some(name))(proxyProps)
+ }
+
+ val runsFuture = Source(1 to 5)
+ .map { _ =>
+ val r = wskRest.action.invoke(name, args, blocking = true)
+ Thread.sleep(2.second.toMillis)
+ r
+ }
+ .runWith(Sink.seq)
+
+ val f = for {
+ rr <- runsFuture
+ cr <- consoleFuture
+ } yield (cr, rr)
+
+ val (consoleResult, runResult) = Await.result(f, 1.minute)
+
+ val activations = runResult.filter(_.statusCode.isSuccess()).map(_.respData.parseJson.asJsObject)
+ val ids = activations.flatMap(_.fields.get("activationId").map(_.convertTo[String]))
+ val idsInPoll = ids.filter(consoleResult.stdout.contains(_))
+
+ //There should be more than 1 activationId in common between poll output
+ //and actual invoked actions output
+ withClue(
+ s"activations received ${activations.mkString("\n")}, console output $consoleResult. Expecting" +
+ s"more than one matching activation between these 2") {
+ idsInPoll.size should be > 1
+ }
+
+ //Collect the 'since' value passed during poll requests
+ val sinceTimes = requests.map(_._1.uri.query()).flatMap(_.get("since")).toSet
+
+ withClue(s"value of 'since' $sinceTimes should have changed") {
+ sinceTimes.size should be > 1
+ }
+ }
+ }
+
+}
[incubator-openwhisk-cli] 04/04: Fix test name
Posted by cs...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git
commit 5bfb1c06ea9cb29bec6fe5ddad3a06729772bfd7
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Fri Dec 14 13:41:17 2018 +0530
Fix test name
---
.../scala/system/basic/WskCliActivationTests.scala | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tests/src/test/scala/system/basic/WskCliActivationTests.scala b/tests/src/test/scala/system/basic/WskCliActivationTests.scala
index f840c3e..3cd407a 100644
--- a/tests/src/test/scala/system/basic/WskCliActivationTests.scala
+++ b/tests/src/test/scala/system/basic/WskCliActivationTests.scala
@@ -38,13 +38,11 @@ class WskCliActivationTests extends TestHelpers with WskTestHelpers with HttpPro
implicit val wskprops: WskProps = WskProps()
- it should "create, and invoke an action that utilizes a docker container" in withAssetCleaner(wskprops) {
- val name = "dockerContainer"
+ it should "change the since time as it polls" in withAssetCleaner(wskprops) {
+ val name = "pollTest"
(wp, assetHelper) =>
- assetHelper.withCleaner(wsk.action, name) {
- // this docker image will be need to be pulled from dockerhub and hence has to be published there first
- (action, _) =>
- action.create(name, None, docker = Some("openwhisk/example"))
+ assetHelper.withCleaner(wsk.action, name) { (action, _) =>
+ action.create(name, Some(TestUtils.getTestActionFilename("hello.js")))
}
val args = Map("payload" -> "test".toJson)
@@ -85,17 +83,19 @@ class WskCliActivationTests extends TestHelpers with WskTestHelpers with HttpPro
//There should be more than 1 activationId in common between poll output
//and actual invoked actions output
+ //This is required to ensure that since time can change which would only
+ //happen if more than one activation result is picked up in poll
withClue(
s"activations received ${activations.mkString("\n")}, console output $consoleResult. Expecting" +
s"more than one matching activation between these 2") {
idsInPoll.size should be > 1
- }
- //Collect the 'since' value passed during poll requests
- val sinceTimes = requests.map(_._1.uri.query()).flatMap(_.get("since")).toSet
+ //Collect the 'since' value passed during poll requests
+ val sinceTimes = requests.map(_._1.uri.query()).flatMap(_.get("since")).toSet
- withClue(s"value of 'since' $sinceTimes should have changed") {
- sinceTimes.size should be > 1
+ withClue(s"value of 'since' $sinceTimes should have changed") {
+ sinceTimes.size should be > 1
+ }
}
}
}