This is an automated email from the ASF dual-hosted git repository.
markusthoemmes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 6126a94 update to akka-http 10.1.11 (#4759)
6126a94 is described below
commit 6126a9478f67044a208fbd2cedc0c0274d3ed4c3
Author: tysonnorris
AuthorDate: Mon Dec 2 23:34:24 2019 -0800
update to akka-http 10.1.11 (#4759)
---
.../scala/org/apache/openwhisk/core/controller/Actions.scala | 2 +-
.../scala/org/apache/openwhisk/core/controller/Entities.scala | 4 ++--
settings.gradle| 2 +-
.../openwhisk/core/controller/test/ActionsApiTests.scala | 10 +-
.../openwhisk/core/controller/test/PackagesApiTests.scala | 6 +++---
.../apache/openwhisk/core/controller/test/RulesApiTests.scala | 4 ++--
.../openwhisk/core/controller/test/TriggersApiTests.scala | 8
.../openwhisk/core/controller/test/WebActionsApiTests.scala| 4 ++--
.../org/apache/openwhisk/core/limits/ActionLimitsTests.scala | 4 ++--
9 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/core/controller/src/main/scala/org/apache/openwhisk/core/controller/Actions.scala
b/core/controller/src/main/scala/org/apache/openwhisk/core/controller/Actions.scala
index 3cbbb6c..bc044f4 100644
---
a/core/controller/src/main/scala/org/apache/openwhisk/core/controller/Actions.scala
+++
b/core/controller/src/main/scala/org/apache/openwhisk/core/controller/Actions.scala
@@ -304,7 +304,7 @@ trait WhiskActionsApi extends WhiskCollectionAPI with
PostActionActivation with
}
case Failure(t: RecordTooLargeException) =>
logging.debug(this, s"[POST] action payload was too large")
-terminate(RequestEntityTooLarge)
+terminate(PayloadTooLarge)
case Failure(RejectRequest(code, message)) =>
logging.debug(this, s"[POST] action rejected with code $code:
$message")
terminate(code, message)
diff --git
a/core/controller/src/main/scala/org/apache/openwhisk/core/controller/Entities.scala
b/core/controller/src/main/scala/org/apache/openwhisk/core/controller/Entities.scala
index 6370e2e..5e70f71 100644
---
a/core/controller/src/main/scala/org/apache/openwhisk/core/controller/Entities.scala
+++
b/core/controller/src/main/scala/org/apache/openwhisk/core/controller/Entities.scala
@@ -21,7 +21,7 @@ import scala.concurrent.Future
import scala.language.postfixOps
import scala.util.Try
import akka.http.scaladsl.marshallers.sprayjson.SprayJsonSupport._
-import akka.http.scaladsl.model.StatusCodes.RequestEntityTooLarge
+import akka.http.scaladsl.model.StatusCodes.PayloadTooLarge
import akka.http.scaladsl.model.headers.RawHeader
import akka.http.scaladsl.server.Directive0
import akka.http.scaladsl.server.Directives
@@ -46,7 +46,7 @@ protected[controller] trait ValidateRequestSize extends
Directives {
new Directive0 {
override def tapply(f: Unit => Route) = {
check map {
- case e: SizeError => terminate(RequestEntityTooLarge,
Messages.entityTooBig(e))
+ case e: SizeError => terminate(PayloadTooLarge,
Messages.entityTooBig(e))
} getOrElse f(None)
}
}
diff --git a/settings.gradle b/settings.gradle
index a0c8e2d..ba8b4db 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -47,7 +47,7 @@ gradle.ext.scalafmt = [
gradle.ext.akka = [version : '2.5.26']
gradle.ext.akka_kafka = [version : '1.1.0']
-gradle.ext.akka_http = [version : '10.1.10']
+gradle.ext.akka_http = [version : '10.1.11']
gradle.ext.curator = [version : '4.0.0']
gradle.ext.kube_client = [version: '4.4.2']
diff --git
a/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ActionsApiTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ActionsApiTests.scala
index b46a3a4..9a6075e 100644
---
a/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ActionsApiTests.scala
+++
b/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ActionsApiTests.scala
@@ -478,7 +478,7 @@ class ActionsApiTests extends ControllerTestCommon with
WhiskActionsApi {
val exec: Exec = jsDefault(code)
val content = JsObject("exec" -> exec.toJson)
Put(s"$collectionPath/${aname()}", content) ~> Route.seal(routes(creds))
~> check {
- status should be(RequestEntityTooLarge)
+ status should be(PayloadTooLarge)
responseAs[String] should include {
Messages.entityTooBig(SizeError(WhiskAction.execFieldName, exec.size,
Exec.sizeLimit))
}
@@ -507,7 +507,7 @@ class ActionsApiTests extends ControllerTestCommon with
WhiskActionsApi {
val content = JsObject("exec" -> exec.toJson)
put(entityStore, action)
Put(s"$collectionPath/${action.name}?overwrite=true", content) ~>
Route.seal(routes(creds)) ~> check {
- status should
