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/openwhisk-wskdeploy.git
The following commit(s) were added to refs/heads/master by this push: new 8e4a799 Deprecate nodejs:6 and update runtime metadata (#1085) 8e4a799 is described below commit 8e4a79926039612c5242f06942c3382919acc021 Author: Will Plusnick <pwplusn...@users.noreply.github.com> AuthorDate: Fri Jan 10 12:17:06 2020 -0600 Deprecate nodejs:6 and update runtime metadata (#1085) --- deployers/manifestreader_test.go | 2 +- docs/export.md | 18 ++++++------- docs/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 .../images/conceptual_manifest_file_creation.png | Bin 224377 -> 224378 bytes .../images/conceptual_manifest_file_deployment.png | Bin 368694 -> 368695 bytes .../html/images/conceptual_programming_model.png | Bin 45986 -> 45987 bytes specification/html/spec_actions.md | 2 +- tests/apps/owbp-cloudant-trigger/manifest-bp.json | 2 +- ...ose_actions_for_function_with_env_variable.yaml | 4 +-- tests/dat/manifest_data_unmarshal_packages.yaml | 2 +- tests/dat/manifest_hello_nodejs.yaml | 2 +- tests/dat/manifest_hello_nodejs_with_params.yaml | 2 +- .../dat/manifest_invalid_packages_key_missing.yaml | 2 +- tests/dat/manifest_validate_action_all.yaml | 2 +- .../dat/manifest_validate_action_annotations.yaml | 6 ++--- tests/dat/manifest_validate_credentials.yaml | 2 +- tests/dat/manifest_validate_deployment_reader.yaml | 2 +- tests/dat/manifest_validate_inputs.yaml | 2 +- tests/dat/manifest_validate_json_params.yaml | 2 +- tests/dat/manifest_validate_multiline_params.yaml | 2 +- tests/dat/manifest_validate_package_inputs.yaml | 2 +- tests/dat/manifest_validate_package_inputs_1.yaml | 2 +- tests/dat/manifest_validate_package_inputs_2.yaml | 2 +- tests/dat/manifest_validate_package_inputs_3.yaml | 2 +- tests/dat/manifest_validate_package_inputs_4.yaml | 2 +- tests/dat/manifest_validate_package_inputs_5.yaml | 6 ++--- ...te_package_inputs_periodic_slack_reminders.yaml | 2 +- tests/dat/manifest_validate_sequences_bogus.yaml | 6 ++--- tests/dat/manifest_validate_singleline_params.yaml | 2 +- tests/src/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 +++--- tests/src/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 tests/src/integration/export/manifest_2pack.yaml | 8 +++--- tests/src/integration/export/manifest_apiexp.yaml | 2 +- tests/src/integration/export/manifest_feed.yaml | 2 +- .../integration/export/manifest_helloworld.yaml | 4 +-- tests/src/integration/export/manifest_lib1.yaml | 6 ++--- tests/src/integration/export/manifest_lib2.yaml | 6 ++--- tests/src/integration/flagstests/manifest.yaml | 2 +- tests/src/integration/flagstests/manifest.yml | 2 +- tests/src/integration/helloworld/actions/hello.jar | Bin 1053 -> 1054 bytes tests/src/integration/helloworld/actions/hello.zip | Bin 404 -> 405 bytes tests/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 +-- .../managed-deployment/05-manifest-headless.yaml | 2 +- .../integration/managed-deployment/manifest.yaml | 8 +++--- tests/src/integration/message-hub/manifest.yaml | 4 +-- tests/src/integration/runtimetests/manifest.yaml | 8 +++--- tests/src/integration/runtimetests/src/hello.jar | Bin 966 -> 967 bytes .../runtimetests/src/helloDotNet.src.zip | Bin 776 -> 777 bytes .../integration/runtimetests/src/helloDotNet.zip | Bin 677014 -> 677015 bytes .../runtimetests/src/helloworld/helloworld.zip | Bin 684 -> 685 bytes tests/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 .../validate-packages-in-manifest/manifest.yaml | 6 ++--- .../src/integration/validate-project/manifest.yaml | 2 +- .../validatePackagesInDeployment/manifest.yaml | 2 +- .../validateSequencesCreation_test.go | 2 +- tests/src/integration/webaction/manifest.yml | 12 ++++----- tests/src/integration/websequence/manifest.yaml | 4 +-- tests/src/integration/zipaction/manifest.yml | 2 +- .../integration/zipactionwithexclude/manifest.yml | 2 +- .../integration/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 570cda1..77fe0cb 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 dd17c6e..296ae7d 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 412e8a0..645263b 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 ead29a7..0607846 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 de3e9d7..57f5d19 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 ca78035..e42b368 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/parsers/manifest_parser_test.go b/parsers/manifest_parser_test.go index d482804..5fcb5ef 100644 --- a/parsers/manifest_parser_test.go +++ b/parsers/manifest_parser_test.go @@ -190,12 +190,12 @@ func testUnmarshalTemporaryFile(data []byte, filename string) (p *YAMLParser, m func TestUnmarshalForHelloNodeJS(t *testing.T) { testUnmarshalManifestPackageAndActionBasic(t, "../tests/dat/manifest_hello_nodejs.yaml", // Manifest path - "helloworld", // Package name - 1, // # of Actions - "helloNodejs", // Action name - "actions/hello.js", // Function path - "nodejs:6", // "Runtime - "") // "Main" function name + "helloworld", // Package name + 1, // # of Actions + "helloNodejs", // Action name + "actions/hello.js", // Function path + "nodejs:default", // "Runtime + "") // "Main" function name } // Test 2: validate manifest_parser:Unmarshal() method with a sample manifest in Java @@ -254,7 +254,7 @@ func TestUnmarshalForHelloWithParams(t *testing.T) { 1, // # of Actions TEST_ACTION_NAME, // Action name "actions/hello-with-params.js", // Function path - "nodejs:6", // "Runtime + "nodejs:default", // "Runtime "") // "Main" function name if pkg != nil { @@ -310,7 +310,7 @@ func TestParseManifestForMultiLineParams(t *testing.T) { assert.Equal(t, expectedResult, actualResult, TEST_MSG_ACTION_FUNCTION_PATH_MISMATCH) // test action's runtime - expectedResult = "nodejs:6" + expectedResult = "nodejs:default" actualResult = action.Runtime assert.Equal(t, expectedResult, actualResult, TEST_MSG_ACTION_FUNCTION_RUNTIME_MISMATCH) @@ -415,7 +415,7 @@ func TestParseManifestForSingleLineParams(t *testing.T) { assert.Equal(t, expectedResult, actualResult, TEST_MSG_ACTION_FUNCTION_PATH_MISMATCH) // test Action runtime - expectedResult = "nodejs:6" + expectedResult = "nodejs:default" actualResult = action.Runtime assert.Equal(t, expectedResult, actualResult, TEST_MSG_ACTION_FUNCTION_RUNTIME_MISMATCH) @@ -598,13 +598,13 @@ func TestComposeActionsForValidRuntime_ZipAction(t *testing.T) { actions: hello: function: ../tests/src/integration/runtimetests/src/helloworld/helloworld.zip - runtime: nodejs:6` + runtime: nodejs:default` p, m, tmpfile := testUnmarshalTemporaryFile([]byte(data), "manifest_parser_validate_runtime_") actions, err := p.ComposeActionsFromAllPackages(m, tmpfile, whisk.KeyValue{}, map[string]PackageInputs{}) assert.Nil(t, err, fmt.Sprintf(TEST_ERROR_COMPOSE_ACTION_FAILURE, tmpfile)) for _, action := range actions { if action.Action.Name == "hello" { - assert.Equal(t, action.Action.Exec.Kind, "nodejs:6", fmt.Sprintf(TEST_MSG_ACTION_FUNCTION_RUNTIME_MISMATCH)) + assert.Equal(t, action.Action.Exec.Kind, "nodejs:default", fmt.Sprintf(TEST_MSG_ACTION_FUNCTION_RUNTIME_MISMATCH)) } } @@ -1274,8 +1274,8 @@ func TestParseManifestForJSONParams(t *testing.T) { actualResult := action.Function assert.Equal(t, expectedResult, actualResult, TEST_MSG_ACTION_FUNCTION_PATH_MISMATCH) - // validate runtime of an action to be "nodejs:6" - expectedResult = "nodejs:6" + // validate runtime of an action to be "nodejs:default" + expectedResult = "nodejs:default" actualResult = action.Runtime assert.Equal(t, expectedResult, actualResult, TEST_MSG_ACTION_FUNCTION_RUNTIME_MISMATCH) @@ -1752,8 +1752,8 @@ func TestUnmarshalForPackages(t *testing.T) { expectedResult = "actions/hello.js" actualResult = action.Function assert.Equal(t, expectedResult, actualResult, "Expected action function "+expectedResult+" but got "+actualResult) - // runtime of an action should be "nodejs:6" - expectedResult = "nodejs:6" + // runtime of an action should be "nodejs:default" + expectedResult = "nodejs:default" actualResult = action.Runtime assert.Equal(t, expectedResult, actualResult, "Expected action runtime "+expectedResult+" but got "+actualResult) } else { diff --git a/runtimes/runtimes.go b/runtimes/runtimes.go index adda1c8..7d9bd03 100644 --- a/runtimes/runtimes.go +++ b/runtimes/runtimes.go @@ -300,13 +300,13 @@ var RUNTIME_DETAILS = []byte(`{ }, { "kind": "nodejs:6", - "default": true, + "default": false, "image": { "prefix": "openwhisk", "name": "nodejs6action", "tag": "latest" }, - "deprecated": false, + "deprecated": true, "attached": { "attachmentName": "codefile", "attachmentType": "text/plain" @@ -332,7 +332,7 @@ var RUNTIME_DETAILS = []byte(`{ }, { "kind": "nodejs:10", - "default": false, + "default": true, "image": { "prefix": "openwhisk", "name": "action-nodejs-v10", diff --git a/specification/diagrams/OW-Programming-Model-Slides-Slide1.jpg b/specification/diagrams/OW-Programming-Model-Slides-Slide1.jpg index b0130b2..9f11d14 100644 Binary files a/specification/diagrams/OW-Programming-Model-Slides-Slide1.jpg and b/specification/diagrams/OW-Programming-Model-Slides-Slide1.jpg differ diff --git a/specification/diagrams/OW-Programming-Model-Slides-Slide2.jpg b/specification/diagrams/OW-Programming-Model-Slides-Slide2.jpg index 4f9cc1e..9bbfc5d 100644 Binary files a/specification/diagrams/OW-Programming-Model-Slides-Slide2.jpg and b/specification/diagrams/OW-Programming-Model-Slides-Slide2.jpg differ diff --git a/specification/diagrams/OW-Programming-Model-Slides.pptx b/specification/diagrams/OW-Programming-Model-Slides.pptx index 3a5bb24..2a1387b 100644 Binary files a/specification/diagrams/OW-Programming-Model-Slides.pptx and b/specification/diagrams/OW-Programming-Model-Slides.pptx differ diff --git a/specification/html/images/conceptual_manifest_file_creation.png b/specification/html/images/conceptual_manifest_file_creation.png index c88010b..525c10b 100644 Binary files a/specification/html/images/conceptual_manifest_file_creation.png and b/specification/html/images/conceptual_manifest_file_creation.png differ diff --git a/specification/html/images/conceptual_manifest_file_deployment.png b/specification/html/images/conceptual_manifest_file_deployment.png index 3ab67ee..d1a2fec 100644 Binary files a/specification/html/images/conceptual_manifest_file_deployment.png and b/specification/html/images/conceptual_manifest_file_deployment.png differ diff --git a/specification/html/images/conceptual_programming_model.png b/specification/html/images/conceptual_programming_model.png index f659593..1a4270f 100644 Binary files a/specification/html/images/conceptual_programming_model.png and b/specification/html/images/conceptual_programming_model.png differ diff --git a/specification/html/spec_actions.md b/specification/html/spec_actions.md index 9614f4f..41e40b6 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 1078e1b..5750fa1 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 7972b7f..752cf00 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 bbaca33..38533f8 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 8dabf13..6113e46 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 7c125db..95e63a0 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 9c3f60a..5eb8a56 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 0a5290b..c33eae0 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 d07dae5..f5ddcf4 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 45f2c2e..3ea38f4 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 a138a35..6127d3c 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 bd6f909..fa4e9c7 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 c3a5217..6f99fb3 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 90e02ea..70f647b 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 3a8a16e..98d58a1 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 b8609a2..55f8b71 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 f98cde1..2aee59a 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 77878cd..66c363c 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 cd5e555..01cf819 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 1d7a0e2..e417dba 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 06705bd..13cf376 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 e7f0a2e..5696719 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 5db7cc1..de9f869 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 933bf9a..3d9b500 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 4245fec..dba6e31 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 f93a27d..9d4d535 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 302d8d9..b420979 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 2628eef..d0c2429 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 55538e0..9a5e32f 100644 Binary files a/tests/src/integration/docker/actions/exec.zip and b/tests/src/integration/docker/actions/exec.zip differ diff --git a/tests/src/integration/docker/actions/go/exec b/tests/src/integration/docker/actions/go/exec index eb27858..b2b09cc 100755 Binary files a/tests/src/integration/docker/actions/go/exec and b/tests/src/integration/docker/actions/go/exec differ diff --git a/tests/src/integration/export/manifest_2pack.yaml b/tests/src/integration/export/manifest_2pack.yaml index 8026fb9..696f446 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 033e601..b377b9a 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 3337735..626322a 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 4dd7804..2b742c5 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 b3c6acf..9eab489 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 e21b3cd..7c675a5 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 0a3eebb..caabdc5 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 9f04e43..25b7c17 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 4b4e55c..c47f08d 100644 Binary files a/tests/src/integration/helloworld/actions/hello.jar and b/tests/src/integration/helloworld/actions/hello.jar differ diff --git a/tests/src/integration/helloworld/actions/hello.zip b/tests/src/integration/helloworld/actions/hello.zip index c5553e7..83219c0 100644 Binary files a/tests/src/integration/helloworld/actions/hello.zip and b/tests/src/integration/helloworld/actions/hello.zip differ diff --git a/tests/src/integration/helloworld/manifest.yaml b/tests/src/integration/helloworld/manifest.yaml index 53ff374..3a65418 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 b05753f..6d28ced 100644 Binary files a/tests/src/integration/jaraction/src/hello.jar and b/tests/src/integration/jaraction/src/hello.jar differ 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 9bb5b39..c990f29 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 a8b8d62..ffd9fad 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 d0a7740..b7d19c9 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 ba5143b..0af48a2 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 2904ce9..41c375c 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 b2d3f89..02f7331 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 1801ed3..2441610 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 de64250..8c65d48 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 b05753f..6d28ced 100644 Binary files a/tests/src/integration/runtimetests/src/hello.jar and b/tests/src/integration/runtimetests/src/hello.jar differ diff --git a/tests/src/integration/runtimetests/src/helloDotNet.src.zip b/tests/src/integration/runtimetests/src/helloDotNet.src.zip index 02fc597..f35b7da 100644 Binary files a/tests/src/integration/runtimetests/src/helloDotNet.src.zip and b/tests/src/integration/runtimetests/src/helloDotNet.src.zip differ diff --git a/tests/src/integration/runtimetests/src/helloDotNet.zip b/tests/src/integration/runtimetests/src/helloDotNet.zip index bcf8865..9289745 100644 Binary files a/tests/src/integration/runtimetests/src/helloDotNet.zip and b/tests/src/integration/runtimetests/src/helloDotNet.zip differ diff --git a/tests/src/integration/runtimetests/src/helloworld/helloworld.zip b/tests/src/integration/runtimetests/src/helloworld/helloworld.zip index dafb5a3..4592cd2 100644 Binary files a/tests/src/integration/runtimetests/src/helloworld/helloworld.zip and b/tests/src/integration/runtimetests/src/helloworld/helloworld.zip differ diff --git a/tests/src/integration/triggerrule/manifest.yml b/tests/src/integration/triggerrule/manifest.yml index 337b2c6..7bb3c66 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 5cf3631..ff40d7a 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 b6757a7..022add4 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 80f25d6..37f5502 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 47988b5..13fd4d0 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 150556d..fc7209e 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 3a55858..e8c8d30 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 c3711a4..d84908d 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 d9abc01..7aa5abd 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 4b4e55c..c47f08d 100644 Binary files a/tests/src/integration/validate-packages-in-manifest/actions/hello.jar and b/tests/src/integration/validate-packages-in-manifest/actions/hello.jar differ diff --git a/tests/src/integration/validate-packages-in-manifest/manifest.yaml b/tests/src/integration/validate-packages-in-manifest/manifest.yaml index 50cf958..faa9d5f 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 4c84502..7490863 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 088c70e..c83dc5f 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 7959e6f..9b9698f 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 87c5773..9ab0c12 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 f676a9e..bb1617f 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 a93cecb..07141a4 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 396ecea..c658e80 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 0882fe4..bf8ff85 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 43fd110..1630c1b 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 7b53863..7ba60af 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 9e43d5d..216310e 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": "<namespace>/triggerrule" diff --git a/tests/usecases/triggerrule/manifest.yml b/tests/usecases/triggerrule/manifest.yml index 8f9d827..7c1af6d 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