[incubator-openwhisk-package-pushnotifications] branch master updated: remove unused namespace param (#80)

[be...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 29fcbca  remove unused namespace param (#80)
29fcbca is described below

commit 29fcbca49ef8038454e7052e4010e3b8affe8ec1
Author: Dan Lavine <dl...@us.ibm.com>
AuthorDate: Mon Jul 10 19:20:25 2017 +0000

    remove unused namespace param (#80)
---
 README.md                  |  4 ++--
 packages/installCatalog.sh | 15 +++++++--------
 tools/travis/build.sh      |  3 +--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index cb4f09d..43a4dc6 100644
--- a/README.md
+++ b/README.md
@@ -194,5 +194,5 @@ The following is an example of creating a trigger that will be fired each time t
 
 1. git clone https://github.com/openwhisk/openwhisk-package-pushnotifications
 2. cd openwhisk-package-pushnotifications/packages
-3. ./installCatalog.sh AUTH APIHOST NAMESPACE WSK_CLI
-   AUTH is your auth key.  APIHOST is the OpenWhisk hostname.  NAMESPACE is the namespace to install the package in.  WSK_CLI is location of the Openwhisk CLI binary.
+3. ./installCatalog.sh AUTH APIHOST WSK_CLI
+   AUTH is your auth key.  APIHOST is the OpenWhisk hostname.  WSK_CLI is location of the Openwhisk CLI binary.
diff --git a/packages/installCatalog.sh b/packages/installCatalog.sh
index 3637aac..3bb07da 100755
--- a/packages/installCatalog.sh
+++ b/packages/installCatalog.sh
@@ -4,8 +4,8 @@
 # automatically
 #
 # To run this command
-# ./installCatalog.sh  <AUTH> <APIHOST> <NAMESPACE> <WSK_CLI>
-# AUTH, APIHOST and NAMESPACE are found in $HOME/.wskprops
+# ./installCatalog.sh  <AUTH> <APIHOST> <WSK_CLI>
+# AUTH and APIHOST are found in $HOME/.wskprops
 # WSK_CLI="$OPENWHISK_HOME/bin/wsk"
 
 set -e
@@ -13,13 +13,12 @@ set -x
 
 if [ $# -eq 0 ]
 then
-echo "Usage: ./installCatalog.sh <authkey> <apihost> <namespace> <pathtowskcli>"
+echo "Usage: ./installCatalog.sh <authkey> <apihost> <pathtowskcli>"
 fi
 
 AUTH="$1"
 APIHOST="$2"
-NAMESPACE="$3"
-WSK_CLI="$4"
+WSK_CLI="$3"
 
 # If the auth key file exists, read the key in the file. Otherwise, take the
 # first argument as the key itself.
@@ -35,13 +34,13 @@ export WSK_CONFIG_FILE= # override local property file to avoid namespace clashe
 
 echo Installing pushnotifications package.
 
-$WSK_CLI -i --apihost "$APIHOST"  package update --auth "$AUTH"  --shared yes "$NAMESPACE/pushnotifications" \
+$WSK_CLI -i --apihost "$APIHOST"  package update --auth "$AUTH"  --shared yes "/pushnotifications" \
 -a description "This package supports sending push notifications to your mobile device, using the IBM Bluemix Push Notifications service." \
 -a parameters '[ {"name":"appGuid", "required":true, "bindTime":true, "description":"Bluemix application GUID"}, {"name":"appSecret", "required":true, "bindTime":true, "type":"password", "description":"Bluemix Push Service Secret"}]' \
 -a prettyName "Push Notifications" \
 -p bluemixServiceName 'imfpush'
 
-$WSK_CLI -i --apihost "$APIHOST" action update --auth "$AUTH" "$NAMESPACE/pushnotifications/webhook" "$PACKAGE_HOME/feeds/webhook.js" \
+$WSK_CLI -i --apihost "$APIHOST" action update --auth "$AUTH" "/pushnotifications/webhook" "$PACKAGE_HOME/feeds/webhook.js" \
 -a feed true \
 -a description 'pushnotifications feed' \
 -a parameters '[ {"name":"appGuid", "required":true, "bindTime":true, "description":"Bluemix application GUID"}, {"name":"appSecret", "required":true, "bindTime":true, "type":"password", "description":"Bluemix Push Service Secret"},{"name":"events", "required":true, "description":"Name of the event user want to subscribe"} ]' \
@@ -49,7 +48,7 @@ $WSK_CLI -i --apihost "$APIHOST" action update --auth "$AUTH" "$NAMESPACE/pushno
 -a sampleOutput '{"tagName": "tagName","eventType": "onDeviceRegister","applicationId": "xxx-xxx-xx"}'
 
 
-$WSK_CLI -i --apihost "$APIHOST" action update --auth "$AUTH" "$NAMESPACE/pushnotifications/sendMessage" "$PACKAGE_HOME/actions/sendMessage.js" \
+$WSK_CLI -i --apihost "$APIHOST" action update --auth "$AUTH" "/pushnotifications/sendMessage" "$PACKAGE_HOME/actions/sendMessage.js" \
 -a description 'Send push notification to all application users or to a specific set of devices' \
 -a parameters '[ {"name":"appGuid", "required":true, "bindTime":true, "description":"Bluemix application GUID"}, {"name":"appSecret", "required":true, "bindTime":true, "type":"password", "description":"Bluemix Push Service Secret"}, {"name":"text", "required":true, "description":"The notification message to be shown to the user"}, {"name":"url", "required":false, "description":"An optional URL that can be sent along with the alert"}, {"name":"deviceIds", "required":false, "description":" [...]
 -a sampleInput '{"appGuid":"xxx-xxx-xx", "appSecret":"yyy-yyy-yyy", "text":"hi there"}' \
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 0f8a613..b541e99 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -42,13 +42,12 @@ cat whisk.properties
 WSK_CLI=$WHISKDIR/bin/wsk
 AUTH_KEY=$(cat $WHISKDIR/ansible/files/auth.whisk.system)
 EDGE_HOST=$(grep '^edge.host=' $WHISKPROPS_FILE | cut -d'=' -f2)
-WSK_NAMESPACE=/whisk.system
 
 # Set Environment
 export OPENWHISK_HOME=$WHISKDIR
 
 # Install the package
-source $ROOTDIR/packages/installCatalog.sh $AUTH_KEY $EDGE_HOST $WSK_NAMESPACE $WSK_CLI
+source $ROOTDIR/packages/installCatalog.sh $AUTH_KEY $EDGE_HOST $WSK_CLI
 
 # Test
 cd $ROOTDIR

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