From 583b154661ff0bb46b7c85a1ba92c2ec285b714d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Th=C3=B6mmes?= Date: Wed, 6 Jun 2018 16:00:19 +0200 Subject: [PATCH] Only get action metadata when working with rules. (#3718) Working with rules only requires to make sure certain actions exist. We only need their metadata, not the full blown action including its code. --- .../src/main/scala/whisk/core/controller/Rules.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/controller/src/main/scala/whisk/core/controller/Rules.scala b/core/controller/src/main/scala/whisk/core/controller/Rules.scala index 87fe771ac79..c041ef0a761 100644 --- a/core/controller/src/main/scala/whisk/core/controller/Rules.scala +++ b/core/controller/src/main/scala/whisk/core/controller/Rules.scala @@ -393,7 +393,7 @@ trait WhiskRulesApi extends WhiskCollectionAPI with ReferencedEntities { * @return future that completes with references trigger and action if they exist */ private def checkTriggerAndActionExist(trigger: FullyQualifiedEntityName, action: FullyQualifiedEntityName)( - implicit transid: TransactionId): Future[(WhiskTrigger, WhiskAction)] = { + implicit transid: TransactionId): Future[(WhiskTrigger, WhiskActionMetaData)] = { for { triggerExists <- WhiskTrigger.get(entityStore, trigger.toDocId) recoverWith { @@ -408,7 +408,7 @@ trait WhiskRulesApi extends WhiskCollectionAPI with ReferencedEntities { } actionExists <- WhiskAction.resolveAction(entityStore, action) flatMap { resolvedName => - WhiskAction.get(entityStore, resolvedName.toDocId) + WhiskActionMetaData.get(entityStore, resolvedName.toDocId) } recoverWith { case _: NoDocumentException => Future.failed {