add default version feature

Author: jiangpengcheng

ansible/files/whisks_design_document_for_entities_db_v2.1.0.json

@@ -23,7 +23,7 @@
       "reduce": "_count"
     },
     "action-versions": {
-      "map": "function (doc) {\n  var isAction = function (doc) { return (doc.exec !== undefined) };\n  if (isAction(doc)) try {\n    var published = true;\n    doc.annotations.forEach(function(anno) {\n      if(anno[\"key\"] == \"publish\")\n        published = anno[\"value\"]\n    });\n    \n    var value = {\n      namespace: doc.namespace,\n      name: doc.name,\n      _id: doc._id,\n      version: doc.version,\n      publish: published,\n    };\n    var versions = doc.version.split(\".\")\n    emit([doc.namespace + \"/\" + doc.name], value);\n  } catch (e) {}\n}"
+      "map": "function (doc) {\n  var isAction = function (doc) { return (doc.exec !== undefined) };\n  if (isAction(doc)) try {\n    var value = {\n      _id: doc.namespace + \"/\" + doc.name + \"/default\",\n      namespace: doc.namespace,\n      name: doc.name,\n      id: doc._id,\n      version: doc.version\n    };\n    emit([doc.namespace + \"/\" + doc.name], value);\n  } catch (e) {}\n}"
     }
   }
 }

common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskAction.scala

@@ -361,14 +361,19 @@ case class ExecutableWhiskActionMetaData(namespace: EntityPath,
 case class WhiskActionVersion(id: String, namespace: EntityPath, name: EntityName, version: SemVer, publish: Boolean)
 
 object WhiskActionVersion {
-  val serdes = jsonFormat(WhiskActionVersion.apply, "_id", "namespace", "name", "version", "publish")
+  val serdes = jsonFormat(WhiskActionVersion.apply, "id", "namespace", "name", "version", "publish")
 }
 
-case class WhiskActionVersionList(namespace: EntityPath, name: EntityName, versions: Map[SemVer, String]) {
+case class WhiskActionVersionList(namespace: EntityPath,
+                                  name: EntityName,
+                                  versions: Map[SemVer, String],
+                                  defaultVersion: Option[String]) {
   def matchedDocId(version: Option[SemVer]): Option[DocId] = {
     version match {
       case Some(ver) =>
         versions.get(ver).map(DocId(_))
+      case None if defaultVersion.nonEmpty =>
+        versions.get(SemVer(defaultVersion.get)).map(DocId(_))
       case None if versions.nonEmpty =>
         Some(DocId(versions.maxBy(_._1)._2))
       case _ =>
@@ -385,7 +390,7 @@ object WhiskActionVersionList extends MultipleReadersSingleWriterCache[WhiskActi
     CacheKey(action.fullPath.asString)
   }
 
-  def get(action: FullyQualifiedEntityName, datastore: EntityStore, fetchAll: Boolean = true)(
+  def get(action: FullyQualifiedEntityName, datastore: EntityStore, fromCache: Boolean = true)(
     implicit transId: TransactionId): Future[WhiskActionVersionList] = {
     implicit val logger: Logging = datastore.logging
     implicit val ec = datastore.executionContext
@@ -401,7 +406,7 @@ object WhiskActionVersionList extends MultipleReadersSingleWriterCache[WhiskActi
           endKey = endKey,
           skip = 0,
           limit = 0,
-          includeDocs = false,
+          includeDocs = true,
           descending = false,
           reduce = false,
           stale = StaleParameter.No)
@@ -411,24 +416,32 @@ object WhiskActionVersionList extends MultipleReadersSingleWriterCache[WhiskActi
           }
           val mappings = values
             .map(WhiskActionVersion.serdes.read(_))
-            .filter(_.publish || fetchAll)
             .map { actionVersion =>
               (actionVersion.version, actionVersion.id)
             }
             .toMap
-          WhiskActionVersionList(action.namespace.toPath, action.name, mappings)
-        })
+          val defaultVersion = if (result.nonEmpty) {
+            val doc = result.head.fields.getOrElse("doc", JsNull)
+            if (doc != JsNull) doc.asJsObject.fields.get("default").map(_.convertTo[String])
+            else
+              None
+          } else None
+          WhiskActionVersionList(action.namespace.toPath, action.name, mappings, defaultVersion)
+        },
+      fromCache)
   }
 
   def getMatchedDocId(
     action: FullyQualifiedEntityName,
     version: Option[SemVer],
     datastore: EntityStore,
     tryAgain: Boolean = true)(implicit transId: TransactionId, ec: ExecutionContext): Future[Option[DocId]] = {
-    get(action, datastore, version.nonEmpty).flatMap { res =>
+    get(action, datastore).flatMap { res =>
       val docId = version match {
         case Some(ver) =>
           res.versions.get(ver).map(DocId(_))
+        case None if res.defaultVersion.nonEmpty =>
+          res.versions.get(SemVer(res.defaultVersion.get)).map(DocId(_))
         case None if res.versions.nonEmpty =>
           Some(DocId(res.versions.maxBy(_._1)._2))
         case _ =>

core/controller/src/main/scala/org/apache/openwhisk/core/controller/Actions.scala

@@ -229,7 +229,7 @@ trait WhiskActionsApi extends WhiskCollectionAPI with PostActionActivation with
 
         onComplete(checkAdditionalPrivileges) {
           case Success(_) =>
-            onComplete(WhiskActionVersionList.get(entityName, entityStore)) {
+            onComplete(WhiskActionVersionList.get(entityName, entityStore, false)) {
               case Success(result) if (result.versions.size >= actionMaxVersionLimit && !deleteOld) =>
                 terminate(
                   Forbidden,
@@ -377,7 +377,7 @@ trait WhiskActionsApi extends WhiskCollectionAPI with PostActionActivation with
    */
   override def remove(user: Identity, entityName: FullyQualifiedEntityName)(implicit transid: TransactionId) = {
     parameter('version.as[SemVer] ?, 'deleteAll ? false) { (version, deleteAll) =>
-      onComplete(WhiskActionVersionList.get(entityName, entityStore)) {
+      onComplete(WhiskActionVersionList.get(entityName, entityStore, false)) {
         case Success(results) =>
           version match {
             case Some(_) =>