[GitHub] csantanapr closed pull request #2814: Add action kind to activation record.

[GitBox <gi...@apache.org>]

csantanapr closed pull request #2814: Add action kind to activation record.
URL: https://github.com/apache/incubator-openwhisk/pull/2814
 
 
   

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/core/invoker/src/main/scala/whisk/core/containerpool/ContainerProxy.scala b/core/invoker/src/main/scala/whisk/core/containerpool/ContainerProxy.scala
index a9d3f82097..8df292dfc1 100644
--- a/core/invoker/src/main/scala/whisk/core/containerpool/ContainerProxy.scala
+++ b/core/invoker/src/main/scala/whisk/core/containerpool/ContainerProxy.scala
@@ -431,7 +431,9 @@ object ContainerProxy {
       response = response,
       annotations = {
         Parameters("limits", job.action.limits.toJson) ++
-          Parameters("path", job.action.fullyQualifiedName(false).toString.toJson) ++ causedBy
+          Parameters("path", job.action.fullyQualifiedName(false).toString.toJson) ++
+          Parameters("kind", job.action.exec.kind.toJson) ++
+          causedBy
       })
   }
 }
diff --git a/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala b/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala
index ca890a31dc..ca9d6f44ee 100644
--- a/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala
@@ -133,7 +133,10 @@ class ContainerProxyTests
   }
 
   /** Creates an inspectable version of the ack method, which records all calls in a buffer */
-  def createAcker = LoggedFunction { (_: TransactionId, _: WhiskActivation, _: Boolean, _: InstanceId) =>
+  def createAcker = LoggedFunction { (_: TransactionId, activation: WhiskActivation, _: Boolean, _: InstanceId) =>
+    activation.annotations.get("limits") shouldBe Some(action.limits.toJson)
+    activation.annotations.get("path") shouldBe Some(action.fullyQualifiedName(false).toString.toJson)
+    activation.annotations.get("kind") shouldBe Some(action.exec.kind.toJson)
     Future.successful(())
   }
 


 

----------------------------------------------------------------
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