This is an automated email from the ASF dual-hosted git repository.
rabbah pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-package-kafka.git
The following commit(s) were added to refs/heads/master by this push:
new ef61e6c Change nodejs:6 to default. (#369)
ef61e6c is described below
commit ef61e6ca9d095469b41b339737a642cd7b18cb55
Author: rodric rabbah <[email protected]>
AuthorDate: Tue May 26 10:51:34 2020 -0400
Change nodejs:6 to default. (#369)
* Change nodejs:6 to default.
* Update dependencies.
* Do npm install and bundle node modules with zip.
---
action/kafkaFeedWeb_package.json | 7 ++++++-
action/kafkaFeed_package.json | 7 ++++++-
action/messageHubFeedWeb_package.json | 5 ++++-
action/messageHubFeed_package.json | 8 +++++++-
installCatalog.sh | 7 +++++--
installKafka.sh | 12 ++++++++----
6 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/action/kafkaFeedWeb_package.json b/action/kafkaFeedWeb_package.json
index 78b5c57..fa8a668 100644
--- a/action/kafkaFeedWeb_package.json
+++ b/action/kafkaFeedWeb_package.json
@@ -1,5 +1,10 @@
{
"name": "kafkaFeedWeb",
"version": "1.0.0",
- "main": "kafkaFeedWeb.js"
+ "main": "kafkaFeedWeb.js",
+ "dependencies": {
+ "moment": "^2.26.0",
+ "nano": "^8.2.2",
+ "request-promise": "^4.2.5"
+ }
}
diff --git a/action/kafkaFeed_package.json b/action/kafkaFeed_package.json
index 02a1614..d7cb1b7 100644
--- a/action/kafkaFeed_package.json
+++ b/action/kafkaFeed_package.json
@@ -1,5 +1,10 @@
{
"name": "kafkaFeed",
"version": "1.0.0",
- "main": "kafkaFeed.js"
+ "main": "kafkaFeed.js",
+ "dependencies": {
+ "moment": "^2.26.0",
+ "nano": "^8.2.2",
+ "request-promise": "^4.2.5"
+ }
}
diff --git a/action/messageHubFeedWeb_package.json
b/action/messageHubFeedWeb_package.json
index 00b159d..3f1eb58 100644
--- a/action/messageHubFeedWeb_package.json
+++ b/action/messageHubFeedWeb_package.json
@@ -3,6 +3,9 @@
"version": "1.0.0",
"main": "messageHubFeedWeb.js",
"dependencies": {
- "@ibm-functions/iam-token-manager": "^1.0.0"
+ "@ibm-functions/iam-token-manager": "^1.0.0",
+ "moment": "^2.26.0",
+ "nano": "^8.2.2",
+ "request-promise": "^4.2.5"
}
}
diff --git a/action/messageHubFeed_package.json
b/action/messageHubFeed_package.json
index a86035a..9455b1a 100644
--- a/action/messageHubFeed_package.json
+++ b/action/messageHubFeed_package.json
@@ -1,5 +1,11 @@
{
"name": "messageHubFeed",
"version": "1.0.0",
- "main": "messageHubFeed.js"
+ "main": "messageHubFeed.js",
+ "dependencies": {
+ "@ibm-functions/iam-token-manager": "^1.0.0",
+ "moment": "^2.26.0",
+ "nano": "^8.2.2",
+ "request-promise": "^4.2.5"
+ }
}
diff --git a/installCatalog.sh b/installCatalog.sh
index 18f31bf..b794033 100755
--- a/installCatalog.sh
+++ b/installCatalog.sh
@@ -42,7 +42,7 @@ DB_NAME="${4}ow_kafka_triggers"
APIHOST="$5"
WORKERS="$6"
INSTALL_PRODUCE_ACTION=${INSTALL_PRODUCE_ACTION:="true"}
-ACTION_RUNTIME_VERSION=${ACTION_RUNTIME_VERSION:="nodejs:6"}
+ACTION_RUNTIME_VERSION=${ACTION_RUNTIME_VERSION:="nodejs:default"}
# If the auth key file exists, read the key in the file. Otherwise, take the
# first argument as the key itself.
@@ -76,7 +76,9 @@ then
fi
cp -f messageHubFeed_package.json package.json
-zip -r messageHubFeed.zip lib package.json messageHubFeed.js -q
+rm -rf node_modules
+npm install
+zip -r messageHubFeed.zip lib package.json messageHubFeed.js node_modules -q
$WSK_CLI -i --apihost "$EDGEHOST" action update --kind
"$ACTION_RUNTIME_VERSION" messaging/messageHubFeed
"$PACKAGE_HOME/action/messageHubFeed.zip" \
--auth "$AUTH" \
@@ -112,6 +114,7 @@ then
fi
cp -f messageHubFeedWeb_package.json package.json
+rm -rf node_modules
npm install
zip -r messageHubFeedWeb.zip lib package.json messageHubFeedWeb.js
node_modules -q
diff --git a/installKafka.sh b/installKafka.sh
index 595f2b4..8f17dac 100755
--- a/installKafka.sh
+++ b/installKafka.sh
@@ -72,10 +72,12 @@ then
fi
cp -f kafkaFeed_package.json package.json
-zip -r kafkaFeed.zip lib package.json kafkaFeed.js
+rm -rf node_modules
+npm install
+zip -r kafkaFeed.zip lib package.json kafkaFeed.js node_modules
cd $OLD_PATH
-$WSK_CLI -i --apihost "$EDGEHOST" action update --kind nodejs:6
messaging/kafkaFeed "$PACKAGE_HOME/action/kafkaFeed.zip" \
+$WSK_CLI -i --apihost "$EDGEHOST" action update --kind nodejs:default
messaging/kafkaFeed "$PACKAGE_HOME/action/kafkaFeed.zip" \
--auth "$AUTH" \
-a feed true \
-a description 'Feed to listen to Kafka messages' \
@@ -111,12 +113,14 @@ then
fi
cp -f kafkaFeedWeb_package.json package.json
-zip -r kafkaFeedWeb.zip lib package.json kafkaFeedWeb.js
+rm -rf node_modules
+npm install
+zip -r kafkaFeedWeb.zip lib package.json kafkaFeedWeb.js node_modules
cd $OLD_PATH
-$WSK_CLI -i --apihost "$EDGEHOST" action update --kind nodejs:6
messagingWeb/kafkaFeedWeb "$PACKAGE_HOME/action/kafkaFeedWeb.zip" \
+$WSK_CLI -i --apihost "$EDGEHOST" action update --kind nodejs:default
messagingWeb/kafkaFeedWeb "$PACKAGE_HOME/action/kafkaFeedWeb.zip" \
--auth "$AUTH" \
--web true \
-a description 'Write a new trigger to Kafka provider DB' \
