From 8e4a79926039612c5242f06942c3382919acc021 Mon Sep 17 00:00:00 2001 From: Will Plusnick Date: Fri, 10 Jan 2020 12:17:06 -0600 Subject: [PATCH] Deprecate nodejs:6 and update runtime metadata (#1085) --- deployers/manifestreader_test.go | 2 +- docs/export.md | 18 +++++------ ...sync_projects_between_client_and_server.md | 24 +++++++------- docs/wskdeploy_inputs.md | 18 +++++------ docs/wskdeploy_interpolation.md | 4 +-- gradle/wrapper/gradle-wrapper.jar | Bin 53556 -> 53557 bytes parsers/manifest_parser_test.go | 30 +++++++++--------- runtimes/runtimes.go | 6 ++-- .../OW-Programming-Model-Slides-Slide1.jpg | Bin 102157 -> 102158 bytes .../OW-Programming-Model-Slides-Slide2.jpg | Bin 131026 -> 131027 bytes .../diagrams/OW-Programming-Model-Slides.pptx | Bin 328908 -> 328909 bytes .../conceptual_manifest_file_creation.png | Bin 224377 -> 224378 bytes .../conceptual_manifest_file_deployment.png | Bin 368694 -> 368695 bytes .../images/conceptual_programming_model.png | Bin 45986 -> 45987 bytes specification/html/spec_actions.md | 2 +- .../owbp-cloudant-trigger/manifest-bp.json | 2 +- ...ctions_for_function_with_env_variable.yaml | 4 +-- .../dat/manifest_data_unmarshal_packages.yaml | 2 +- tests/dat/manifest_hello_nodejs.yaml | 2 +- .../manifest_hello_nodejs_with_params.yaml | 2 +- ...manifest_invalid_packages_key_missing.yaml | 2 +- tests/dat/manifest_validate_action_all.yaml | 2 +- .../manifest_validate_action_annotations.yaml | 6 ++-- tests/dat/manifest_validate_credentials.yaml | 2 +- .../manifest_validate_deployment_reader.yaml | 2 +- tests/dat/manifest_validate_inputs.yaml | 2 +- tests/dat/manifest_validate_json_params.yaml | 2 +- .../manifest_validate_multiline_params.yaml | 2 +- .../dat/manifest_validate_package_inputs.yaml | 2 +- .../manifest_validate_package_inputs_1.yaml | 2 +- .../manifest_validate_package_inputs_2.yaml | 2 +- .../manifest_validate_package_inputs_3.yaml | 2 +- .../manifest_validate_package_inputs_4.yaml | 2 +- .../manifest_validate_package_inputs_5.yaml | 6 ++-- ...ckage_inputs_periodic_slack_reminders.yaml | 2 +- .../manifest_validate_sequences_bogus.yaml | 6 ++-- .../manifest_validate_singleline_params.yaml | 2 +- .../integration/alarmtrigger/manifest.yaml | 4 +-- tests/src/integration/apigateway/manifest.yml | 2 +- tests/src/integration/conductor/manifest.yaml | 8 ++--- .../defaultpackage/manifest-with-project.yaml | 8 ++--- .../integration/defaultpackage/manifest.yaml | 8 ++--- tests/src/integration/docker/actions/exec.zip | Bin 334 -> 335 bytes tests/src/integration/docker/actions/go/exec | Bin 2229083 -> 2229084 bytes .../integration/export/manifest_2pack.yaml | 8 ++--- .../integration/export/manifest_apiexp.yaml | 2 +- .../src/integration/export/manifest_feed.yaml | 2 +- .../export/manifest_helloworld.yaml | 4 +-- .../src/integration/export/manifest_lib1.yaml | 6 ++-- .../src/integration/export/manifest_lib2.yaml | 6 ++-- .../src/integration/flagstests/manifest.yaml | 2 +- tests/src/integration/flagstests/manifest.yml | 2 +- .../integration/helloworld/actions/hello.jar | Bin 1053 -> 1054 bytes .../integration/helloworld/actions/hello.zip | Bin 404 -> 405 bytes .../src/integration/helloworld/manifest.yaml | 4 +-- tests/src/integration/jaraction/src/hello.jar | Bin 966 -> 967 bytes .../00-manifest-minus-second-package.yaml | 6 ++-- .../01-manifest-minus-sequence-2.yaml | 6 ++-- .../02-manifest-minus-action-3.yaml | 4 +-- .../03-manifest-minus-trigger.yaml | 4 +-- .../05-manifest-headless.yaml | 2 +- .../managed-deployment/manifest.yaml | 8 ++--- .../src/integration/message-hub/manifest.yaml | 4 +-- .../integration/runtimetests/manifest.yaml | 8 ++--- .../integration/runtimetests/src/hello.jar | Bin 966 -> 967 bytes .../runtimetests/src/helloDotNet.src.zip | Bin 776 -> 777 bytes .../runtimetests/src/helloDotNet.zip | Bin 677014 -> 677015 bytes .../src/helloworld/helloworld.zip | Bin 684 -> 685 bytes .../src/integration/triggerrule/manifest.yml | 2 +- .../validate-action-annotations/manifest.yaml | 8 ++--- .../manifest.yaml | 4 +-- .../manifest.yaml | 2 +- .../manifest.yml | 2 +- .../not-standard-manifest.yaml | 2 +- .../random-name-1.yaml | 2 +- .../yaml-manifest-with-yml-deployment.yaml | 2 +- .../yml-manifest-with-yaml-deployment.yml | 2 +- .../actions/hello.jar | Bin 1053 -> 1054 bytes .../manifest.yaml | 6 ++-- .../validate-project/manifest.yaml | 2 +- .../manifest.yaml | 2 +- .../validateSequencesCreation_test.go | 2 +- tests/src/integration/webaction/manifest.yml | 12 +++---- .../src/integration/websequence/manifest.yaml | 4 +-- tests/src/integration/zipaction/manifest.yml | 2 +- .../zipactionwithexclude/manifest.yml | 2 +- .../zipactionwithinclude/manifest.yml | 20 ++++++------ tests/usecases/github/manifest.yaml | 2 +- tests/usecases/slack/manifest.yaml | 2 +- tests/usecases/triggerrule/README.md | 2 +- tests/usecases/triggerrule/manifest.yml | 2 +- 91 files changed, 178 insertions(+), 178 deletions(-) diff --git a/deployers/manifestreader_test.go b/deployers/manifestreader_test.go index 570cda1f1..77fe0cb20 100644 --- a/deployers/manifestreader_test.go +++ b/deployers/manifestreader_test.go @@ -246,7 +246,7 @@ func TestManifestReader_SetActions(t *testing.T) { err = manifestReader.HandleYaml(manifestParser, manifest, whisk.KeyValue{}) assert.Nil(t, err, fmt.Sprintf(TEST_ERROR_MANIFEST_PARSE_FAILURE, manifestFile)) - expectedRuntime := "nodejs:6" + expectedRuntime := "nodejs:default" expectedImage := "openwhisk/skeleton" for actionName, action := range deployer.Deployment.Packages["helloworld"].Actions { diff --git a/docs/export.md b/docs/export.md index dd17c6eb9..296ae7d2e 100644 --- a/docs/export.md +++ b/docs/export.md @@ -92,7 +92,7 @@ ok: got package lib1_package }, { "key": "exec", - "value": "nodejs:6" + "value": "nodejs:default" } ] }, @@ -111,7 +111,7 @@ ok: got package lib1_package }, { "key": "exec", - "value": "nodejs:6" + "value": "nodejs:default" } ] }, @@ -130,7 +130,7 @@ ok: got package lib1_package }, { "key": "exec", - "value": "nodejs:6" + "value": "nodejs:default" } ] } @@ -187,7 +187,7 @@ packages: version: 0.0.1 function: lib1_package/lib1_greeting1.js code: "" - runtime: nodejs:6 + runtime: nodejs:default namespace: your_namespace/lib1_package credential: "" exposedUrl: "" @@ -197,14 +197,14 @@ packages: inputs: {} outputs: {} annotations: - exec: nodejs:6 + exec: nodejs:default lib1_greeting2: name: lib1_greeting2 location: "" version: 0.0.1 function: lib1_package/lib1_greeting2.js code: "" - runtime: nodejs:6 + runtime: nodejs:default namespace: your_namespace/lib1_package credential: "" exposedUrl: "" @@ -214,14 +214,14 @@ packages: inputs: {} outputs: {} annotations: - exec: nodejs:6 + exec: nodejs:default lib1_greeting3: name: lib1_greeting3 location: "" version: 0.0.1 function: lib1_package/lib1_greeting3.js code: "" - runtime: nodejs:6 + runtime: nodejs:default namespace: your_namespace/lib1_package credential: "" exposedUrl: "" @@ -231,7 +231,7 @@ packages: inputs: {} outputs: {} annotations: - exec: nodejs:6 + exec: nodejs:default triggers: {} feeds: {} rules: {} diff --git a/docs/sync_projects_between_client_and_server.md b/docs/sync_projects_between_client_and_server.md index 412e8a0d0..645263b34 100644 --- a/docs/sync_projects_between_client_and_server.md +++ b/docs/sync_projects_between_client_and_server.md @@ -80,10 +80,10 @@ actions /guest/ManagedPackage-1/ManagedSequence-2 private sequence /guest/ManagedPackage-1/ManagedSequence-1 private sequence /guest/ManagedPackage-2/ManagedSequence-1 private sequence -/guest/ManagedPackage-1/HelloWorld-2 private nodejs:6 -/guest/ManagedPackage-1/HelloWorld-1 private nodejs:6 -/guest/ManagedPackage-1/HelloWorld-3 private nodejs:6 -/guest/ManagedPackage-2/HelloWorld-1 private nodejs:6 +/guest/ManagedPackage-1/HelloWorld-2 private nodejs:default +/guest/ManagedPackage-1/HelloWorld-1 private nodejs:default +/guest/ManagedPackage-1/HelloWorld-3 private nodejs:default +/guest/ManagedPackage-2/HelloWorld-1 private nodejs:default triggers /guest/ManagedTrigger-2 private /guest/ManagedTrigger-1 private @@ -128,9 +128,9 @@ packages actions /guest/ManagedPackage-1/ManagedSequence-2 private sequence /guest/ManagedPackage-1/ManagedSequence-1 private sequence -/guest/ManagedPackage-1/HelloWorld-3 private nodejs:6 -/guest/ManagedPackage-1/HelloWorld-2 private nodejs:6 -/guest/ManagedPackage-1/HelloWorld-1 private nodejs:6 +/guest/ManagedPackage-1/HelloWorld-3 private nodejs:default +/guest/ManagedPackage-1/HelloWorld-2 private nodejs:default +/guest/ManagedPackage-1/HelloWorld-1 private nodejs:default triggers /guest/ManagedTrigger-1 private rules @@ -154,9 +154,9 @@ packages /guest/ManagedPackage-1 private actions /guest/ManagedPackage-1/ManagedSequence-1 private sequence -/guest/ManagedPackage-1/HelloWorld-3 private nodejs:6 -/guest/ManagedPackage-1/HelloWorld-2 private nodejs:6 -/guest/ManagedPackage-1/HelloWorld-1 private nodejs:6 +/guest/ManagedPackage-1/HelloWorld-3 private nodejs:default +/guest/ManagedPackage-1/HelloWorld-2 private nodejs:default +/guest/ManagedPackage-1/HelloWorld-1 private nodejs:default triggers /guest/ManagedTrigger-1 private rules @@ -179,8 +179,8 @@ packages /guest/ManagedPackage-1 private actions /guest/ManagedPackage-1/ManagedSequence-1 private sequence -/guest/ManagedPackage-1/HelloWorld-2 private nodejs:6 -/guest/ManagedPackage-1/HelloWorld-1 private nodejs:6 +/guest/ManagedPackage-1/HelloWorld-2 private nodejs:default +/guest/ManagedPackage-1/HelloWorld-1 private nodejs:default triggers /guest/ManagedTrigger-1 private rules diff --git a/docs/wskdeploy_inputs.md b/docs/wskdeploy_inputs.md index ead29a752..0607846ab 100644 --- a/docs/wskdeploy_inputs.md +++ b/docs/wskdeploy_inputs.md @@ -74,7 +74,7 @@ packages: function main(params) { return {payload: 'Hello, ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default ``` Or (Single Line Inputs): @@ -91,7 +91,7 @@ packages: function main(params) { return {payload: 'Hello, ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default ``` Whisk deploy creates bindings at the action level with two parameters `name` and `place`: @@ -147,7 +147,7 @@ packages: function main(params) { return {payload: 'Hello, ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default ``` Deployment of this kind of manifest file results in following failure as inputs @@ -173,7 +173,7 @@ packages: function main(params) { return {payload: 'Hello, ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default ``` Action is created with two bindings `name` and `place` set to `""`: @@ -272,7 +272,7 @@ project: function main(params) { return {payload: 'Hello, ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default ``` This is how bindings are created only under action: @@ -344,7 +344,7 @@ project: function main(params) { return {payload: 'Hello, ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default ``` Now, bindings are created under Package: @@ -433,7 +433,7 @@ project: function main(params) { return {payload: 'Hello, ' + params.message + ' ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default helloWithEvening: inputs: message: @@ -445,13 +445,13 @@ project: function main(params) { return {payload: 'Hello, ' + params.message + ' ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default helloWithNight: code: | function main(params) { return {payload: 'Hello, ' + params.message + ' ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default ``` Now, invoking `helloWithMorning` returns `Good Morning` and invoking `helloWithEvening` diff --git a/docs/wskdeploy_interpolation.md b/docs/wskdeploy_interpolation.md index de3e9d74d..57f5d1960 100644 --- a/docs/wskdeploy_interpolation.md +++ b/docs/wskdeploy_interpolation.md @@ -68,10 +68,10 @@ project: actions: hello1: function: $OPENWHISK_FUNCTION_FILE - runtime: nodejs:6 + runtime: nodejs:default hello2: function: ${OPENWHISK_FUNCTION_FILE} - runtime: nodejs:6 + runtime: nodejs:default hello3: function: ${OPENWHISK_FUNCTION_PYTHON}.py hello4: diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index ca78035ef0501d802d4fc55381ef2d5c3ce0ec6e..e42b36830da02da30843ee75bda4c05757916eef 100644 GIT binary patch delta 11 Scmdn8hF7M3lnW(yd(0ANA~P5=M^ delta 19 acmdmfKy2Fqv4$4L7N!>F7M3lnW(xpOvj;-} diff --git a/specification/html/images/conceptual_programming_model.png b/specification/html/images/conceptual_programming_model.png index f6595932043244909d8d024348c576fcde3fb001..1a4270f2b6a5da514471870b1d0cab2ec09a6c45 100644 GIT binary patch delta 11 TcmZ4VoN4iMrVWcWGjag{BdY}{ delta 9 RcmZ4doN3W>rVWcW0{|Il1swnY diff --git a/specification/html/spec_actions.md b/specification/html/spec_actions.md index 9614f4f33..41e40b68e 100644 --- a/specification/html/spec_actions.md +++ b/specification/html/spec_actions.md @@ -136,7 +136,7 @@ These packages may vary by OpenWhisk release; examples of supported runtimes as |:---|:---|:---|:---| | nodejs@10 | nodejs:10 | openwhisk/action-nodejs-v8:latest | Latest NodeJS 10 runtime | | nodejs@8 | nodejs:8 | openwhisk/action-nodejs-v8:latest | Latest NodeJS 8 runtime | -| nodejs@6 | nodejs:6 | openwhisk/nodejs6action:latest | Latest NodeJS 6 runtime | +| nodejs@6 | nodejs:default | openwhisk/nodejs6action:latest | Latest NodeJS 6 runtime | | java | java | openwhisk/java8action:latest | Latest Java (8) language runtime | | php, php@7.3 | php:7.3 | openwhisk/action-php-v7.3:latest | Latest PHP (7.3) language runtime | | php, php@7.2 | php:7.2 | openwhisk/action-php-v7.2:latest | Latest PHP (7.2) language runtime | diff --git a/tests/apps/owbp-cloudant-trigger/manifest-bp.json b/tests/apps/owbp-cloudant-trigger/manifest-bp.json index 1078e1bf7..5750fa196 100644 --- a/tests/apps/owbp-cloudant-trigger/manifest-bp.json +++ b/tests/apps/owbp-cloudant-trigger/manifest-bp.json @@ -7,7 +7,7 @@ "url": "https://github.com/apache/openwhisk-wskdeploy/tree/master/tests/apps/owbp-cloudant-trigger", "runtime": { "name": "Node.js 6", - "kind": "nodejs:6", + "kind": "nodejs:default", "type": "node" }, "categories": [ diff --git a/tests/dat/manifest_data_compose_actions_for_function_with_env_variable.yaml b/tests/dat/manifest_data_compose_actions_for_function_with_env_variable.yaml index 7972b7f1d..752cf0029 100644 --- a/tests/dat/manifest_data_compose_actions_for_function_with_env_variable.yaml +++ b/tests/dat/manifest_data_compose_actions_for_function_with_env_variable.yaml @@ -20,10 +20,10 @@ packages: actions: hello1: function: ${OPENWHISK_FUNCTION_FILE} - runtime: nodejs:6 + runtime: nodejs:default hello2: function: $OPENWHISK_FUNCTION_FILE - runtime: nodejs:6 + runtime: nodejs:default hello3: function: ${OPENWHISK_FUNCTION_PYTHON}.py hello4: diff --git a/tests/dat/manifest_data_unmarshal_packages.yaml b/tests/dat/manifest_data_unmarshal_packages.yaml index bbaca336c..38533f86c 100644 --- a/tests/dat/manifest_data_unmarshal_packages.yaml +++ b/tests/dat/manifest_data_unmarshal_packages.yaml @@ -20,7 +20,7 @@ packages: actions: helloNodejs: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default package2: actions: helloPython: diff --git a/tests/dat/manifest_hello_nodejs.yaml b/tests/dat/manifest_hello_nodejs.yaml index 8dabf1300..6113e46c8 100644 --- a/tests/dat/manifest_hello_nodejs.yaml +++ b/tests/dat/manifest_hello_nodejs.yaml @@ -20,4 +20,4 @@ packages: actions: helloNodejs: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default diff --git a/tests/dat/manifest_hello_nodejs_with_params.yaml b/tests/dat/manifest_hello_nodejs_with_params.yaml index 7c125db8c..95e63a058 100644 --- a/tests/dat/manifest_hello_nodejs_with_params.yaml +++ b/tests/dat/manifest_hello_nodejs_with_params.yaml @@ -20,7 +20,7 @@ packages: actions: helloWithParams: function: actions/hello-with-params.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: Amy place: Paris diff --git a/tests/dat/manifest_invalid_packages_key_missing.yaml b/tests/dat/manifest_invalid_packages_key_missing.yaml index 9c3f60a77..5eb8a5662 100644 --- a/tests/dat/manifest_invalid_packages_key_missing.yaml +++ b/tests/dat/manifest_invalid_packages_key_missing.yaml @@ -20,6 +20,6 @@ test_package: actions: helloNodejs: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default helloJava: function: actions/hello.java diff --git a/tests/dat/manifest_validate_action_all.yaml b/tests/dat/manifest_validate_action_all.yaml index 0a5290bbe..c33eae0f9 100644 --- a/tests/dat/manifest_validate_action_all.yaml +++ b/tests/dat/manifest_validate_action_all.yaml @@ -22,7 +22,7 @@ packages: function: actions/hello.js helloworld2: code: const main = ({ msg }) => { console.log(msg); return {msg}; } - runtime: nodejs:6 + runtime: nodejs:default helloworld3: function: actions/hello.js annotations: diff --git a/tests/dat/manifest_validate_action_annotations.yaml b/tests/dat/manifest_validate_action_annotations.yaml index d07dae5be..f5ddcf4b3 100644 --- a/tests/dat/manifest_validate_action_annotations.yaml +++ b/tests/dat/manifest_validate_action_annotations.yaml @@ -20,7 +20,7 @@ packages: actions: helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -41,7 +41,7 @@ packages: actions: helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -62,7 +62,7 @@ packages: actions: helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/dat/manifest_validate_credentials.yaml b/tests/dat/manifest_validate_credentials.yaml index 45f2c2e63..3ea38f42e 100644 --- a/tests/dat/manifest_validate_credentials.yaml +++ b/tests/dat/manifest_validate_credentials.yaml @@ -24,7 +24,7 @@ packages: # helloworld action in NodeJS helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/dat/manifest_validate_deployment_reader.yaml b/tests/dat/manifest_validate_deployment_reader.yaml index a138a3555..6127d3cc9 100644 --- a/tests/dat/manifest_validate_deployment_reader.yaml +++ b/tests/dat/manifest_validate_deployment_reader.yaml @@ -21,7 +21,7 @@ packages: # helloworld action in NodeJS helloNodejs: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/dat/manifest_validate_inputs.yaml b/tests/dat/manifest_validate_inputs.yaml index bd6f909ba..fa4e9c74d 100644 --- a/tests/dat/manifest_validate_inputs.yaml +++ b/tests/dat/manifest_validate_inputs.yaml @@ -20,7 +20,7 @@ packages: actions: helloNodejs: function: actions/ - runtime: nodejs:6 + runtime: nodejs:default include: - ["actions/hello.js"] - ["actions/hello.js", "actions/hello.js"] diff --git a/tests/dat/manifest_validate_json_params.yaml b/tests/dat/manifest_validate_json_params.yaml index c3a521792..6f99fb343 100644 --- a/tests/dat/manifest_validate_json_params.yaml +++ b/tests/dat/manifest_validate_json_params.yaml @@ -20,7 +20,7 @@ packages: actions: validate_json_params: function: actions/dump_params.js - runtime: nodejs:6 + runtime: nodejs:default inputs: member1: type: json diff --git a/tests/dat/manifest_validate_multiline_params.yaml b/tests/dat/manifest_validate_multiline_params.yaml index 90e02ea57..70f647bfd 100644 --- a/tests/dat/manifest_validate_multiline_params.yaml +++ b/tests/dat/manifest_validate_multiline_params.yaml @@ -20,7 +20,7 @@ packages: actions: validate_multiline_params: function: actions/dump_params.js - runtime: nodejs:6 + runtime: nodejs:default inputs: # value only param_string_value_only: diff --git a/tests/dat/manifest_validate_package_inputs.yaml b/tests/dat/manifest_validate_package_inputs.yaml index 3a8a16ed3..98d58a10a 100644 --- a/tests/dat/manifest_validate_package_inputs.yaml +++ b/tests/dat/manifest_validate_package_inputs.yaml @@ -53,7 +53,7 @@ project: actions: post-to-slack: function: ../usecases/slack/actions/post-to-slack.js - runtime: nodejs:6 + runtime: nodejs:default inputs: message: type: string diff --git a/tests/dat/manifest_validate_package_inputs_1.yaml b/tests/dat/manifest_validate_package_inputs_1.yaml index b8609a26e..55f8b7180 100644 --- a/tests/dat/manifest_validate_package_inputs_1.yaml +++ b/tests/dat/manifest_validate_package_inputs_1.yaml @@ -34,6 +34,6 @@ packages: function main(params) { return {payload: 'Hello, ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default diff --git a/tests/dat/manifest_validate_package_inputs_2.yaml b/tests/dat/manifest_validate_package_inputs_2.yaml index f98cde13f..2aee59aa1 100644 --- a/tests/dat/manifest_validate_package_inputs_2.yaml +++ b/tests/dat/manifest_validate_package_inputs_2.yaml @@ -34,6 +34,6 @@ packages: function main(params) { return {payload: 'Hello, ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default diff --git a/tests/dat/manifest_validate_package_inputs_3.yaml b/tests/dat/manifest_validate_package_inputs_3.yaml index 77878cd53..66c363cf9 100644 --- a/tests/dat/manifest_validate_package_inputs_3.yaml +++ b/tests/dat/manifest_validate_package_inputs_3.yaml @@ -47,6 +47,6 @@ project: function main(params) { return {payload: 'Hello, ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default diff --git a/tests/dat/manifest_validate_package_inputs_4.yaml b/tests/dat/manifest_validate_package_inputs_4.yaml index cd5e555ab..01cf819fc 100644 --- a/tests/dat/manifest_validate_package_inputs_4.yaml +++ b/tests/dat/manifest_validate_package_inputs_4.yaml @@ -47,6 +47,6 @@ project: function main(params) { return {payload: 'Hello, ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default diff --git a/tests/dat/manifest_validate_package_inputs_5.yaml b/tests/dat/manifest_validate_package_inputs_5.yaml index 1d7a0e2ab..e417dbaca 100644 --- a/tests/dat/manifest_validate_package_inputs_5.yaml +++ b/tests/dat/manifest_validate_package_inputs_5.yaml @@ -58,7 +58,7 @@ project: function main(params) { return {payload: 'Hello, ' + params.message + ' ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default helloWithEvening: inputs: message: @@ -70,12 +70,12 @@ project: function main(params) { return {payload: 'Hello, ' + params.message + ' ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default helloWithNight: code: | function main(params) { return {payload: 'Hello, ' + params.message + ' ' + params.name + ' from ' + params.place}; } - runtime: nodejs:6 + runtime: nodejs:default diff --git a/tests/dat/manifest_validate_package_inputs_periodic_slack_reminders.yaml b/tests/dat/manifest_validate_package_inputs_periodic_slack_reminders.yaml index 06705bd3d..13cf37636 100644 --- a/tests/dat/manifest_validate_package_inputs_periodic_slack_reminders.yaml +++ b/tests/dat/manifest_validate_package_inputs_periodic_slack_reminders.yaml @@ -86,7 +86,7 @@ project: return { text: message }; } exports.main = main; - runtime: nodejs:6 + runtime: nodejs:default sequences: # Creating sequence to connect the send-message action with the slack post action post_message_slack_sequence: diff --git a/tests/dat/manifest_validate_sequences_bogus.yaml b/tests/dat/manifest_validate_sequences_bogus.yaml index e7f0a2e50..569671927 100644 --- a/tests/dat/manifest_validate_sequences_bogus.yaml +++ b/tests/dat/manifest_validate_sequences_bogus.yaml @@ -20,16 +20,16 @@ packages: actions: hello: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default helloWithParams: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: Amy place: Paris helloWithParams1: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: Amy place: Paris diff --git a/tests/dat/manifest_validate_singleline_params.yaml b/tests/dat/manifest_validate_singleline_params.yaml index 5db7cc1f9..de9f869e4 100644 --- a/tests/dat/manifest_validate_singleline_params.yaml +++ b/tests/dat/manifest_validate_singleline_params.yaml @@ -20,7 +20,7 @@ packages: actions: validate_singleline_params: function: actions/dump_params.js - runtime: nodejs:6 + runtime: nodejs:default inputs: # simple string param_simple_string: foo diff --git a/tests/src/integration/alarmtrigger/manifest.yaml b/tests/src/integration/alarmtrigger/manifest.yaml index 933bf9a21..3d9b500a5 100644 --- a/tests/src/integration/alarmtrigger/manifest.yaml +++ b/tests/src/integration/alarmtrigger/manifest.yaml @@ -20,7 +20,7 @@ packages: actions: helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -43,7 +43,7 @@ packages: actions: helloworldInDefault: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/apigateway/manifest.yml b/tests/src/integration/apigateway/manifest.yml index 4245fece0..dba6e315c 100644 --- a/tests/src/integration/apigateway/manifest.yml +++ b/tests/src/integration/apigateway/manifest.yml @@ -24,7 +24,7 @@ packages: web-export: true version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default getBooks: function: src/get-books.js postBooks: diff --git a/tests/src/integration/conductor/manifest.yaml b/tests/src/integration/conductor/manifest.yaml index f93a27db6..9d4d5359a 100644 --- a/tests/src/integration/conductor/manifest.yaml +++ b/tests/src/integration/conductor/manifest.yaml @@ -24,7 +24,7 @@ project: function: actions/triple.js increment: function: actions/increment.js - runtime: nodejs:6 + runtime: nodejs:default tripleAndIncrement: function: actions/tripleAndIncrement.js conductor: true @@ -33,11 +33,11 @@ project: triple: code: | function main({ value }) { return { value: value * 3 } } - runtime: nodejs:6 + runtime: nodejs:default increment: code: | function main({ value }) { return { value: value + 1 } } - runtime: nodejs:6 + runtime: nodejs:default tripleAndIncrement: code: | function main(params) { @@ -49,6 +49,6 @@ project: case 2: return { params } } } - runtime: nodejs:6 + runtime: nodejs:default conductor: true diff --git a/tests/src/integration/defaultpackage/manifest-with-project.yaml b/tests/src/integration/defaultpackage/manifest-with-project.yaml index 302d8d92a..b4209798c 100644 --- a/tests/src/integration/defaultpackage/manifest-with-project.yaml +++ b/tests/src/integration/defaultpackage/manifest-with-project.yaml @@ -22,7 +22,7 @@ project: actions: helloInDefaultPackage: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default web-export: true inputs: name: @@ -37,7 +37,7 @@ project: description: a simple greeting message, Hello World! greetingInDefaultPackage: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -67,7 +67,7 @@ project: actions: helloInsidePackage: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -81,7 +81,7 @@ project: description: a simple greeting message, Hello World! greetingInsidePackage: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default web-export: true inputs: name: diff --git a/tests/src/integration/defaultpackage/manifest.yaml b/tests/src/integration/defaultpackage/manifest.yaml index 2628eef78..d0c2429ae 100644 --- a/tests/src/integration/defaultpackage/manifest.yaml +++ b/tests/src/integration/defaultpackage/manifest.yaml @@ -20,7 +20,7 @@ packages: actions: helloInDefaultPackage: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default web-export: true inputs: name: @@ -35,7 +35,7 @@ packages: description: a simple greeting message, Hello World! greetingInDefaultPackage: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -65,7 +65,7 @@ packages: actions: helloInsidePackage: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -79,7 +79,7 @@ packages: description: a simple greeting message, Hello World! greetingInsidePackage: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default web-export: true inputs: name: diff --git a/tests/src/integration/docker/actions/exec.zip b/tests/src/integration/docker/actions/exec.zip index 55538e0d2a00c90214d5653858055ded62734ce4..9a5e32f94a724cf17d7ccc953bdf5367243fb416 100644 GIT binary patch delta 9 QcmX@dbe?I0A0s0d01?9itN;K2 delta 7 OcmX@lbdG6*A0q$^cLJdR diff --git a/tests/src/integration/docker/actions/go/exec b/tests/src/integration/docker/actions/go/exec index eb278583391e3303f64d99eb930e2cf5eed8bf10..b2b09cc06c4e0c860bbad039a90c7de9adec37d2 100755 GIT binary patch delta 81 zcmWN=YZ8HA006-GN}|X!6p^mwGX2;w4%BUOnA({gzrXOG_ku`lA+eNNSLMkaDO6poJU)d$EH=Dsz-O XDU{AGDpxnPyN5>Wsq@m$!#n%|3@8}C diff --git a/tests/src/integration/export/manifest_2pack.yaml b/tests/src/integration/export/manifest_2pack.yaml index 8026fb973..696f44607 100644 --- a/tests/src/integration/export/manifest_2pack.yaml +++ b/tests/src/integration/export/manifest_2pack.yaml @@ -25,11 +25,11 @@ packages: pack1_greeting1: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default pack1_greeting2: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default package_2: version: 1.0 license: Apache-2.0 @@ -37,8 +37,8 @@ packages: pack2_greeting1: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default pack2_greeting2: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default diff --git a/tests/src/integration/export/manifest_apiexp.yaml b/tests/src/integration/export/manifest_apiexp.yaml index 033e60140..b377b9a5f 100644 --- a/tests/src/integration/export/manifest_apiexp.yaml +++ b/tests/src/integration/export/manifest_apiexp.yaml @@ -24,7 +24,7 @@ packages: web-export: true version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default # new top-level key for defining groups of named APIs apis: hello-world: diff --git a/tests/src/integration/export/manifest_feed.yaml b/tests/src/integration/export/manifest_feed.yaml index 3337735d9..626322a3e 100644 --- a/tests/src/integration/export/manifest_feed.yaml +++ b/tests/src/integration/export/manifest_feed.yaml @@ -22,7 +22,7 @@ packages: actions: greeting: function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default triggers: test_alarm_trigger: feed: /whisk.system/alarms/interval diff --git a/tests/src/integration/export/manifest_helloworld.yaml b/tests/src/integration/export/manifest_helloworld.yaml index 4dd7804f1..2b742c5ec 100644 --- a/tests/src/integration/export/manifest_helloworld.yaml +++ b/tests/src/integration/export/manifest_helloworld.yaml @@ -21,7 +21,7 @@ packages: # helloworld action in NodeJS helloNodejs: function: ../helloworld/actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -40,7 +40,7 @@ packages: console.log(msg) return { payload: msg }; } - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/export/manifest_lib1.yaml b/tests/src/integration/export/manifest_lib1.yaml index b3c6acf6b..9eab48940 100644 --- a/tests/src/integration/export/manifest_lib1.yaml +++ b/tests/src/integration/export/manifest_lib1.yaml @@ -25,12 +25,12 @@ packages: lib1_greeting1: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default lib1_greeting2: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default lib1_greeting3: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default diff --git a/tests/src/integration/export/manifest_lib2.yaml b/tests/src/integration/export/manifest_lib2.yaml index e21b3cd52..7c675a5b6 100644 --- a/tests/src/integration/export/manifest_lib2.yaml +++ b/tests/src/integration/export/manifest_lib2.yaml @@ -25,12 +25,12 @@ packages: lib2_greeting1: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default lib2_greeting2: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default lib2_greeting3: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default diff --git a/tests/src/integration/flagstests/manifest.yaml b/tests/src/integration/flagstests/manifest.yaml index 0a3eebb01..caabdc554 100644 --- a/tests/src/integration/flagstests/manifest.yaml +++ b/tests/src/integration/flagstests/manifest.yaml @@ -24,7 +24,7 @@ packages: web-export: true version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string diff --git a/tests/src/integration/flagstests/manifest.yml b/tests/src/integration/flagstests/manifest.yml index 9f04e43ac..25b7c1736 100644 --- a/tests/src/integration/flagstests/manifest.yml +++ b/tests/src/integration/flagstests/manifest.yml @@ -24,7 +24,7 @@ packages: web-export: true version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string diff --git a/tests/src/integration/helloworld/actions/hello.jar b/tests/src/integration/helloworld/actions/hello.jar index 4b4e55ceabdcb063c90f61ad3ad3e128c79fec02..c47f08d4b294f6daab7038d92a786cea1fe8c9ac 100644 GIT binary patch delta 9 QcmbQsF^^+|EDIwS01iw7C;$Ke delta 7 OcmbQoF_&Y5EDHb%2m&1d diff --git a/tests/src/integration/helloworld/actions/hello.zip b/tests/src/integration/helloworld/actions/hello.zip index c5553e7d1c415bd029077e0251a76eb91dbb4c57..83219c0d6aafff9d3eeb28688894260568194a13 100644 GIT binary patch delta 9 QcmbQjJe7IF6h=la01rt5fB*mh delta 7 OcmbQrJcW6~6h;6FRRVPY diff --git a/tests/src/integration/helloworld/manifest.yaml b/tests/src/integration/helloworld/manifest.yaml index 53ff37439..3a654180d 100644 --- a/tests/src/integration/helloworld/manifest.yaml +++ b/tests/src/integration/helloworld/manifest.yaml @@ -21,7 +21,7 @@ packages: # helloworld action in NodeJS helloNodejs: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -40,7 +40,7 @@ packages: console.log(msg) return { payload: msg }; } - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/jaraction/src/hello.jar b/tests/src/integration/jaraction/src/hello.jar index b05753fbca6e659d780f1129fe6fbfad63d0b1cc..6d28ced1af36607da5a086ecb997feac548de9f4 100644 GIT binary patch delta 9 QcmX@cew=;7F=j?C026NmAOHXW delta 7 OcmX@kevEy?F=hY_I|CH} diff --git a/tests/src/integration/managed-deployment/00-manifest-minus-second-package.yaml b/tests/src/integration/managed-deployment/00-manifest-minus-second-package.yaml index 9bb5b39fe..c990f2928 100644 --- a/tests/src/integration/managed-deployment/00-manifest-minus-second-package.yaml +++ b/tests/src/integration/managed-deployment/00-manifest-minus-second-package.yaml @@ -22,7 +22,7 @@ project: actions: HelloWorld-1: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -36,7 +36,7 @@ project: description: a simple greeting message, Hello World! HelloWorld-2: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -50,7 +50,7 @@ project: description: a simple greeting message, Hello World! HelloWorld-3: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/managed-deployment/01-manifest-minus-sequence-2.yaml b/tests/src/integration/managed-deployment/01-manifest-minus-sequence-2.yaml index a8b8d62dc..ffd9fad32 100644 --- a/tests/src/integration/managed-deployment/01-manifest-minus-sequence-2.yaml +++ b/tests/src/integration/managed-deployment/01-manifest-minus-sequence-2.yaml @@ -22,7 +22,7 @@ project: actions: HelloWorld-1: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -36,7 +36,7 @@ project: description: a simple greeting message, Hello World! HelloWorld-2: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -50,7 +50,7 @@ project: description: a simple greeting message, Hello World! HelloWorld-3: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/managed-deployment/02-manifest-minus-action-3.yaml b/tests/src/integration/managed-deployment/02-manifest-minus-action-3.yaml index d0a774090..b7d19c9b6 100644 --- a/tests/src/integration/managed-deployment/02-manifest-minus-action-3.yaml +++ b/tests/src/integration/managed-deployment/02-manifest-minus-action-3.yaml @@ -22,7 +22,7 @@ project: actions: HelloWorld-1: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -36,7 +36,7 @@ project: description: a simple greeting message, Hello World! HelloWorld-2: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/managed-deployment/03-manifest-minus-trigger.yaml b/tests/src/integration/managed-deployment/03-manifest-minus-trigger.yaml index ba5143b6f..0af48a285 100644 --- a/tests/src/integration/managed-deployment/03-manifest-minus-trigger.yaml +++ b/tests/src/integration/managed-deployment/03-manifest-minus-trigger.yaml @@ -22,7 +22,7 @@ project: actions: HelloWorld-1: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -36,7 +36,7 @@ project: description: a simple greeting message, Hello World! HelloWorld-2: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/managed-deployment/05-manifest-headless.yaml b/tests/src/integration/managed-deployment/05-manifest-headless.yaml index 2904ce952..41c375c8c 100644 --- a/tests/src/integration/managed-deployment/05-manifest-headless.yaml +++ b/tests/src/integration/managed-deployment/05-manifest-headless.yaml @@ -20,4 +20,4 @@ packages: actions: HelloWorld-Headless: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default diff --git a/tests/src/integration/managed-deployment/manifest.yaml b/tests/src/integration/managed-deployment/manifest.yaml index b2d3f8948..02f7331a6 100644 --- a/tests/src/integration/managed-deployment/manifest.yaml +++ b/tests/src/integration/managed-deployment/manifest.yaml @@ -22,7 +22,7 @@ project: actions: HelloWorld-1: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -36,7 +36,7 @@ project: description: a simple greeting message, Hello World! HelloWorld-2: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -50,7 +50,7 @@ project: description: a simple greeting message, Hello World! HelloWorld-3: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -77,7 +77,7 @@ project: actions: HelloWorld-1: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/message-hub/manifest.yaml b/tests/src/integration/message-hub/manifest.yaml index 1801ed3e5..244161080 100644 --- a/tests/src/integration/message-hub/manifest.yaml +++ b/tests/src/integration/message-hub/manifest.yaml @@ -29,10 +29,10 @@ packages: actions: receive-messages-from-messagehub: function: src/receive-messages.js - runtime: nodejs:6 + runtime: nodejs:default process-messages-received-from-messagehub: function: src/process-messages.js - runtime: nodejs:6 + runtime: nodejs:default sequences: data-processing-sequence: actions: receive-messages-from-messagehub, process-messages-received-from-messagehub diff --git a/tests/src/integration/runtimetests/manifest.yaml b/tests/src/integration/runtimetests/manifest.yaml index de6425021..8c65d48ca 100644 --- a/tests/src/integration/runtimetests/manifest.yaml +++ b/tests/src/integration/runtimetests/manifest.yaml @@ -24,7 +24,7 @@ packages: web-export: true version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string @@ -140,7 +140,7 @@ packages: main: Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main zipaction-with-explicit-runtime: function: src/helloworld - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string @@ -222,7 +222,7 @@ packages: web-export: true version: 1.0 function: src/hello.php - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string @@ -282,7 +282,7 @@ packages: web-export: true version: 1.0 function: src/hello.swift - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string diff --git a/tests/src/integration/runtimetests/src/hello.jar b/tests/src/integration/runtimetests/src/hello.jar index b05753fbca6e659d780f1129fe6fbfad63d0b1cc..6d28ced1af36607da5a086ecb997feac548de9f4 100644 GIT binary patch delta 9 QcmX@cew=;7F=j?C026NmAOHXW delta 7 OcmX@kevEy?F=hY_I|CH} diff --git a/tests/src/integration/runtimetests/src/helloDotNet.src.zip b/tests/src/integration/runtimetests/src/helloDotNet.src.zip index 02fc597ad97882db5fbfedf1086483da7ec93a5d..f35b7daac40614830ebb87fba8539e09531daafc 100644 GIT binary patch delta 9 QcmeBR>tx%&!OX}701Sx%tNf!!3+Qh%>mf} diff --git a/tests/src/integration/runtimetests/src/helloDotNet.zip b/tests/src/integration/runtimetests/src/helloDotNet.zip index bcf8865084f59f6d358df62c5968426c3bde4906..9289745c3e5efe587c30f3976957f586f5b79960 100644 GIT binary patch delta 31 mcmbQXQgixB&4w1n7N!>F7M2#)7Pc1l7LFFqEnL$=7`Xtk@(I=e delta 29 kcmbQfQghl$&4w1n7N!>F7M2#)7Pc1l7LFFqEnL$=0G?9`%K!iX diff --git a/tests/src/integration/runtimetests/src/helloworld/helloworld.zip b/tests/src/integration/runtimetests/src/helloworld/helloworld.zip index dafb5a3ecca65360d783a6de95e520aa1a3441dd..4592cd2a4734d5bf6d352b821728b83ce7520662 100644 GIT binary patch delta 9 QcmZ3(x|Vgr8YV_A01-$6%>V!Z delta 7 OcmZ3>x`uVb8YTb>x&p!g diff --git a/tests/src/integration/triggerrule/manifest.yml b/tests/src/integration/triggerrule/manifest.yml index 337b2c6c9..7bb3c6616 100644 --- a/tests/src/integration/triggerrule/manifest.yml +++ b/tests/src/integration/triggerrule/manifest.yml @@ -23,7 +23,7 @@ packages: greeting: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string diff --git a/tests/src/integration/validate-action-annotations/manifest.yaml b/tests/src/integration/validate-action-annotations/manifest.yaml index 5cf3631b6..ff40d7a8e 100644 --- a/tests/src/integration/validate-action-annotations/manifest.yaml +++ b/tests/src/integration/validate-action-annotations/manifest.yaml @@ -20,7 +20,7 @@ packages: actions: helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -41,7 +41,7 @@ packages: actions: helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -62,7 +62,7 @@ packages: actions: helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -84,7 +84,7 @@ packages: actions: helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/validate-binding-inputs-annotations/manifest.yaml b/tests/src/integration/validate-binding-inputs-annotations/manifest.yaml index b6757a714..022add4ec 100644 --- a/tests/src/integration/validate-binding-inputs-annotations/manifest.yaml +++ b/tests/src/integration/validate-binding-inputs-annotations/manifest.yaml @@ -24,7 +24,7 @@ packages: actions: helloworld: function: actions/helloworld.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -58,7 +58,7 @@ packages: actions: helloworld: function: actions/helloworld.js - runtime: nodejs:6 + runtime: nodejs:default annotations: action_annotation_1: this is an action annotation 1 action_annotation_2: this is an action annotation 2 diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yaml index 80f25d6bf..37f5502b3 100644 --- a/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yaml +++ b/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yaml @@ -21,7 +21,7 @@ packages: # helloworld action in NodeJS helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yml b/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yml index 47988b552..13fd4d0d5 100644 --- a/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yml +++ b/tests/src/integration/validate-manifest-deployment-file-extensions/manifest.yml @@ -21,7 +21,7 @@ packages: # helloworld action in NodeJS helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-manifest.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-manifest.yaml index 150556dda..fc7209ee8 100644 --- a/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-manifest.yaml +++ b/tests/src/integration/validate-manifest-deployment-file-extensions/not-standard-manifest.yaml @@ -21,7 +21,7 @@ packages: # helloworld action in NodeJS helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-1.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-1.yaml index 3a558582f..e8c8d30ff 100644 --- a/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-1.yaml +++ b/tests/src/integration/validate-manifest-deployment-file-extensions/random-name-1.yaml @@ -21,7 +21,7 @@ packages: # helloworld action in NodeJS helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-manifest-with-yml-deployment.yaml b/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-manifest-with-yml-deployment.yaml index c3711a4a5..d84908d66 100644 --- a/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-manifest-with-yml-deployment.yaml +++ b/tests/src/integration/validate-manifest-deployment-file-extensions/yaml-manifest-with-yml-deployment.yaml @@ -21,7 +21,7 @@ packages: # helloworld action in NodeJS helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/validate-manifest-deployment-file-extensions/yml-manifest-with-yaml-deployment.yml b/tests/src/integration/validate-manifest-deployment-file-extensions/yml-manifest-with-yaml-deployment.yml index d9abc0168..7aa5abd77 100644 --- a/tests/src/integration/validate-manifest-deployment-file-extensions/yml-manifest-with-yaml-deployment.yml +++ b/tests/src/integration/validate-manifest-deployment-file-extensions/yml-manifest-with-yaml-deployment.yml @@ -21,7 +21,7 @@ packages: # helloworld action in NodeJS helloworld: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/validate-packages-in-manifest/actions/hello.jar b/tests/src/integration/validate-packages-in-manifest/actions/hello.jar index 4b4e55ceabdcb063c90f61ad3ad3e128c79fec02..c47f08d4b294f6daab7038d92a786cea1fe8c9ac 100644 GIT binary patch delta 9 QcmbQsF^^+|EDIwS01iw7C;$Ke delta 7 OcmbQoF_&Y5EDHb%2m&1d diff --git a/tests/src/integration/validate-packages-in-manifest/manifest.yaml b/tests/src/integration/validate-packages-in-manifest/manifest.yaml index 50cf95849..faa9d5f2b 100644 --- a/tests/src/integration/validate-packages-in-manifest/manifest.yaml +++ b/tests/src/integration/validate-packages-in-manifest/manifest.yaml @@ -25,7 +25,7 @@ packages: actions: helloNodejs-1: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string @@ -39,10 +39,10 @@ packages: description: a simple greeting message, Hello World! helloNodejs-2: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default helloNodejs-3: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/validate-project/manifest.yaml b/tests/src/integration/validate-project/manifest.yaml index 4c8450294..74908636f 100644 --- a/tests/src/integration/validate-project/manifest.yaml +++ b/tests/src/integration/validate-project/manifest.yaml @@ -20,7 +20,7 @@ packages: actions: hello: function: actions/hello.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: type: string diff --git a/tests/src/integration/validatePackagesInDeployment/manifest.yaml b/tests/src/integration/validatePackagesInDeployment/manifest.yaml index 088c70e5f..c83dc5f1e 100644 --- a/tests/src/integration/validatePackagesInDeployment/manifest.yaml +++ b/tests/src/integration/validatePackagesInDeployment/manifest.yaml @@ -20,7 +20,7 @@ packages: actions: helloworld: function: actions/helloworld.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string diff --git a/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go b/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go index 7959e6f39..9b9698fd1 100644 --- a/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go +++ b/tests/src/integration/validateSequencesCreation/validateSequencesCreation_test.go @@ -51,7 +51,7 @@ func composeDeployFiles(count int) (manifestStr string, deploymentStr string) { manifestStr = manifestStr + " func" + strconv.Itoa(i) + ":" + ` function: actions/function.js - runtime: nodejs:6 + runtime: nodejs:default inputs: functionID: string visited: string diff --git a/tests/src/integration/webaction/manifest.yml b/tests/src/integration/webaction/manifest.yml index 87c5773d1..9ab0c1241 100644 --- a/tests/src/integration/webaction/manifest.yml +++ b/tests/src/integration/webaction/manifest.yml @@ -22,7 +22,7 @@ packages: web-export: true version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string @@ -32,7 +32,7 @@ packages: web-export: yes version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string @@ -42,26 +42,26 @@ packages: web-export: raw version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default greeting-web-action-with-auth: web-export: true version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default annotations: require-whisk-auth: true greeting-web-action-final: web-export: true version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default annotations: final: true greeting-web-action-with-custom-options: web-export: true version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default annotations: web-custom-options: true triggers: diff --git a/tests/src/integration/websequence/manifest.yaml b/tests/src/integration/websequence/manifest.yaml index f676a9e84..bb1617f51 100644 --- a/tests/src/integration/websequence/manifest.yaml +++ b/tests/src/integration/websequence/manifest.yaml @@ -21,7 +21,7 @@ packages: greeting-1: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string @@ -30,7 +30,7 @@ packages: greeting-2: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string diff --git a/tests/src/integration/zipaction/manifest.yml b/tests/src/integration/zipaction/manifest.yml index a93cecb6b..07141a467 100644 --- a/tests/src/integration/zipaction/manifest.yml +++ b/tests/src/integration/zipaction/manifest.yml @@ -23,7 +23,7 @@ packages: greeting: version: 1.0 function: actions/greeting - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string diff --git a/tests/src/integration/zipactionwithexclude/manifest.yml b/tests/src/integration/zipactionwithexclude/manifest.yml index 396eceae5..c658e80aa 100644 --- a/tests/src/integration/zipactionwithexclude/manifest.yml +++ b/tests/src/integration/zipactionwithexclude/manifest.yml @@ -22,7 +22,7 @@ packages: actions: greeting1: function: actions - runtime: nodejs:6 + runtime: nodejs:default exclude: - actions/* include: diff --git a/tests/src/integration/zipactionwithinclude/manifest.yml b/tests/src/integration/zipactionwithinclude/manifest.yml index 0882fe4eb..bf8ff8571 100644 --- a/tests/src/integration/zipactionwithinclude/manifest.yml +++ b/tests/src/integration/zipactionwithinclude/manifest.yml @@ -22,56 +22,56 @@ packages: actions: greeting1: function: actions/greeting1 - runtime: nodejs:6 + runtime: nodejs:default include: - [] - ["actions/common/utils.js"] greeting2: function: actions/greeting2 - runtime: nodejs:6 + runtime: nodejs:default include: - ["actions/common/utils.js", "common/utils.js"] - ["actions/common/utils.js", "common/common1/utils.js"] - ["actions/common/utils.js", "common/common1/copyUtils.js"] greeting3: function: actions/greeting3 - runtime: nodejs:6 + runtime: nodejs:default include: - ["actions/common/", "common/"] - ["actions/common/", "common/common1/"] greeting4: function: actions/greeting4 - runtime: nodejs:6 + runtime: nodejs:default include: - ["actions/common/*.js", "common/"] greeting5: function: actions/greeting5 - runtime: nodejs:6 + runtime: nodejs:default include: - ["actions/common/utils.js", "./common/"] greeting6: function: actions/greeting6 - runtime: nodejs:6 + runtime: nodejs:default include: - ["actions/common/*.js"] greeting7: function: actions/greeting7 - runtime: nodejs:6 + runtime: nodejs:default include: - ["actions/libs/*", "libs/"] greeting8: function: actions/greeting8 - runtime: nodejs:6 + runtime: nodejs:default include: - ["actions/libs/*/utils.js", "libs/"] greeting9: function: actions/greeting9 - runtime: nodejs:6 + runtime: nodejs:default include: - ["actions/*/*/utils.js"] greeting10: function: actions/greeting10 - runtime: nodejs:6 + runtime: nodejs:default include: - ["actions/*/*/utils.js", "actions/"] diff --git a/tests/usecases/github/manifest.yaml b/tests/usecases/github/manifest.yaml index 43fd11082..1630c1bdd 100644 --- a/tests/usecases/github/manifest.yaml +++ b/tests/usecases/github/manifest.yaml @@ -20,7 +20,7 @@ packages: actions: print-github-commits: location: src/print-github-commits.js - runtime: nodejs:6 + runtime: nodejs:default triggers: GitHubWebhookTrigger: feed: /whisk.system/github/webhook diff --git a/tests/usecases/slack/manifest.yaml b/tests/usecases/slack/manifest.yaml index 7b5386359..7ba60af02 100644 --- a/tests/usecases/slack/manifest.yaml +++ b/tests/usecases/slack/manifest.yaml @@ -27,7 +27,7 @@ packages: actions: post-to-slack: function: actions/post-to-slack.js - runtime: nodejs:6 + runtime: nodejs:default inputs: message: type: string diff --git a/tests/usecases/triggerrule/README.md b/tests/usecases/triggerrule/README.md index 9e43d5d9f..216310ebc 100644 --- a/tests/usecases/triggerrule/README.md +++ b/tests/usecases/triggerrule/README.md @@ -44,7 +44,7 @@ $ wsk action list "publish": false, "annotations": [{ "key": "exec", - "value": "nodejs:6" + "value": "nodejs:default" }], "version": "0.0.1", "namespace": "/triggerrule" diff --git a/tests/usecases/triggerrule/manifest.yml b/tests/usecases/triggerrule/manifest.yml index 8f9d82717..7c1af6d57 100644 --- a/tests/usecases/triggerrule/manifest.yml +++ b/tests/usecases/triggerrule/manifest.yml @@ -23,7 +23,7 @@ packages: greeting: version: 1.0 function: src/greeting.js - runtime: nodejs:6 + runtime: nodejs:default inputs: name: string place: string