remove Weather Company Data package; IBM-specific and not maintained. (#322)
diff --git a/.gitignore b/.gitignore
index ca8397f..21da16d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
# Gradle
.gradle
build/
-tests/credentials.json
.project
tests/.cache-main
tests/.classpath
diff --git a/README.md b/README.md
index 63f1ed9..0f444aa 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
This openwhisk-catalog maintains the package catalogs of openwhisk. In OpenWhisk, the catalog
of packages gives you an easy way to enhance your app with useful capabilities, and to access
external services in the ecosystem. Examples of external services that are OpenWhisk-enabled
-include the Weather Company, Slack, and GitHub.system packages and sample packages.
+include the Slack and GitHub.system packages and sample packages.
The catalog is available as packages in the `/whisk.system` namespace. See [Browsing packages](https://github.com/openwhisk/openwhisk/blob/master/docs/packages.md#browsing-packages)
for information about how to browse the catalog by using the command line tool.
@@ -57,7 +57,6 @@
| --- | --- |
| [/whisk.system/github](./packages/github/README.md) | offers a convenient way to use the [GitHub APIs](https://developer.github.com/). |
| [/whisk.system/slack](./packages/slack/README.md) | offers a convenient way to use the [Slack APIs](https://api.slack.com/). |
-| [/whisk.system/weather](./packages/weather/README.md) | Services from the Weather Company Data for IBM Cloud API|
| [/whisk.system/websocket](./packages/websocket/README.md) | Package to send messages to Web Socket server|
<!--
diff --git a/credentials.json.enc b/credentials.json.enc
deleted file mode 100644
index 0512901..0000000
--- a/credentials.json.enc
+++ /dev/null
Binary files differ
diff --git a/packages/installCatalogUsingWskdeploy.sh b/packages/installCatalogUsingWskdeploy.sh
index b13ea6c..b286b8a 100755
--- a/packages/installCatalogUsingWskdeploy.sh
+++ b/packages/installCatalogUsingWskdeploy.sh
@@ -43,8 +43,6 @@
deployProject "$SCRIPTDIR/utils/"
-deployProject "$SCRIPTDIR/weather/"
-
deployProject "$SCRIPTDIR/websocket/"
deployProject "$SCRIPTDIR/samples/"
diff --git a/packages/weather/README.md b/packages/weather/README.md
deleted file mode 100644
index 7d76c52..0000000
--- a/packages/weather/README.md
+++ /dev/null
@@ -1,89 +0,0 @@
-<!--
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
--->
-
-## Using the Weather package
-
-The `/whisk.system/weather` package offers a convenient way to call the Weather Company Data for IBM Cloud API.
-
-The package includes the following action.
-
-| Entity | Type | Parameters | Description |
-| --- | --- | --- | --- |
-| `/whisk.system/weather` | package | username, password | Services from the Weather Company Data for IBM Cloud API |
-| `/whisk.system/weather/forecast` | action | latitude, longitude, timePeriod | forecast for specified time period|
-
-Creating a package binding with the `username`, `password` and `host` values is suggested. This way, you don't need to specify the credentials every time you invoke the actions in the package.
-
-## Setting up the Weather package
-
-1. Create a Weather Company Data service instance in your IBM Cloud [dashboard](https://cloud.ibm.com).
-
-2. Create a package binding that is configured for your Weather Company Data service using the username, password, and host from its service credentials.
-
- ```
- wsk package bind /whisk.system/weather myWeather -p username MYUSERNAME -p password MYPASSWORD -p host HOST
- ```
-
-## Getting a weather forecast for a location
-
-The `/whisk.system/weather/forecast` action returns a weather forecast for a location by calling an API from The Weather Company. The parameters are as follows:
-
-- `username`: Username for The Weather Company Data for IBM Cloud that is entitled to invoke the forecast API.
-- `password`: Password for The Weather Company Data for IBM Cloud that is entitled to invoke the forecast API.
-- `latitude`: The latitude coordinate of the location.
-- `longitude`: The longitude coordinate of the location.
-- `timePeriod`: Time period for the forecast. Valid options are:
- - `10day` - (default) Returns a daily 10-day forecast
- - `48hour` - Returns an hourly 2-day forecast
- - `current` - Returns the current weather conditions
- - `timeseries` - Returns both the current observations and up to 24 hours of past observations, from the current date and time.
-- `host`: Host for The Weather Company Data for IBM Cloud
-
-
-The following is an example of getting a 10-day forecast.
-
-- Invoke the `forecast` action in your package binding to get the weather forecast.
-
- ```
- wsk action invoke myWeather/forecast --result \
- --param latitude 43.7 \
- --param longitude -79.4
- ```
- ```json
- {
- "forecasts": [
- {
- "dow": "Wednesday",
- "max_temp": -1,
- "min_temp": -16,
- "narrative": "Chance of a few snow showers. Highs -2 to 0C and lows -17 to -15C.",
- ...
- },
- {
- "class": "fod_long_range_daily",
- "dow": "Thursday",
- "max_temp": -4,
- "min_temp": -8,
- "narrative": "Mostly sunny. Highs -5 to -3C and lows -9 to -7C.",
- ...
- },
- ...
- ],
- }
- ```
diff --git a/packages/weather/forecast.js b/packages/weather/forecast.js
deleted file mode 100644
index d112ed8..0000000
--- a/packages/weather/forecast.js
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const needle = require('needle');
-
-/**
- * Get hourly weather forecast for a lat/long from the Weather API service.
- *
- * Must specify one of zipCode or latitude/longitude.
- *
- * @param username The Weather service API account username.
- * @param username The Weather service API account password.
- * @param latitude Latitude of coordinate to get forecast.
- * @param longitude Longitude of coordinate to get forecast.
- * @param zipCode ZIP code of desired forecast.
- * @return The hourly forecast for the lat/long.
- */
-function main(params) {
- console.log('input params:', params);
- var username = params.username;
- var password = params.password;
- var lat = params.latitude || '0';
- var lon = params.longitude || '0';
- var language = params.language || 'en-US';
- var units = params.units || 'm';
- var timePeriod = params.timePeriod || '10day';
- var host = params.host || 'twcservice.mybluemix.net';
- var url = 'https://' + host + '/api/weather/v1/geocode/' + lat + '/' + lon;
- var qs = { language: language, units: units };
-
- switch (timePeriod) {
- case '48hour':
- url += '/forecast/hourly/48hour.json';
- break;
- case 'current':
- url += '/observations.json';
- break;
- case 'timeseries':
- url += '/observations/timeseries.json';
- qs.hours = '23';
- break;
- default:
- url += '/forecast/daily/10day.json';
- break;
- }
-
- console.log('url:', url);
-
- var promise = new Promise(function (resolve, reject) {
- needle.request('get', url, qs, { 'username': username, 'password': password, timeout: 30000 }, function (error, response, body) {
- if (!error && response.statusCode === 200) {
- var j = JSON.parse(body);
- resolve(j);
- } else {
- console.log('error getting forecast');
- console.log('http status code:', (response || {}).statusCode);
- console.log('error:', error);
- console.log('body:', body);
- reject({
- error: error,
- response: response,
- body: body
- });
- }
- });
- });
-
- return promise;
-}
diff --git a/packages/weather/manifest.yaml b/packages/weather/manifest.yaml
deleted file mode 100644
index cded3b5..0000000
--- a/packages/weather/manifest.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-project:
- name: WhiskSystem
- packages:
- weather:
- license: Apache-2.0
- version: 0.0.1
- public: true
- annotations:
- description: "Services from the Weather Company Data for IBM Cloud"
- parameters: [
- {
- "name": "username",
- "required": false,
- "bindTime": true,
- },
- {
- "name": "password",
- "required": false,
- "type": "password",
- "bindTime": true,
- }
- ]
- inputs:
- bluemixServiceName:
- value: weatherInsights
- actions:
- forecast:
- version: 0.0.1
- function: forecast.js
- annotations:
- description: "IBM Weather Insights 10-day forecast"
- parameters: [
- {
- "name":"latitude",
- "required":true
- },
- {
- "name":"longitude",
- "required":true
- },
- {
- "name":"language",
- "required":false
- },
- {
- "name":"units",
- "required":false
- },
- {
- "name":"timePeriod",
- "required":false
- },
- {
- "name":"username",
- "required":true,
- "bindTime":true
- },
- {
- "name":"password",
- "required":true,
- "type":"password",
- "bindTime":true
- },
- {
- "name":"host",
- "required":false
- }
- ]
- sampleInput: {
- "latitude":"34.063",
- "longitude":"-84.217",
- "username":"XXX",
- "password":"XXX"
- }
- sampleOutput: {
- "forecasts": [
- {
- "dow":"Monday",
- "min_temp":30,
- "max_temp":38,
- "narrative":"Cloudy"
- }
- ]
- }
diff --git a/tests/build.gradle b/tests/build.gradle
index 991417b..a225e8c 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -35,7 +35,6 @@
task testWithoutCredentials(type: Test) {
exclude 'packages/slack/**'
- exclude 'packages/weather/**'
}
dependencies {
diff --git a/tests/src/test/scala/packages/weather/WeatherTests.scala b/tests/src/test/scala/packages/weather/WeatherTests.scala
deleted file mode 100644
index c2f7162..0000000
--- a/tests/src/test/scala/packages/weather/WeatherTests.scala
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package packages.weather
-
-import common._
-import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
-import spray.json.DefaultJsonProtocol._
-import spray.json._
-
-@RunWith(classOf[JUnitRunner])
-class WeatherTests
- extends TestHelpers
- with WskTestHelpers {
-
- implicit val wskprops = WskProps()
- val wsk = new Wsk
-
- val credentials = TestUtils.getVCAPcredentials("weatherinsights")
- val username = credentials.get("username").toJson
- val password = credentials.get("password").toJson
- val host = credentials.get("host").toJson
-
- behavior of "Weather Package"
-
- it should "have the ten day forecast" in {
- val name = "/whisk.system/weather/forecast"
- withActivation(wsk.activation, wsk.action.invoke(name, Map("username" -> username, "password" -> password))) {
- _.response.result.get.toString should include("forecasts")
- }
- }
-
- it should "have the current forecast" in {
- val name = "/whisk.system/weather/forecast"
- withActivation(wsk.activation, wsk.action.invoke(name, Map("username" -> username, "password" -> password, "timePeriod" -> "current".toJson))) {
- _.response.result.get.toString should include("observation")
- }
- }
-
- it should "have the 48 hour forecast" in {
- val name = "/whisk.system/weather/forecast"
- withActivation(wsk.activation, wsk.action.invoke(name, Map("username" -> username, "password" -> password, "timePeriod" -> "48hour".toJson))) {
- _.response.result.get.toString should include("forecasts")
- }
- }
-
- it should "have the timeseries forecast" in {
- val name = "/whisk.system/weather/forecast"
- withActivation(wsk.activation, wsk.action.invoke(name, Map("username" -> username, "password" -> password, "timePeriod" -> "timeseries".toJson))) {
- _.response.result.get.toString should include("observation")
- }
- }
-
- it should """Use "host" property""" in withAssetCleaner(wskprops) {
- (wp, assetHelper) =>
- val name = "forecastTest"
-
- assetHelper.withCleaner(wsk.pkg, name) {
- (pkg, name) =>
- pkg.bind("/whisk.system/weather", name,
- Map("username" -> username,
- "password" -> password,
- "host" -> host))
- }
- println("Invoking the action")
- withActivation(wsk.activation, wsk.action.invoke(s"${name}/forecast")) {
- activation =>
- activation.response.success shouldBe true
- }
- }
-}
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index 24daec3..cd5028b 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -62,11 +62,6 @@
cd $ROOTDIR/packages
./installCatalogUsingWskdeploy.sh $WHISKDIR/ansible/files/auth.whisk.system
-# Set credentials
-VCAP_SERVICES_FILE="$(readlink -f $ROOTDIR/tests/credentials.json)"
-WHISKPROPS_FILE="$WHISKDIR/whisk.properties"
-sed -i 's:^[ \t]*vcap.services.file[ \t]*=\([ \t]*.*\)$:vcap.services.file='$VCAP_SERVICES_FILE':' $WHISKPROPS_FILE
-
# Test
cd $ROOTDIR
