You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by mr...@apache.org on 2017/10/05 20:35:09 UTC

[incubator-openwhisk-wskdeploy] branch master updated: temp fix for trigger and rule overlapping (#595)

This is an automated email from the ASF dual-hosted git repository.

mrutkowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-wskdeploy.git


The following commit(s) were added to refs/heads/master by this push:
     new 02bad68  temp fix for trigger and rule overlapping (#595)
02bad68 is described below

commit 02bad68013e17ab9044a4203243d225132b2447d
Author: Priti Desai <pd...@us.ibm.com>
AuthorDate: Thu Oct 5 13:35:08 2017 -0700

    temp fix for trigger and rule overlapping (#595)
---
 .../apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml | 14 +++++++-------
 .../apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml  | 14 +++++++-------
 .../owbp-cloudant-trigger/runtimes/python/manifest.yaml    | 14 +++++++-------
 .../owbp-cloudant-trigger/runtimes/swift/manifest.yaml     | 14 +++++++-------
 tests/src/integration/cloudant/manifest.yaml               | 14 +++++++-------
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml b/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml
index 9454a09..bc35e14 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/node/manifest.yaml
@@ -6,8 +6,8 @@
 #   Package:    cloudant-trigger
 #   Action:     cloudant-trigger/process-change.js
 #   Sequence:   cloudant-trigger/process-change-cloudant-sequence
-#   Trigger:    data-inserted-trigger
-#   Rule:       log-change-rule
+#   Trigger:    node-data-inserted-trigger
+#   Rule:       node-log-change-rule
 
 # This manifest file reads following env. variables:
 #   CLOUDANT_USERNAME
@@ -25,9 +25,9 @@ packages:
                     password: $CLOUDANT_PASSWORD
                     host: ${CLOUDANT_USERNAME}.cloudant.com
         triggers:
-            # Trigger named "data-inserted-trigger"
+            # Trigger named "node-data-inserted-trigger"
             # Creating trigger to fire events when data is inserted into database
-            data-inserted-trigger:
+            node-data-inserted-trigger:
                 source: openwhisk-cloudant/changes
                 inputs:
                     dbname: $CLOUDANT_DATABASE
@@ -43,8 +43,8 @@ packages:
             process-change-cloudant-sequence:
                 actions: openwhisk-cloudant/read, process-change
         rules:
-            # Rule named "log-change-rule"
+            # Rule named "node-log-change-rule"
             # Creating rule that maps database change trigger to sequence
-            log-change-rule:
-                trigger: data-inserted-trigger
+            node-log-change-rule:
+                trigger: node-data-inserted-trigger
                 action: process-change-cloudant-sequence
diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml b/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml
index 5a6b537..0ffd173 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/php/manifest.yaml
@@ -6,8 +6,8 @@
 #   Package:    cloudant-trigger
 #   Action:     cloudant-trigger/process-change.js
 #   Sequence:   cloudant-trigger/process-change-cloudant-sequence
-#   Trigger:    data-inserted-trigger
-#   Rule:       log-change-rule
+#   Trigger:    php-data-inserted-trigger
+#   Rule:       php-log-change-rule
 
 # This manifest file reads following env. variables:
 #   CLOUDANT_USERNAME
@@ -25,9 +25,9 @@ packages:
                     password: $CLOUDANT_PASSWORD
                     host: ${CLOUDANT_USERNAME}.cloudant.com
         triggers:
-            # Trigger named "data-inserted-trigger"
+            # Trigger named "php-data-inserted-trigger"
             # Creating trigger to fire events when data is inserted into database
-            data-inserted-trigger:
+            php-data-inserted-trigger:
                 source: openwhisk-cloudant/changes
                 inputs:
                     dbname: $CLOUDANT_DATABASE
@@ -43,8 +43,8 @@ packages:
             process-change-cloudant-sequence:
                 actions: openwhisk-cloudant/read, process-change
         rules:
-            # Rule named "log-change-rule"
+            # Rule named "php-log-change-rule"
             # Creating rule that maps database change trigger to sequence
-            log-change-rule:
-                trigger: data-inserted-trigger
+            php-log-change-rule:
+                trigger: php-data-inserted-trigger
                 action: process-change-cloudant-sequence
diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml b/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml
index c9fbb4c..8de3fc0 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/python/manifest.yaml
@@ -6,8 +6,8 @@
 #   Package:    cloudant-trigger
 #   Action:     cloudant-trigger/process-change.js
 #   Sequence:   cloudant-trigger/process-change-cloudant-sequence
-#   Trigger:    data-inserted-trigger
-#   Rule:       log-change-rule
+#   Trigger:    python-data-inserted-trigger
+#   Rule:       python-log-change-rule
 
 # This manifest file reads following env. variables:
 #   CLOUDANT_USERNAME
@@ -25,9 +25,9 @@ packages:
                     password: $CLOUDANT_PASSWORD
                     host: ${CLOUDANT_USERNAME}.cloudant.com
         triggers:
-            # Trigger named "data-inserted-trigger"
+            # Trigger named "python-data-inserted-trigger"
             # Creating trigger to fire events when data is inserted into database
-            data-inserted-trigger:
+            python-data-inserted-trigger:
                 source: openwhisk-cloudant/changes
                 inputs:
                     dbname: $CLOUDANT_DATABASE
@@ -43,8 +43,8 @@ packages:
             process-change-cloudant-sequence:
                 actions: openwhisk-cloudant/read, process-change
         rules:
-            # Rule named "log-change-rule"
+            # Rule named "python-log-change-rule"
             # Creating rule that maps database change trigger to sequence
-            log-change-rule:
-                trigger: data-inserted-trigger
+            python-log-change-rule:
+                trigger: python-data-inserted-trigger
                 action: process-change-cloudant-sequence
diff --git a/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml b/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml
index 60a12d2..238a6b7 100644
--- a/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml
+++ b/tests/apps/owbp-cloudant-trigger/runtimes/swift/manifest.yaml
@@ -6,8 +6,8 @@
 #   Package:    cloudant-trigger
 #   Action:     cloudant-trigger/process-change.js
 #   Sequence:   cloudant-trigger/process-change-cloudant-sequence
-#   Trigger:    data-inserted-trigger
-#   Rule:       log-change-rule
+#   Trigger:    swift-data-inserted-trigger
+#   Rule:       swift-log-change-rule
 
 # This manifest file reads following env. variables:
 #   CLOUDANT_USERNAME
@@ -25,9 +25,9 @@ packages:
                     password: $CLOUDANT_PASSWORD
                     host: ${CLOUDANT_USERNAME}.cloudant.com
         triggers:
-            # Trigger named "data-inserted-trigger"
+            # Trigger named "swift-data-inserted-trigger"
             # Creating trigger to fire events when data is inserted into database
-            data-inserted-trigger:
+            swift-data-inserted-trigger:
                 source: openwhisk-cloudant/changes
                 inputs:
                     dbname: $CLOUDANT_DATABASE
@@ -43,8 +43,8 @@ packages:
             process-change-cloudant-sequence:
                 actions: openwhisk-cloudant/read, process-change
         rules:
-            # Rule named "log-change-rule"
+            # Rule named "swift-log-change-rule"
             # Creating rule that maps database change trigger to sequence
-            log-change-rule:
-                trigger: data-inserted-trigger
+            swift-log-change-rule:
+                trigger: swift-data-inserted-trigger
                 action: process-change-cloudant-sequence
diff --git a/tests/src/integration/cloudant/manifest.yaml b/tests/src/integration/cloudant/manifest.yaml
index 72b4a6d..bb3c83d 100644
--- a/tests/src/integration/cloudant/manifest.yaml
+++ b/tests/src/integration/cloudant/manifest.yaml
@@ -3,8 +3,8 @@
 #   Package:    openwhisk-cloudant
 #   Action:     cloudant-sample/process-change
 #   Sequence:   cloudant-sample/process-change-cloudant-sequence
-#   Trigger:    data-inserted-trigger
-#   Rule:       log-change-rule
+#   Trigger:    sample-data-inserted-trigger
+#   Rule:       sample-log-change-rule
 
 # This manifest file reads following env. variables:
 #   CLOUDANT_USERNAME
@@ -22,9 +22,9 @@ packages:
                     password: $CLOUDANT_PASSWORD
                     host: ${CLOUDANT_USERNAME}.cloudant.com
         triggers:
-            # Trigger named "data-inserted-trigger"
+            # Trigger named "sample-data-inserted-trigger"
             # Creating trigger to fire events when data is inserted into database
-            data-inserted-trigger:
+            sample-data-inserted-trigger:
                 source: openwhisk-cloudant/changes
                 inputs:
                     dbname: $CLOUDANT_DATABASE
@@ -40,8 +40,8 @@ packages:
             process-change-cloudant-sequence:
                 actions: openwhisk-cloudant/read, process-change
         rules:
-            # Rule named "log-change-rule"
+            # Rule named "sample-log-change-rule"
             # Creating rule that maps database change trigger to sequence
-            log-change-rule:
-                trigger: data-inserted-trigger
+            sample-log-change-rule:
+                trigger: sample-data-inserted-trigger
                 action: process-change-cloudant-sequence

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].