You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by pd...@apache.org on 2018/12/11 19:28:20 UTC
[incubator-openwhisk-wskdeploy] branch master updated: dropping
static data file on runtimes (#1017)
This is an automated email from the ASF dual-hosted git repository.
pdesai 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 3bcc605 dropping static data file on runtimes (#1017)
3bcc605 is described below
commit 3bcc605a7f969f5b7f76f5990caa0ef562e3404a
Author: Priti Desai <pd...@us.ibm.com>
AuthorDate: Tue Dec 11 11:28:15 2018 -0800
dropping static data file on runtimes (#1017)
---
runtimes/runtimes.go | 283 +++++++++++++++++++++++++++++++++++++++++++++----
runtimes/runtimes.json | 256 --------------------------------------------
2 files changed, 261 insertions(+), 278 deletions(-)
diff --git a/runtimes/runtimes.go b/runtimes/runtimes.go
index 190e114..73779e4 100644
--- a/runtimes/runtimes.go
+++ b/runtimes/runtimes.go
@@ -23,8 +23,6 @@ import (
"io/ioutil"
"net/http"
"net/url"
- "path/filepath"
- "runtime"
"strings"
"time"
@@ -56,7 +54,6 @@ const (
HTTP_CONTENT_TYPE_VALUE = "application/json; charset=UTF-8"
RUNTIME_NOT_SPECIFIED = "NOT SPECIFIED"
BLACKBOX = "blackbox"
- RUNTIMES_FILE_NAME = "runtimes.json"
HTTPS = "https://"
)
@@ -137,14 +134,11 @@ func ParseOpenWhisk(apiHost string) (op OpenWhiskInfo, err error) {
if err != nil || !strings.Contains(HTTP_CONTENT_TYPE_VALUE, res.Header.Get(HTTP_CONTENT_TYPE_KEY)) {
stdout := wski18n.T(wski18n.ID_MSG_UNMARSHAL_LOCAL)
wskprint.PrintOpenWhiskInfo(stdout)
- runtimeDetails := readRuntimes()
- if runtimeDetails != nil {
- err = json.Unmarshal(runtimeDetails, &op)
- if err != nil {
- errMessage := wski18n.T(wski18n.ID_ERR_RUNTIME_PARSER_ERROR,
- map[string]interface{}{wski18n.KEY_ERR: err.Error()})
- err = wskderrors.NewRuntimeParserError(errMessage)
- }
+ err = json.Unmarshal(RUNTIME_DETAILS, &op)
+ if err != nil {
+ errMessage := wski18n.T(wski18n.ID_ERR_RUNTIME_PARSER_ERROR,
+ map[string]interface{}{wski18n.KEY_ERR: err.Error()})
+ err = wskderrors.NewRuntimeParserError(errMessage)
}
} else {
b, _ := ioutil.ReadAll(res.Body)
@@ -270,14 +264,259 @@ func ListOfSupportedRuntimes(runtimes map[string][]string) (rt []string) {
return
}
-func readRuntimes() []byte {
- _, b, _, _ := runtime.Caller(0)
- basepath := filepath.Dir(b)
- runtimesFileWithPath := filepath.Join(basepath, RUNTIMES_FILE_NAME)
- file, readErr := ioutil.ReadFile(runtimesFileWithPath)
- if readErr != nil {
- wskprint.PrintlnOpenWhiskWarning(readErr.Error())
- return nil
- }
- return file
-}
+var RUNTIME_DETAILS = []byte(`{
+ "support": {
+ "github": "https://github.com/apache/incubator-openwhisk/issues",
+ "slack": "http://slack.openwhisk.org"
+ },
+ "description": "OpenWhisk",
+ "api_paths": [
+ "/api/v1"
+ ],
+ "runtimes": {
+ "nodejs": [
+ {
+ "kind": "nodejs",
+ "image": {
+ "prefix": "openwhisk",
+ "name": "nodejsaction",
+ "tag": "latest"
+ },
+ "deprecated": true,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ },
+ {
+ "kind": "nodejs:6",
+ "default": true,
+ "image": {
+ "prefix": "openwhisk",
+ "name": "nodejs6action",
+ "tag": "latest"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ },
+ "stemCells": [{
+ "count": 2,
+ "memory": "256 MB"
+ }]
+ },
+ {
+ "kind": "nodejs:8",
+ "default": false,
+ "image": {
+ "prefix": "openwhisk",
+ "name": "action-nodejs-v8",
+ "tag": "latest"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ },
+ {
+ "kind": "nodejs:10",
+ "default": false,
+ "image": {
+ "prefix": "openwhisk",
+ "name": "action-nodejs-v10",
+ "tag": "latest"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ }
+ ],
+ "python": [
+ {
+ "kind": "python",
+ "image": {
+ "prefix": "openwhisk",
+ "name": "python2action",
+ "tag": "latest"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ },
+ {
+ "kind": "python:2",
+ "default": true,
+ "image": {
+ "prefix": "openwhisk",
+ "name": "python2action",
+ "tag": "latest"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ },
+ {
+ "kind": "python:3",
+ "image": {
+ "prefix": "openwhisk",
+ "name": "python3action",
+ "tag": "latest"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ }
+ ],
+ "swift": [
+ {
+ "kind": "swift",
+ "image": {
+ "prefix": "openwhisk",
+ "name": "swiftaction",
+ "tag": "latest"
+ },
+ "deprecated": true,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ },
+ {
+ "kind": "swift:3",
+ "image": {
+ "prefix": "openwhisk",
+ "name": "swift3action",
+ "tag": "latest"
+ },
+ "deprecated": true,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ },
+ {
+ "kind": "swift:3.1.1",
+ "image": {
+ "prefix": "openwhisk",
+ "name": "action-swift-v3.1.1",
+ "tag": "latest"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ },
+ {
+ "kind": "swift:4.1",
+ "default": true,
+ "image": {
+ "prefix": "openwhisk",
+ "name": "action-swift-v4.1",
+ "tag": "latest"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ }
+ ],
+ "java": [
+ {
+ "kind": "java",
+ "default": true,
+ "image": {
+ "prefix": "openwhisk",
+ "name": "java8action",
+ "tag": "latest"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ },
+ "requireMain": true
+ }
+ ],
+ "php": [
+ {
+ "kind": "php:7.1",
+ "default": false,
+ "deprecated": false,
+ "image": {
+ "prefix": "openwhisk",
+ "name": "action-php-v7.1",
+ "tag": "latest"
+ },
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ },
+ {
+ "kind": "php:7.2",
+ "default": true,
+ "deprecated": false,
+ "image": {
+ "prefix": "openwhisk",
+ "name": "action-php-v7.2",
+ "tag": "latest"
+ },
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ }
+ ],
+ "ruby": [
+ {
+ "kind": "ruby:2.5",
+ "default": true,
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ },
+ "image": {
+ "prefix": "openwhisk",
+ "name": "action-ruby-v2.5",
+ "tag": "latest"
+ }
+ }
+ ],
+ "go": [
+ {
+ "kind": "go:1.11",
+ "default": true,
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ },
+ "image": {
+ "prefix": "openwhisk",
+ "name": "actionloop-golang-v1.11",
+ "tag": "latest"
+ }
+ }
+ ]
+ },
+ "blackboxes": [
+ {
+ "prefix": "openwhisk",
+ "name": "dockerskeleton",
+ "tag": "latest"
+ }
+ ]
+}`)
diff --git a/runtimes/runtimes.json b/runtimes/runtimes.json
deleted file mode 100644
index 29bd3a2..0000000
--- a/runtimes/runtimes.json
+++ /dev/null
@@ -1,256 +0,0 @@
-{
- "support": {
- "github": "https://github.com/apache/incubator-openwhisk/issues",
- "slack": "http://slack.openwhisk.org"
- },
- "description": "OpenWhisk",
- "api_paths": [
- "/api/v1"
- ],
- "runtimes": {
- "nodejs": [
- {
- "kind": "nodejs",
- "image": {
- "prefix": "openwhisk",
- "name": "nodejsaction",
- "tag": "latest"
- },
- "deprecated": true,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
- {
- "kind": "nodejs:6",
- "default": true,
- "image": {
- "prefix": "openwhisk",
- "name": "nodejs6action",
- "tag": "latest"
- },
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- },
- "stemCells": [{
- "count": 2,
- "memory": "256 MB"
- }]
- },
- {
- "kind": "nodejs:8",
- "default": false,
- "image": {
- "prefix": "openwhisk",
- "name": "action-nodejs-v8",
- "tag": "latest"
- },
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
- {
- "kind": "nodejs:10",
- "default": false,
- "image": {
- "prefix": "openwhisk",
- "name": "action-nodejs-v10",
- "tag": "latest"
- },
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- }
- ],
- "python": [
- {
- "kind": "python",
- "image": {
- "prefix": "openwhisk",
- "name": "python2action",
- "tag": "latest"
- },
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
- {
- "kind": "python:2",
- "default": true,
- "image": {
- "prefix": "openwhisk",
- "name": "python2action",
- "tag": "latest"
- },
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
- {
- "kind": "python:3",
- "image": {
- "prefix": "openwhisk",
- "name": "python3action",
- "tag": "latest"
- },
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- }
- ],
- "swift": [
- {
- "kind": "swift",
- "image": {
- "prefix": "openwhisk",
- "name": "swiftaction",
- "tag": "latest"
- },
- "deprecated": true,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
- {
- "kind": "swift:3",
- "image": {
- "prefix": "openwhisk",
- "name": "swift3action",
- "tag": "latest"
- },
- "deprecated": true,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
- {
- "kind": "swift:3.1.1",
- "image": {
- "prefix": "openwhisk",
- "name": "action-swift-v3.1.1",
- "tag": "latest"
- },
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
- {
- "kind": "swift:4.1",
- "default": true,
- "image": {
- "prefix": "openwhisk",
- "name": "action-swift-v4.1",
- "tag": "latest"
- },
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- }
- ],
- "java": [
- {
- "kind": "java",
- "default": true,
- "image": {
- "prefix": "openwhisk",
- "name": "java8action",
- "tag": "latest"
- },
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- },
- "requireMain": true
- }
- ],
- "php": [
- {
- "kind": "php:7.1",
- "default": false,
- "deprecated": false,
- "image": {
- "prefix": "openwhisk",
- "name": "action-php-v7.1",
- "tag": "latest"
- },
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- },
- {
- "kind": "php:7.2",
- "default": true,
- "deprecated": false,
- "image": {
- "prefix": "openwhisk",
- "name": "action-php-v7.2",
- "tag": "latest"
- },
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- }
- }
- ],
- "ruby": [
- {
- "kind": "ruby:2.5",
- "default": true,
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- },
- "image": {
- "prefix": "openwhisk",
- "name": "action-ruby-v2.5",
- "tag": "latest"
- }
- }
- ],
- "go": [
- {
- "kind": "go:1.11",
- "default": true,
- "deprecated": false,
- "attached": {
- "attachmentName": "codefile",
- "attachmentType": "text/plain"
- },
- "image": {
- "prefix": "openwhisk",
- "name": "actionloop-golang-v1.11",
- "tag": "latest"
- }
- }
- ]
- },
- "blackboxes": [
- {
- "prefix": "openwhisk",
- "name": "dockerskeleton",
- "tag": "latest"
- }
- ]
-}
\ No newline at end of file