You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/12/17 16:41:20 UTC
[GitHub] rabbah closed pull request #4167: Add tid from header to RestResult
in tests.
rabbah closed pull request #4167: Add tid from header to RestResult in tests.
URL: https://github.com/apache/incubator-openwhisk/pull/4167
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/tests/src/test/scala/common/rest/WskRestOperations.scala b/tests/src/test/scala/common/rest/WskRestOperations.scala
index 1eb33201c7..78a4f083da 100644
--- a/tests/src/test/scala/common/rest/WskRestOperations.scala
+++ b/tests/src/test/scala/common/rest/WskRestOperations.scala
@@ -18,64 +18,50 @@
package common.rest
import java.io.{File, FileInputStream}
+import java.nio.charset.StandardCharsets
+import java.security.KeyStore
+import java.security.cert.X509Certificate
import java.time.Instant
import java.util.Base64
-import java.security.cert.X509Certificate
+import akka.actor.ActorSystem
+import akka.http.scaladsl.{Http, HttpsConnectionContext}
+import akka.http.scaladsl.model.HttpMethods.{DELETE, GET, POST, PUT}
+import akka.http.scaladsl.model.StatusCodes.{Accepted, NotFound, OK}
+import akka.http.scaladsl.model._
+import akka.http.scaladsl.model.Uri.{Path, Query}
+import akka.http.scaladsl.model.headers.{Authorization, BasicHttpCredentials, OAuth2BearerToken}
+import akka.stream.ActorMaterializer
+import akka.util.ByteString
+import com.typesafe.sslconfig.akka.AkkaSSLConfig
+import common.TestUtils.{ANY_ERROR_EXIT, DONTCARE_EXIT, RunResult, SUCCESS_EXIT}
+import common.{
+ DeleteFromCollectionOperations,
+ HasActivation,
+ ListOrGetFromCollectionOperations,
+ WaitFor,
+ WhiskProperties,
+ WskProps,
+ _
+}
+import javax.net.ssl._
import org.apache.commons.io.{FileUtils, FilenameUtils}
+import org.apache.openwhisk.common.Https.HttpsConfig
+import org.apache.openwhisk.common.{AkkaLogging, TransactionId}
+import org.apache.openwhisk.core.entity.ByteSize
+import org.apache.openwhisk.utils.retry
import org.scalatest.Matchers
import org.scalatest.concurrent.ScalaFutures
import org.scalatest.time.Span.convertDurationToSpan
-import scala.collection.immutable.Seq
-import scala.concurrent.duration.Duration
-import scala.concurrent.duration.DurationInt
-import scala.language.postfixOps
-import scala.util.Try
-import scala.util.{Failure, Success}
-import akka.http.scaladsl.model.StatusCode
-import akka.http.scaladsl.model.StatusCodes.Accepted
-import akka.http.scaladsl.model.StatusCodes.NotFound
-import akka.http.scaladsl.model.StatusCodes.OK
-import akka.http.scaladsl.model.HttpRequest
-import akka.http.scaladsl.model.HttpMethod
-import akka.http.scaladsl.model.HttpResponse
-import akka.http.scaladsl.model.headers.{Authorization, BasicHttpCredentials, OAuth2BearerToken}
-import akka.http.scaladsl.model.HttpEntity
-import akka.http.scaladsl.model.ContentTypes
-import akka.http.scaladsl.Http
-import akka.http.scaladsl.model.Uri
-import akka.http.scaladsl.model.Uri.{Path, Query}
-import akka.http.scaladsl.model.HttpMethods.DELETE
-import akka.http.scaladsl.model.HttpMethods.GET
-import akka.http.scaladsl.model.HttpMethods.POST
-import akka.http.scaladsl.model.HttpMethods.PUT
-import akka.http.scaladsl.HttpsConnectionContext
-import akka.stream.ActorMaterializer
-import spray.json._
+import pureconfig.loadConfigOrThrow
import spray.json.DefaultJsonProtocol._
-import common._
-import common.DeleteFromCollectionOperations
-import common.ListOrGetFromCollectionOperations
-import common.HasActivation
-import common.TestUtils.SUCCESS_EXIT
-import common.TestUtils.ANY_ERROR_EXIT
-import common.TestUtils.DONTCARE_EXIT
-import common.TestUtils.RunResult
-import common.WaitFor
-import common.WhiskProperties
-import common.WskProps
-import org.apache.openwhisk.core.entity.ByteSize
-import org.apache.openwhisk.utils.retry
-import javax.net.ssl._
-import com.typesafe.sslconfig.akka.AkkaSSLConfig
-import java.nio.charset.StandardCharsets
-import java.security.KeyStore
+import spray.json._
-import akka.actor.ActorSystem
-import akka.util.ByteString
-import pureconfig.loadConfigOrThrow
-import org.apache.openwhisk.common.Https.HttpsConfig
-import org.apache.openwhisk.common.AkkaLogging
+import scala.collection.immutable.Seq
+import scala.concurrent.ExecutionContext
+import scala.concurrent.duration.{Duration, DurationInt, FiniteDuration}
+import scala.language.postfixOps
+import scala.util.{Failure, Success, Try}
class AcceptAllHostNameVerifier extends HostnameVerifier {
override def verify(s: String, sslSession: SSLSession): Boolean = true
@@ -83,7 +69,7 @@ class AcceptAllHostNameVerifier extends HostnameVerifier {
object SSL {
- lazy val httpsConfig = loadConfigOrThrow[HttpsConfig]("whisk.controller.https")
+ lazy val httpsConfig: HttpsConfig = loadConfigOrThrow[HttpsConfig]("whisk.controller.https")
def keyManagers(clientAuth: Boolean): Array[KeyManager] = {
if (clientAuth)
@@ -104,8 +90,8 @@ object SSL {
def nonValidatingContext(clientAuth: Boolean = false): SSLContext = {
class IgnoreX509TrustManager extends X509TrustManager {
- def checkClientTrusted(chain: Array[X509Certificate], authType: String) = ()
- def checkServerTrusted(chain: Array[X509Certificate], authType: String) = ()
+ def checkClientTrusted(chain: Array[X509Certificate], authType: String): Unit = ()
+ def checkServerTrusted(chain: Array[X509Certificate], authType: String): Unit = ()
def getAcceptedIssuers: Array[X509Certificate] = Array.empty
}
@@ -115,7 +101,7 @@ object SSL {
context
}
- def httpsConnectionContext(implicit system: ActorSystem) = {
+ def httpsConnectionContext(implicit system: ActorSystem): HttpsConnectionContext = {
val sslConfig = AkkaSSLConfig().mapSettings { s =>
s.withHostnameVerifierClass(classOf[AcceptAllHostNameVerifier].asInstanceOf[Class[HostnameVerifier]])
}
@@ -132,7 +118,7 @@ object HttpConnection {
* @param system actor system
* @return https connection context
*/
- def getContext(protocol: String)(implicit system: ActorSystem) = {
+ def getContext(protocol: String)(implicit system: ActorSystem): HttpsConnectionContext = {
if (protocol == "https") {
SSL.httpsConnectionContext
} else {
@@ -143,13 +129,13 @@ object HttpConnection {
}
class WskRestOperations(implicit actorSytem: ActorSystem) extends WskOperations {
- override implicit val action = new RestActionOperations
- override implicit val trigger = new RestTriggerOperations
- override implicit val rule = new RestRuleOperations
- override implicit val activation = new RestActivationOperations
- override implicit val pkg = new RestPackageOperations
- override implicit val namespace = new RestNamespaceOperations
- override implicit val api = new RestGatewayOperations
+ override implicit val action: RestActionOperations = new RestActionOperations
+ override implicit val trigger: RestTriggerOperations = new RestTriggerOperations
+ override implicit val rule: RestRuleOperations = new RestRuleOperations
+ override implicit val activation: RestActivationOperations = new RestActivationOperations
+ override implicit val pkg: RestPackageOperations = new RestPackageOperations
+ override implicit val namespace: RestNamespaceOperations = new RestNamespaceOperations
+ override implicit val api: RestGatewayOperations = new RestGatewayOperations
}
trait RestListOrGetFromCollectionOperations extends ListOrGetFromCollectionOperations with RunRestCmd {
@@ -177,7 +163,7 @@ trait RestListOrGetFromCollectionOperations extends ListOrGetFromCollectionOpera
limit.map(l => Map("limit" -> l.toString)).getOrElse(Map.empty)
val resp = requestEntity(GET, entPath, paramMap)
- val r = new RestResult(resp.status, getRespData(resp))
+ val r = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
validateStatusCode(expectedExitCode, r.statusCode.intValue)
r
}
@@ -199,7 +185,7 @@ trait RestListOrGetFromCollectionOperations extends ListOrGetFromCollectionOpera
val (ns, entity) = getNamespaceEntityName(name)
val entPath = Path(s"$basePath/namespaces/$ns/$noun/$entity")
val resp = requestEntity(GET, entPath)(wp)
- val rr = new RestResult(resp.status, getRespData(resp))
+ val rr = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
validateStatusCode(expectedExitCode, rr.statusCode.intValue)
rr
}
@@ -218,7 +204,7 @@ trait RestDeleteFromCollectionOperations extends DeleteFromCollectionOperations
val (ns, entityName) = getNamespaceEntityName(name)
val path = Path(s"$basePath/namespaces/$ns/$noun/$entityName")
val resp = requestEntity(DELETE, path)(wp)
- val rr = new RestResult(resp.status, getRespData(resp))
+ val rr = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
validateStatusCode(expectedExitCode, rr.statusCode.intValue)
rr
}
@@ -299,20 +285,17 @@ class RestActionOperations(implicit val actorSystem: ActorSystem)
val actionName = entityName(artifact.get)
val actionPath = Path(s"$basePath/namespaces/$namespace/$noun/$actionName")
val resp = requestEntity(GET, actionPath)
- if (resp == None) return new RestResult(NotFound) // NOTE return, aborts the method
- else {
- val result = new RestResult(resp.status, getRespData(resp))
- val params = result.getFieldListJsObject("parameters").toArray[JsValue]
- val annos = result.getFieldListJsObject("annotations").toArray[JsValue]
- val exec = result.getFieldJsObject("exec").fields
- (paramsInput ++ params, annosInput ++ annos, exec)
- }
+ val result = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
+ val params = result.getFieldListJsObject("parameters").toArray[JsValue]
+ val annos = result.getFieldListJsObject("annotations").toArray[JsValue]
+ val exec = result.getFieldJsObject("exec").fields
+ (paramsInput ++ params, annosInput ++ annos, exec)
case "sequence" =>
require(artifact.isDefined, "sequence requires a component list")
val comps = convertIntoComponents(artifact.get)
val exec =
- if (comps.size > 0) Map("components" -> comps.toJson, "kind" -> k.toJson)
+ if (comps.nonEmpty) Map("components" -> comps.toJson, "kind" -> k.toJson)
else Map("kind" -> k.toJson)
(paramsInput, annosInput, exec)
@@ -361,7 +344,7 @@ class RestActionOperations(implicit val actorSystem: ActorSystem)
timeout.map(t => Map("timeout" -> t.toMillis.toJson)).getOrElse(Map.empty) ++
logsize.map(log => Map("logs" -> log.toMB.toJson)).getOrElse(Map.empty) ++
memory.map(m => Map("memory" -> m.toMB.toJson)).getOrElse(Map.empty) ++
- concurrency.map(c => Map("concurrency" -> c.toInt.toJson)).getOrElse(Map.empty)
+ concurrency.map(c => Map("concurrency" -> c.toJson)).getOrElse(Map.empty)
}
val body: Map[String, JsValue] = if (!update) {
@@ -374,9 +357,9 @@ class RestActionOperations(implicit val actorSystem: ActorSystem)
var content: Map[String, JsValue] = Map.empty
if (exec.nonEmpty)
content = Map("exec" -> main.map(m => exec ++ Map("main" -> m.toJson)).getOrElse(exec).toJson)
- if (params.length > 0)
+ if (params.nonEmpty)
content = content + ("parameters" -> params.toJson)
- if (annos.length > 0)
+ if (annos.nonEmpty)
content = content + ("annotations" -> annos.toJson)
if (limits.nonEmpty)
content = content + ("limits" -> limits.toJson)
@@ -387,7 +370,7 @@ class RestActionOperations(implicit val actorSystem: ActorSystem)
val resp =
if (update) requestEntity(PUT, path, Map("overwrite" -> "true"), Some(JsObject(body).toString))
else requestEntity(PUT, path, body = Some(JsObject(body).toString))
- val rr = new RestResult(resp.status, getRespData(resp))
+ val rr = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
validateStatusCode(expectedExitCode, rr.statusCode.intValue)
rr
}
@@ -454,11 +437,11 @@ class RestTriggerOperations(implicit val actorSystem: ActorSystem)
}
val inputParams = convertMapIntoKeyValue(parameters)
- if (inputParams.size > 0) {
+ if (inputParams.nonEmpty) {
bodyContent = bodyContent + ("parameters" -> params.toJson)
}
val inputAnnos = convertMapIntoKeyValue(annotations)
- if (inputAnnos.size > 0) {
+ if (inputAnnos.nonEmpty) {
bodyContent = bodyContent + ("annotations" -> annos.toJson)
}
}
@@ -466,10 +449,9 @@ class RestTriggerOperations(implicit val actorSystem: ActorSystem)
val resp =
if (update) requestEntity(PUT, path, Map("overwrite" -> "true"), Some(JsObject(bodyContent).toString))
else requestEntity(PUT, path, body = Some(JsObject(bodyContent).toString))
- val result = new RestResult(resp.status, getRespData(resp))
+ val result = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
if (result.statusCode != OK) {
validateStatusCode(expectedExitCode, result.statusCode.intValue)
- result
}
val rr = feed map { f =>
// Invoke the feed
@@ -482,13 +464,13 @@ class RestTriggerOperations(implicit val actorSystem: ActorSystem)
"authKey" -> s"${wp.authKey}".toJson)
body = body ++ parameters
val resp = requestEntity(POST, path, paramMap, Some(body.toJson.toString))
- val resultInvoke = new RestResult(resp.status, getRespData(resp))
+ val resultInvoke = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
if ((expectedExitCode != DONTCARE_EXIT) && (expectedExitCode != ANY_ERROR_EXIT))
expectedExitCode shouldBe resultInvoke.statusCode.intValue
if (resultInvoke.statusCode != OK) {
// Remove the trigger, because the feed failed to invoke.
delete(triggerName)
- new RestResult(NotFound)
+ new RestResult(NotFound, getTransactionId(resp))
} else {
result
}
@@ -516,9 +498,9 @@ class RestTriggerOperations(implicit val actorSystem: ActorSystem)
input.parseJson.convertTo[Map[String, JsValue]]
} getOrElse parameters
val resp =
- if (params.size == 0) requestEntity(POST, path)
+ if (params.isEmpty) requestEntity(POST, path)
else requestEntity(POST, path, body = Some(params.toJson.toString))
- new RestResult(resp.status.intValue, getRespData(resp))
+ new RestResult(resp.status.intValue, getTransactionId(resp), getRespData(resp))
}
}
@@ -559,7 +541,7 @@ class RestRuleOperations(implicit val actorSystem: ActorSystem)
val resp =
if (update) requestEntity(PUT, path, Map("overwrite" -> "true"), Some(bodyContent.toString))
else requestEntity(PUT, path, body = Some(bodyContent.toString))
- new RestResult(resp.status, getRespData(resp))
+ new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
}
/**
@@ -570,7 +552,7 @@ class RestRuleOperations(implicit val actorSystem: ActorSystem)
* if the code is anything but DONTCARE_EXIT, assert the code is as expected
*/
override def enable(name: String, expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RestResult = {
- changeRuleState(name, "active")
+ changeRuleState(name)
}
/**
@@ -600,7 +582,7 @@ class RestRuleOperations(implicit val actorSystem: ActorSystem)
val path = getNamePath(wp.namespace, noun, enName)
val bodyContent = JsObject("status" -> state.toJson)
val resp = requestEntity(POST, path, body = Some(bodyContent.toString))
- new RestResult(resp.status, getRespData(resp))
+ new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
}
}
@@ -624,7 +606,7 @@ class RestActivationOperations(implicit val actorSystem: ActorSystem)
actionName: Option[String] = None)(implicit wp: WskProps): RestResult = {
require(duration > 1.second, "duration must be at least 1 second")
val sinceTime = {
- val now = System.currentTimeMillis()
+ val now = System.currentTimeMillis
since.map(s => now - s.toMillis).getOrElse(now)
}
@@ -649,14 +631,14 @@ class RestActivationOperations(implicit val actorSystem: ActorSystem)
skip: Option[Int] = None,
docs: Boolean = true,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RestResult = {
- val entityPath = Path(s"${basePath}/namespaces/${wp.namespace}/$noun")
+ val entityPath = Path(s"$basePath/namespaces/${wp.namespace}/$noun")
val paramMap = Map("docs" -> docs.toString) ++
skip.map(s => Map("skip" -> s.toString)).getOrElse(Map.empty) ++
limit.map(l => Map("limit" -> l.toString)).getOrElse(Map.empty) ++
filter.map(f => Map("name" -> f.toString)).getOrElse(Map.empty) ++
since.map(s => Map("since" -> s.toEpochMilli.toString)).getOrElse(Map.empty)
val resp = requestEntity(GET, entityPath, paramMap)
- new RestResult(resp.status, getRespData(resp))
+ new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
}
/**
@@ -677,9 +659,9 @@ class RestActivationOperations(implicit val actorSystem: ActorSystem)
* if the code is anything but DONTCARE_EXIT, assert the code is as expected
*/
def activationLogs(activationId: String, expectedExitCode: Int = OK.intValue)(implicit wp: WskProps): RestResult = {
- val path = Path(s"${basePath}/namespaces/${wp.namespace}/$noun/$activationId/logs")
+ val path = Path(s"$basePath/namespaces/${wp.namespace}/$noun/$activationId/logs")
val resp = requestEntity(GET, path)
- val rr = new RestResult(resp.status, getRespData(resp))
+ val rr = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
validateStatusCode(expectedExitCode, rr.statusCode.intValue)
rr
}
@@ -692,9 +674,9 @@ class RestActivationOperations(implicit val actorSystem: ActorSystem)
* if the code is anything but DONTCARE_EXIT, assert the code is as expected
*/
def activationResult(activationId: String, expectedExitCode: Int = OK.intValue)(implicit wp: WskProps): RestResult = {
- val path = Path(s"${basePath}/namespaces/${wp.namespace}/$noun/$activationId/result")
+ val path = Path(s"$basePath/namespaces/${wp.namespace}/$noun/$activationId/result")
val resp = requestEntity(GET, path)
- val rr = new RestResult(resp.status, getRespData(resp))
+ val rr = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
validateStatusCode(expectedExitCode, rr.statusCode.intValue)
rr
}
@@ -740,22 +722,21 @@ class RestActivationOperations(implicit val actorSystem: ActorSystem)
last: Option[Boolean] = None,
summary: Option[Boolean] = None)(implicit wp: WskProps): RestResult = {
val actId = activationId match {
- case Some(id) => activationId
+ case Some(_) => activationId
case None =>
last match {
- case Some(true) => {
+ case Some(true) =>
val activations = pollFor(N = 1, entity = None, limit = Some(1))
require(activations.size <= 1)
- if (activations.isEmpty) None else Some(activations.head)
- }
+ activations.headOption
case _ => None
}
}
val rr = actId match {
case Some(id) =>
val resp = requestEntity(GET, getNamePath(wp.namespace, noun, id))
- new RestResult(resp.status, getRespData(resp))
- case None => new RestResult(NotFound)
+ new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
+ case None => new RestResult(NotFound, "")
}
validateStatusCode(expectedExitCode, rr.statusCode.intValue)
rr
@@ -793,10 +774,10 @@ class RestActivationOperations(implicit val actorSystem: ActorSystem)
val rr = activationId match {
case Some(id) =>
val resp = requestEntity(GET, getNamePath(wp.namespace, noun, s"$id/logs"))
- new RestResult(resp.status, getRespData(resp))
+ new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
case None =>
- new RestResult(NotFound)
+ new RestResult(NotFound, "")
}
validateStatusCode(expectedExitCode, rr.statusCode.intValue)
rr
@@ -808,10 +789,10 @@ class RestActivationOperations(implicit val actorSystem: ActorSystem)
val rr = activationId match {
case Some(id) =>
val resp = requestEntity(GET, getNamePath(wp.namespace, noun, s"$id/result"))
- new RestResult(resp.status, getRespData(resp))
+ new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
case None =>
- new RestResult(NotFound)
+ new RestResult(NotFound, "")
}
validateStatusCode(expectedExitCode, rr.statusCode.intValue)
rr
@@ -835,7 +816,7 @@ class RestNamespaceOperations(implicit val actorSystem: ActorSystem) extends Nam
implicit wp: WskProps): RestResult = {
val entPath = Path(s"$basePath/namespaces")
val resp = requestEntity(GET, entPath)
- val result = if (resp == None) new RestResult(NotFound) else new RestResult(resp.status, getRespData(resp))
+ val result = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
validateStatusCode(expectedExitCode, result.statusCode.intValue)
result
}
@@ -848,7 +829,7 @@ class RestNamespaceOperations(implicit val actorSystem: ActorSystem) extends Nam
*/
override def whois()(implicit wskprops: WskProps): String = {
val ns = list().getBodyListString
- if (ns.size > 0) ns(0).toString else ""
+ ns.headOption.map(_.toString).getOrElse("")
}
}
@@ -887,11 +868,11 @@ class RestPackageOperations(implicit val actorSystem: ActorSystem)
}
val inputParams = convertMapIntoKeyValue(parameters)
- if (inputParams.size > 0) {
+ if (inputParams.nonEmpty) {
bodyContent = bodyContent + ("parameters" -> params.toJson)
}
val inputAnnos = convertMapIntoKeyValue(annotations)
- if (inputAnnos.size > 0) {
+ if (inputAnnos.nonEmpty) {
bodyContent = bodyContent + ("annotations" -> annos.toJson)
}
}
@@ -899,7 +880,7 @@ class RestPackageOperations(implicit val actorSystem: ActorSystem)
val resp =
if (update) requestEntity(PUT, path, Map("overwrite" -> "true"), Some(JsObject(bodyContent).toString))
else requestEntity(PUT, path, body = Some(JsObject(bodyContent).toString))
- val r = new RestResult(resp.status, getRespData(resp))
+ val r = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
validateStatusCode(expectedExitCode, r.statusCode.intValue)
r
}
@@ -925,7 +906,7 @@ class RestPackageOperations(implicit val actorSystem: ActorSystem)
val bodyContent =
JsObject("binding" -> binding.toJson, "parameters" -> params.toJson, "annotations" -> annos.toJson)
val resp = requestEntity(PUT, path, Map("overwrite" -> "false"), Some(bodyContent.toString))
- val rr = new RestResult(resp.status, getRespData(resp))
+ val rr = new RestResult(resp.status, getTransactionId(resp), getRespData(resp))
validateStatusCode(expectedExitCode, rr.statusCode.intValue)
rr
}
@@ -1002,17 +983,18 @@ class RestGatewayOperations(implicit val actorSystem: ActorSystem) extends Gatew
web = true,
expectedExitCode = expectedExitCode)(wp)
}
- case None => {
+ case None =>
swagger match {
- case Some(swaggerFile) => {
+ case Some(swaggerFile) =>
var file = ""
val fileName = swaggerFile.toString
try {
file = FileUtils.readFileToString(new File(fileName), StandardCharsets.UTF_8)
} catch {
- case e: Throwable =>
+ case _: Throwable =>
return new RestResult(
NotFound,
+ "",
JsObject("error" -> s"Error reading swagger file '$fileName'".toJson).toString)
}
val parms = Map("namespace" -> s"${wp.namespace}".toJson, "swagger" -> file.toJson)
@@ -1030,12 +1012,8 @@ class RestGatewayOperations(implicit val actorSystem: ActorSystem) extends Gatew
result = true,
web = true,
expectedExitCode = expectedExitCode)(wp)
- }
- case None => {
- new RestResult(NotFound)
- }
+ case None => new RestResult(NotFound, "")
}
- }
}
r
}
@@ -1151,21 +1129,21 @@ class RestGatewayOperations(implicit val actorSystem: ActorSystem) extends Gatew
trait RunRestCmd extends Matchers with ScalaFutures with SwaggerValidator {
- val protocol = loadConfigOrThrow[String]("whisk.controller.protocol")
- val idleTimeout = 90 seconds
- val toStrictTimeout = 5 seconds
+ val protocol: String = loadConfigOrThrow[String]("whisk.controller.protocol")
+ val idleTimeout: FiniteDuration = 90 seconds
+ val toStrictTimeout: FiniteDuration = 5 seconds
val queueSize = 10
val maxOpenRequest = 1024
val basePath = Path("/api/v1")
val systemNamespace = "whisk.system"
val logger = new AkkaLogging(actorSystem.log)
- implicit val config = PatienceConfig(100 seconds, 15 milliseconds)
+ implicit val config: PatienceConfig = PatienceConfig(100 seconds, 15 milliseconds)
implicit val actorSystem: ActorSystem
- lazy implicit val executionContext = actorSystem.dispatcher
- lazy implicit val materializer = ActorMaterializer()
+ lazy implicit val executionContext: ExecutionContext = actorSystem.dispatcher
+ lazy implicit val materializer: ActorMaterializer = ActorMaterializer()
- lazy val sslConfig = AkkaSSLConfig().mapSettings {
+ lazy val sslConfig: AkkaSSLConfig = AkkaSSLConfig().mapSettings {
_.withHostnameVerifierClass(classOf[AcceptAllHostNameVerifier].asInstanceOf[Class[HostnameVerifier]])
}
@@ -1186,7 +1164,7 @@ trait RunRestCmd extends Matchers with ScalaFutures with SwaggerValidator {
def getNamePath(ns: String, noun: String, name: String) = Path(s"$basePath/namespaces/$ns/$noun/$name")
- def getExt(filePath: String) = Option(FilenameUtils.getExtension(filePath)).getOrElse("")
+ def getExt(filePath: String): String = Option(FilenameUtils.getExtension(filePath)).getOrElse("")
def requestEntity(method: HttpMethod,
path: Path,
@@ -1230,7 +1208,7 @@ trait RunRestCmd extends Matchers with ScalaFutures with SwaggerValidator {
if (wp.basicAuth) {
new BasicHttpCredentials(wp.authKey, wp.authKey)
} else {
- new OAuth2BearerToken(wp.authKey)
+ OAuth2BearerToken(wp.authKey)
}
}
}
@@ -1298,7 +1276,7 @@ trait RunRestCmd extends Matchers with ScalaFutures with SwaggerValidator {
.toArray
}
- def entityName(name: String)(implicit wp: WskProps) = {
+ def entityName(name: String)(implicit wp: WskProps): String = {
val sep = "/"
if (name.startsWith(sep)) name.substring(name.indexOf(sep, name.indexOf(sep) + 1) + 1, name.length)
else name
@@ -1319,6 +1297,15 @@ trait RunRestCmd extends Matchers with ScalaFutures with SwaggerValidator {
Try(resp.entity.toStrict(timeout).map { _.data }.map(_.utf8String).futureValue).getOrElse("")
}
+ def getTransactionId(resp: HttpResponse): String = {
+ val tidHeader = resp.headers.find(_.is(TransactionId.generatorConfig.lowerCaseHeader))
+ withClue(
+ s"The header ${TransactionId.generatorConfig} is not set. This means that the request did not reach nginx (or the controller if nginx is skipped in that test).") {
+ tidHeader shouldBe defined
+ }
+ tidHeader.get.value
+ }
+
def getNamespaceEntityName(name: String)(implicit wp: WskProps): (String, String) = {
name.split("/") match {
// Example: /namespace/package_name/entity_name
@@ -1358,7 +1345,7 @@ trait RunRestCmd extends Matchers with ScalaFutures with SwaggerValidator {
val resp = requestEntity(POST, path, paramMap, input)
- val rr = new RestResult(resp.status.intValue, getRespData(resp), blocking)
+ val rr = new RestResult(resp.status.intValue, getTransactionId(resp), getRespData(resp), blocking)
// If the statusCode does not not equal to expectedExitCode, it is acceptable that the statusCode
// equals to 200 for the case that either blocking or result is set to true.
@@ -1384,7 +1371,7 @@ object RestResult {
}
def getFieldJsValue(obj: JsObject, key: String): JsValue = {
- obj.fields.get(key).getOrElse(JsObject.empty)
+ obj.fields.getOrElse(key, JsObject.empty)
}
def getFieldListJsObject(obj: JsObject, key: String): Vector[JsObject] = {
@@ -1401,7 +1388,7 @@ object RestResult {
}
}
-class RestResult(var statusCode: StatusCode, var respData: String = "", blocking: Boolean = false)
+class RestResult(val statusCode: StatusCode, val tid: String, val respData: String = "", blocking: Boolean = false)
extends RunResult(
RestResult.convertStausCodeToExitCode(statusCode, blocking),
respData,
@@ -1409,6 +1396,7 @@ class RestResult(var statusCode: StatusCode, var respData: String = "", blocking
override def toString: String = {
super.toString + s"""statusCode: $statusCode
+ |tid: $tid
|respData: $respData
|blocking: $blocking""".stripMargin
}
@@ -1431,21 +1419,21 @@ class RestResult(var statusCode: StatusCode, var respData: String = "", blocking
RestResult.getFieldListJsObject(respBody, key)
}
- def getBodyListJsObject(): Vector[JsObject] = {
+ def getBodyListJsObject: Vector[JsObject] = {
respData.parseJson.convertTo[Vector[JsObject]]
}
- def getBodyListString(): Vector[String] = {
+ def getBodyListString: Vector[String] = {
respData.parseJson.convertTo[Vector[String]]
}
}
-class ApiAction(var name: String,
- var namespace: String,
- var backendMethod: String = "POST",
- var backendUrl: String,
- var authkey: String) {
- def toJson() = {
+class ApiAction(val name: String,
+ val namespace: String,
+ val backendMethod: String = "POST",
+ val backendUrl: String,
+ val authkey: String) {
+ def toJson: JsObject = {
JsObject(
"name" -> name.toJson,
"namespace" -> namespace.toJson,
diff --git a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskRestEntitlementTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskRestEntitlementTests.scala
index 5a5d13ff0b..c78c6fd054 100644
--- a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskRestEntitlementTests.scala
+++ b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskRestEntitlementTests.scala
@@ -48,7 +48,7 @@ class WskRestEntitlementTests extends WskEntitlementTests with WskActorSystem {
packageName: String,
actionName: String): Unit = {
val packageListResultRest = packageList.asInstanceOf[RestResult]
- val packages = packageListResultRest.getBodyListJsObject()
+ val packages = packageListResultRest.getBodyListJsObject
val ns = s"$namespace/$packageName"
packages.exists(pack =>
RestResult.getField(pack, "namespace") == ns && RestResult.getField(pack, "name") == actionName) shouldBe true
@@ -56,7 +56,7 @@ class WskRestEntitlementTests extends WskEntitlementTests with WskActorSystem {
override def verifyPackageSharedList(packageList: RunResult, namespace: String, packageName: String): Unit = {
val packageListResultRest = packageList.asInstanceOf[RestResult]
- val packages = packageListResultRest.getBodyListJsObject()
+ val packages = packageListResultRest.getBodyListJsObject
packages.exists(
pack =>
RestResult.getField(pack, "namespace") == namespace && RestResult
@@ -65,7 +65,7 @@ class WskRestEntitlementTests extends WskEntitlementTests with WskActorSystem {
override def verifyPackageNotSharedList(packageList: RunResult, namespace: String, packageName: String): Unit = {
val packageListResultRest = packageList.asInstanceOf[RestResult]
- val packages = packageListResultRest.getBodyListJsObject()
+ val packages = packageListResultRest.getBodyListJsObject
packages.exists(
pack =>
RestResult.getField(pack, "namespace") == namespace && RestResult
diff --git a/tests/src/test/scala/system/basic/WskRestBasicTests.scala b/tests/src/test/scala/system/basic/WskRestBasicTests.scala
index 6100e47556..b279a29f72 100644
--- a/tests/src/test/scala/system/basic/WskRestBasicTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicTests.scala
@@ -93,7 +93,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys
pack.getFieldJsValue("publish") shouldBe JsBoolean(true)
pack.getFieldJsValue("parameters") shouldBe JsArray(JsObject("key" -> JsString("a"), "value" -> JsString("A")))
val packageList = wsk.pkg.list()
- val packages = packageList.getBodyListJsObject()
+ val packages = packageList.getBodyListJsObject
packages.exists(pack => RestResult.getField(pack, "name") == name) shouldBe true
}
@@ -233,7 +233,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys
action.getFieldJsValue("parameters") shouldBe JsArray(JsObject("key" -> JsString("b"), "value" -> JsString("B")))
action.getFieldJsValue("publish") shouldBe JsBoolean(false)
val actionList = wsk.action.list()
- val actions = actionList.getBodyListJsObject()
+ val actions = actionList.getBodyListJsObject
actions.exists(action => RestResult.getField(action, "name") == name) shouldBe true
}
@@ -497,7 +497,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys
action.create(name, None, docker = Some("fake-container"))
}
- wsk.action.get(name).stdout should not include (""""code"""")
+ wsk.action.get(name).stdout should not include """"code""""
}
behavior of "Wsk Trigger REST"
@@ -567,7 +567,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys
}
val triggerList = wsk.trigger.list()
- val triggers = triggerList.getBodyListJsObject()
+ val triggers = triggerList.getBodyListJsObject
triggers.exists(trigger => RestResult.getField(trigger, "name") == triggerName) shouldBe true
}
@@ -862,7 +862,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys
rule.getField("name") shouldBe ruleName
RestResult.getField(rule.getFieldJsObject("trigger"), "name") shouldBe triggerName
RestResult.getField(rule.getFieldJsObject("action"), "name") shouldBe actionName
- val rules = wsk.rule.list().getBodyListJsObject()
+ val rules = wsk.rule.list().getBodyListJsObject
rules.exists { rule =>
RestResult.getField(rule, "name") == ruleName
} shouldBe true
@@ -938,9 +938,9 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys
val result = wsk.rule.get(ruleName)
val trigger = result.getFieldJsValue("trigger").toString
trigger should include(triggerName)
- trigger should not include (actionName)
+ trigger should not include actionName
val action = result.getFieldJsValue("action").toString
- action should not include (triggerName)
+ action should not include triggerName
action should include(actionName)
}
@@ -1001,7 +1001,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys
it should "return a list of exactly one namespace" in {
val lines = wsk.namespace.list()
- lines.getBodyListString().size shouldBe 1
+ lines.getBodyListString.size shouldBe 1
}
behavior of "Wsk Activation REST"
diff --git a/tests/src/test/scala/system/basic/WskRestRuleTests.scala b/tests/src/test/scala/system/basic/WskRestRuleTests.scala
index 7b2e6f9eb4..1223991503 100644
--- a/tests/src/test/scala/system/basic/WskRestRuleTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestRuleTests.scala
@@ -40,14 +40,14 @@ class WskRestRuleTests extends WskRuleTests with WskActorSystem {
ruleNameEnable: String,
ruleName: String): org.scalatest.Assertion = {
val ruleListResultRest = ruleListResult.asInstanceOf[RestResult]
- val rules = ruleListResultRest.getBodyListJsObject()
+ val rules = ruleListResultRest.getBodyListJsObject
val ruleEnable = wsk.rule.get(ruleNameEnable)
ruleEnable.getField("status") shouldBe "active"
val ruleDisable = wsk.rule.get(ruleName)
ruleDisable.getField("status") shouldBe "inactive"
rules.exists(rule => RestResult.getField(rule, "name") == ruleNameEnable) shouldBe true
rules.exists(rule => RestResult.getField(rule, "name") == ruleName) shouldBe true
- ruleListResultRest.respData should not include ("Unknown")
+ ruleListResultRest.respData should not include "Unknown"
}
it should "preserve rule status when a rule is updated" in withAssetCleaner(wskprops) { (wp, assetHelper) =>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services