dubeejw commented on a change in pull request #2847: Treat action code as
attachments for created/updated actions
URL:
https://github.com/apache/incubator-openwhisk/pull/2847#discussion_r144643287
##########
File path: common/scala/src/main/scala/whisk/core/entity/Exec.scala
##########
@@ -241,21 +241,33 @@ protected[core] object Exec extends ArgNormalizer[Exec]
with DefaultJsonProtocol
manifest.attached
.map { a =>
- val jar: Attachment[String] = {
- // java actions once stored the attachment in "jar" instead of
"code"
- obj.fields.get("code").orElse(obj.fields.get("jar"))
+ // java actions once stored the attachment in "jar" instead of
"code"
+ val code = obj.fields.get("code").orElse(obj.fields.get("jar"))
+
+ val binary: Boolean = code match {
+ case Some(JsString(c)) => isBinaryCode(c)
+ case _ =>
+ obj.fields.get("binary") match {
+ case Some(JsBoolean(b)) => b
+ case _ => false
+ }
+ }
+
+ val attachment: Attachment[String] = {
+ code
} map {
attFmt[String].read(_)
} getOrElse {
- throw new DeserializationException(
- s"'code' must be a valid base64 string in 'exec' for '$kind'
actions")
+ throw new DeserializationException(s"'code' must be a string
defined in 'exec' for '$kind' actions")
Review comment:
Not sure we will ever get here. Since I think the function in map will work
even for an empty string.
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services