[openwhisk-runtime-python] branch master updated: Script to build docker images locally (#135)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-python.git The following commit(s) were added to refs/heads/master by this push: new 5693058 Script to build docker images locally (#135) 5693058 is described below commit 5693058b232d813ccb50e0a0b007793dcf626f43 Author: Meenakshi Madugula <43080289+meenakshimadugul...@users.noreply.github.com> AuthorDate: Tue Nov 29 09:02:50 2022 -0800 Script to build docker images locally (#135) * Script to build docker images locally * add license header * Refactor tutorial Refactoring structure of the tutorial for ease of readability * fix whitespace issues in checkstyle * make readme readable * fix build Co-authored-by: Meenakshi Madugula --- README.md| 11 +- tutorials/local_build.md | 298 +-- tutorials/local_build.sh | 81 + 3 files changed, 273 insertions(+), 117 deletions(-) diff --git a/README.md b/README.md index 642ad07..fde778f 100644 --- a/README.md +++ b/README.md @@ -62,14 +62,17 @@ def main(args): To learn more about using Python actions to build serverless applications, check out the main project documentation [here](https://github.com/apache/openwhisk/blob/master/docs/actions-python.md). -## Build Runtimes +## Build Python Runtime There are two options to build the Python runtime: -- Building locally: [tutorial](tutorials/local_build.md) -- Using OpenWhisk Actions. +- Build using Docker +- Build using Gradle -### Building Python Runtime using OpenWhisk Actions +### Build Python Runtime using Docker +The runtimes can be built using Docker locally. Please follow the detailed [tutorial](tutorials/local_build.md) to build and test the runtime locally. + +### Building Python Runtime using Gradle Pre-requisites diff --git a/tutorials/local_build.md b/tutorials/local_build.md index d1ffdaa..51e0655 100644 --- a/tutorials/local_build.md +++ b/tutorials/local_build.md @@ -23,36 +23,48 @@ - [Docker](https://www.docker.com/) - [curl](https://curl.se/), [wget](https://www.gnu.org/software/wget/), or [Postman](https://www.postman.com/) -0. Choose/create a folder of your liking -1. Clone this repo: + +## Clone repo ``` git clone https://github.com/apache/openwhisk-runtime-python cd openwhisk-runtime-python ``` -2. Build docker +## Build the docker image -Build using Python 3.7 (recommended). This tutorial assumes you're building with python 3.7. +Build docker image using Python 3.7 (recommended). This tutorial assumes you're building with python 3.7. +Run `local_build.sh` to build docker. This script takes two parameters as input +- `-r` Specific runtime image folder name to be built, it can be one of `python3Action`, `python36AiAction`, `python39Action` or `python310Action` +- `-t` The name for docker image and tag used for building the docker image. Example: `action-python-v3.7:1.0-SNAPSHOT` ``` -docker build -t action-python-v3.7:1.0-SNAPSHOT $(pwd)/core/python3Action +cd tutorials +chmod 755 local_build.sh +cd .. +./tutorials/local_build.sh -r python3Action -t action-python-v3.7:1.0-SNAPSHOT ``` -2.1. Check docker `IMAGE ID` (3rd column) for repository `action-python-v3.7` +### Verify docker image + +Check docker `IMAGE ID` (3rd column) for repository `action-python-v3.7` ``` docker images ``` -You should see an image that looks something like: +If the `local_build.sh` script is sucessful, you should see an image that looks something like: ``` action-python-v3.7 1.0-SNAPSHOT ... ``` -2.2. Tag image (Optional step). Required if you’re pushing your docker image to a registry e.g. dockerHub +### (Optional) Tag docker image + +This is required if you’re pushing your docker image to a registry e.g. dockerHub ``` docker tag /action-python-v3.7:1.0-SNAPSHOT ``` -3. Run docker on localhost with either the following commands: +## Run docker image + +Run docker on localhost with either the following commands: ``` docker run -p 127.0.0.1:80:8080/tcp --name=bloom_whisker --rm -it action-python-v3.7:1.0-SNAPSHOT ``` @@ -60,13 +72,13 @@ Or run the container in the background (Add -d (detached) to the command above) ``` docker run -d -p 127.0.0.1:80:8080/tcp --name=bloom_whisker --rm -it action-python-v3.7:1.0-SNAPSHOT ``` -Note: If you run your docker container in the background you'll want to stop it with: +**Note:** If you run your docker container in the background you'll want to stop it with: ``` docker stop ``` Where `` is obtained from `docker ps` command bellow -Lists all running containers +List all running containers ``` docker ps ``` @@ -74,12 +86,20 @@ or ``` docker ps -a ``` -You should see a container named `bloom_whisker` being run. +You should see a container named `bloom_w
[openwhisk-runtime-go] branch master updated: Extend `proxy -version` to also show the go runtime version. (#150)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-go.git The following commit(s) were added to refs/heads/master by this push: new 4bc4331 Extend `proxy -version` to also show the go runtime version. (#150) 4bc4331 is described below commit 4bc4331f47eab91c6e1856595311848b79743d11 Author: falkzoll AuthorDate: Wed Jul 21 22:10:53 2021 +0200 Extend `proxy -version` to also show the go runtime version. (#150) - Extend `proxy -version` to also show the go version the proxy.go was compiled with (makes it easier to check if go security updates need to be applied). --- CHANGES.md| 1 + main/proxy.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 6d83c4d..8356b69 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,6 +20,7 @@ # 1.17.1 - support for zipping and unzipping symbolic links (required to support virtualenvs) - go 1.15 runtime upgraded to 1.15.13 +- extend `proxy -version` to also show the go version the proxy.go was compiled with (makes it easier to check if go security updates need to be applied) # 1.17.0 - go 1.15 runtime upgraded to 1.15.7 diff --git a/main/proxy.go b/main/proxy.go index 7f4b6bc..1b33ad6 100644 --- a/main/proxy.go +++ b/main/proxy.go @@ -21,6 +21,7 @@ import ( "fmt" "log" "os" + "runtime" "github.com/apache/openwhisk-runtime-go/openwhisk" ) @@ -49,7 +50,7 @@ func main() { // show version number if *version { - fmt.Printf("OpenWhisk ActionLoop Proxy v%s\n", openwhisk.Version) + fmt.Printf("OpenWhisk ActionLoop Proxy v%s, built with %s\n", openwhisk.Version, runtime.Version()) return }
[openwhisk-vscode-extension] branch master updated: Review and update README instructions (#13)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-vscode-extension.git The following commit(s) were added to refs/heads/master by this push: new 62b1f1a Review and update README instructions (#13) 62b1f1a is described below commit 62b1f1a9c22508b3bc514e754b9158e37969400f Author: Kent Tsuenchy <6343135+ktsue...@users.noreply.github.com> AuthorDate: Thu Jun 10 13:17:07 2021 -0400 Review and update README instructions (#13) * fix spelling of required_approving_review_count field * fix use of VSCode, should be VS Code following format from vsc-extension-quickstart.md * expand section on debugging extension locally * add suggested revisions to README * add note about self signed certificates --- .asf.yaml | 2 +- README.md | 32 ++-- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 7523e83..ef73490 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -34,7 +34,7 @@ github: required_status_checks: strict: true required_pull_request_reviews: -required_appoving_review_count: 1 +required_approving_review_count: 1 enabled_merge_buttons: merge: false squash: true diff --git a/README.md b/README.md index e71894e..1bdaccf 100644 --- a/README.md +++ b/README.md @@ -17,11 +17,11 @@ # --> -# OpenWhisk VSCode Extension +# OpenWhisk VS Code Extension -An **openwhisk-vscode-extension** is an open-source VSCode extension for [Apache OpenWhisk](https://openwhisk.apache.org/). It manages the wskdeploy manifest file and makes deployment easy. You can also create and update actions and packages in VSCode. +An **openwhisk-vscode-extension** is an open-source VS Code extension for [Apache OpenWhisk](https://openwhisk.apache.org/). It manages the wskdeploy manifest file and makes deployment easy. You can also create and update actions and packages in VS Code. -Try creating and editing your action code in the VSCode! +Try creating and editing your action code in the VS Code! ## Prerequisites @@ -61,16 +61,28 @@ This extension contributes the following commands to the Command palette. - `Create a wskdeploy project`: creates a wskdeploy project -## How to debug in your local +## How to debug in your local environment -```bash -git clone https://github.com/apache/openwhisk-vscode-extension.git -code ./openwhisk-vscode-extension # Open openwhisk-vscode-extension in VSCode -``` +### Requirements + +- [vscode](https://code.visualstudio.com/) >= 1.41.0 +- [Node.js](https://nodejs.org/en/download/) >= 12.x +- Have an OpenWhisk deployment available, which you set up by following this [guide](https://openwhisk.apache.org/documentation.html#pre-requisites) or by using one of the managed OpenWhisk offerings (e.g., from IBM, Adobe or Nimbella). Note, deployments with self signed SSL certificates may not work with this extension. + +### Set up + +1. Clone the repository: -Press `F5` button(run debug) +```bash +git clone https://github.com/apache/openwhisk-vscode-extension.git +code ./openwhisk-vscode-extension # Open openwhisk-vscode-extension in VS Code +``` -Learn more about debugging [here](https://github.com/apache/openwhisk-vscode-extension/blob/master/vsc-extension-quickstart.md) +2. In your terminal, execute the command `npm install` to install extension dependencies +3. In your terminal, execute the command `npm run webpack-dev` to start up the extension builder in watch mode (allows for making changes to files and rebuilding automatically) +4. Open up the `src/extension.ts` file for editing +5. In the `src/extension.ts` file press `F5` button to start debugger and select `VS Code Extension Development` if a modal appears at the top of the VS Code window +6. Interact with the `DEBUG CONSOLE` for real time debugging of the extension and learn more about debugging [here](https://github.com/apache/openwhisk-vscode-extension/blob/master/vsc-extension-quickstart.md) ## License
[openwhisk-website] branch master updated: feat: add contributor over time graph to website (#482)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-website.git The following commit(s) were added to refs/heads/master by this push: new 2093c15 feat: add contributor over time graph to website (#482) 2093c15 is described below commit 2093c15150311d325b729794e6f126325bbaae5e Author: Shuyang Wu AuthorDate: Mon May 24 14:40:18 2021 -0400 feat: add contributor over time graph to website (#482) * feat: add contributor over time graph to website * change to use graph across repos * Update layout to preserve 3-columns and add to index Co-authored-by: Matt Rutkowski --- _layouts/community.html | 17 + 1 file changed, 17 insertions(+) diff --git a/_layouts/community.html b/_layouts/community.html index 5943958..76581f7 100644 --- a/_layouts/community.html +++ b/_layouts/community.html @@ -190,6 +190,9 @@ layout: default Project Wiki + + Contributions + Events @@ -299,6 +302,20 @@ layout: default + +Contributions + + The following graphic shows project contributions over time across all active OpenWhisk repositories. + +https://www.apiseven.com/en/contributor-graph?chart=contributorOverTime=apache/openwhisk=true;>https://contributor-graph-api.apiseven.com/contributors-svg?chart=contributorOverTime=apache/openwhisk=true; +alt="Contributor over time" +style="max-width: 600px"/> + + + + + Events Apache OpenWhisk events
[openwhisk-catalog] branch master updated: Enhance GitHub webhook introducing allowing usage for GitHub Enterprise. (#321)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-catalog.git The following commit(s) were added to refs/heads/master by this push: new 26fadd7 Enhance GitHub webhook introducing allowing usage for GitHub Enterprise. (#321) 26fadd7 is described below commit 26fadd717c888d18a1ca315179c23c8a310d4375 Author: fribechi AuthorDate: Fri May 21 16:10:09 2021 +0200 Enhance GitHub webhook introducing allowing usage for GitHub Enterprise. (#321) --- packages/github/README.md | 2 ++ packages/github/manifest.yaml | 9 - packages/github/webhook.js| 11 +-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/packages/github/README.md b/packages/github/README.md index b0b9ad7..9587f1c 100644 --- a/packages/github/README.md +++ b/packages/github/README.md @@ -38,6 +38,7 @@ The `/whisk.system/github/webhook` feed configures a service to fire a trigger w - `repository`: The GitHub repository. - `accessToken`: Your GitHub personal access token. - `events`: The [GitHub event type](https://developer.github.com/v3/activity/events/types/) of interest. +- `baseUrl`: The GitHub api endpoint. Default value is 'https://api.github.com'. The following is an example of creating a trigger that will be fired each time that there is a new commit to a GitHub repository. @@ -52,6 +53,7 @@ The following is an example of creating a trigger that will be fired each time t ``` wsk package bind /whisk.system/github myGit \ +--param baseUrl https://github.myenterprise.com/api/v3 \ --param username myGitUser \ --param repository myGitRepo \ --param accessToken aa1a1a1a1a11aaaa1a1a diff --git a/packages/github/manifest.yaml b/packages/github/manifest.yaml index 10377b4..022ace4 100644 --- a/packages/github/manifest.yaml +++ b/packages/github/manifest.yaml @@ -55,11 +55,18 @@ project: "required": true, "description": "A comma-separated list", "doclink": "https://developer.github.com/webhooks/#events; +}, +{ +"name": "baseUrl", +"required": false, +"description": "GitHub API endpoint", +"doclink": "https://docs.github.com/en/enterprise-server@2.21/rest/reference/enterprise-admin#endpoint-urls; } ] sampleInput: { "username": "myUserName", "repository": "myRepository or myOrganization/myRepository", "accessToken": "123ABCXYZ", -"events": "push, delete, pull-request" +"events": "push, delete, pull-request", +"baseUrl": "https://github.myenterprise.com/api/v3; } diff --git a/packages/github/webhook.js b/packages/github/webhook.js index 6ce156d..6e5563b 100644 --- a/packages/github/webhook.js +++ b/packages/github/webhook.js @@ -32,7 +32,14 @@ function main(params) { var accessToken = params.accessToken; var organization, -repository; +repository, +baseUrl; + + if (params.baseUrl) { +baseUrl = params.baseUrl; + } else { +baseUrl = 'https://api.github.com'; + } if (params.repository) { var repoSegments = params.repository.split('/'); @@ -52,7 +59,7 @@ function main(params) { var whiskCallbackUrl = urlHost.protocol + '//' + process.env.__OW_API_KEY + "@" + urlHost.host + '/api/v1/namespaces/' + encodeURIComponent(triggerName[1]) + '/triggers/' + encodeURIComponent(triggerName[2]); // The URL to create the webhook on Github - var registrationEndpoint = 'https://api.github.com/repos/' + (organization ? organization : username) + '/' + repository + '/hooks'; + var registrationEndpoint = baseUrl +'/repos/' + (organization ? organization : username) + '/' + repository + '/hooks'; console.log("Using endpoint: " + registrationEndpoint); if (lifecycleEvent === 'CREATE') {
[openwhisk-wskdeploy] branch master updated: Remove redundant script from Travis build and improve log information (#1140)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 ff6238d Remove redundant script from Travis build and improve log information (#1140) ff6238d is described below commit ff6238df980d33fa1dab229d6459504ee5bc9f8e Author: Matt Rutkowski AuthorDate: Wed Apr 7 09:56:55 2021 -0500 Remove redundant script from Travis build and improve log information (#1140) * Improve Travis build log information * Improve Travis build log information * Improve Travis build log information * Improve Travis builds * Improve Travis builds * improve task information for logs * improve task information for logs * improve task information for logs * Add spew for export commands that get SIGINT faults * Add spew for export commands that get SIGINT faults * Add trace around intermittent failings on export project * Cleanup changes and add comments and TODOs --- .gitignore | 3 +- .travis.yml | 71 ++--- build.gradle| 2 +- cmd/export.go | 150 go.mod | 4 +- go.sum | 8 +- main.go | 9 +- tests/src/integration/common/wskdeploy.go | 13 +++ tests/src/integration/export/export_test.go | 6 -- tools/travis/build_tag_releases.sh | 10 +- tools/travis/script.sh | 4 + tools/travis/showenv.sh | 30 ++ wskprint/console.go | 7 +- 13 files changed, 221 insertions(+), 96 deletions(-) diff --git a/.gitignore b/.gitignore index b2b8683..d7b11b7 100644 --- a/.gitignore +++ b/.gitignore @@ -24,7 +24,7 @@ _testmain.go *.prof -#OS X +# OS X **/.DS_Store #binaries @@ -43,6 +43,7 @@ Packages/ .gradle .gogradle build/ +release/ #emacs *~ diff --git a/.travis.yml b/.travis.yml index 79555d2..93568a3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,12 +36,37 @@ notifications: # travis2slack webhook to enable DMs on openwhisk-team.slack.com to PR authors with TravisCI results secure: "NaDCtHwbFUEy0h0u/QrAt395o0/9FstJ5/Tv4uBSLCBdaUNU+0q6/RXVH76dKbujoxrLded2gyeJSAbI4kl4SM7FyilSHzKTikF0VsgM3G5veh65tVY5ztsvl40hDmK2E/PmWI3HkZNeWJO32WjraqPmhSWL0BZOWhA/4gJSCIsLnNRQXmpZoDqC7V8IG1BWYGwd5qcNkEjItLjYCUy1s2K8bj3QmhshYRVLTNbXxh0yJVKjM04I+bWhMXqvL8GS55qeicJ3fUwm5g1PDVCtzxLwAHCPo2jusjtNSnV+BaZgMBSahv3MD7ApxfF58e1buejggH3qZAhNGccC4bYJCahqVv/KKoA10kO6exH5iGwlHPWQTjMuF++PHmAk+FeQ1jh+JoUSBnIHExPnaD4CQIArHvUuQom+WJBnOz+L1H755VyPGzeDQ+ZUDlhOiQ6CDP/sqaRH3Wmo4IzhsqTsLaQs0dS1Y [...] +# The complete sequence of phases of the lifecycle: +# - +# before_install +# install +# before_script +# script +# before_cache (OPTIONAL) (if and only if caching is effective) +# after_success (or after_failure) +# before_deploy (OPTIONAL) (if and only if deployment is active) +# deploy (OPTIONAL) +# after_deploy (OPTIONAL) (if and only if deployment is active) +# after_script + before_install: - "./tools/travis/cloneutils.sh" + - sudo apt-get install tree + +# Install tools we use for linting and unit/integration testing +# TODO: build.gradle (gradlew) already installs 'golint' and runs linting +# in the `goLint` task; see if we can remove here. +# TODO: The "gogradle" plugin in build.gradle (gradlew) already provides a +# task called "goTest" which runs all `unit` tests. See if we can use that +# instead and only run `integration` tests here. install: - export DEPLOY_BUILD_READY=false - go get -u golang.org/x/lint/golint - go get -u github.com/stretchr/testify + +# Identify Golang files that are not properly formatted +# TODO: See if we can create custom tasks to perform this in build.gradle +# as a custom `goFmt` task before_script: - GO_FILES=$(find . -iname '*.go' -type f -not -path "./wski18n/i18n_resources.go") - export BAD_GO=$(gofmt -s -l $(echo $GO_FILES)) @@ -49,20 +74,26 @@ before_script: #- test -z "$BAD_GO" #- test -z "$(gofmt -s -l $(echo $GO_FILES))" +# Clone and build the OpenWhisk platform (i.e., apache/openwhisk) +# and then use Ansible to deploy it and prepare it to run our +# integration tests. +# TODO: Do not use Makefile for running integration tests (in script.sh); +# change to using gradle wrapper script: - - echo $TRAVIS - - echo $TRAVIS_PULL_REQUEST - - echo $TRAVIS_SECURE_ENV_VARS - - printenv + - echo "Installing and building OpenWhisk platform u
[openwhisk-release] branch master updated: Add the release config for CLI v1.2.0 (#382)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-release.git The following commit(s) were added to refs/heads/master by this push: new 4c127e2 Add the release config for CLI v1.2.0 (#382) 4c127e2 is described below commit 4c127e200e2bddcfd72dddb1bdb12b8c77f7464a Author: Matt Rutkowski AuthorDate: Mon Apr 5 12:43:30 2021 -0500 Add the release config for CLI v1.2.0 (#382) --- docs/release_instructions.md | 2 +- release-configs/cli-1.2.0.json | 15 +++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/docs/release_instructions.md b/docs/release_instructions.md index 63db9ec..fa0a6e8 100644 --- a/docs/release_instructions.md +++ b/docs/release_instructions.md @@ -458,7 +458,7 @@ When announcing a release, you must use the URL of the OpenWhisk Downloads page 1. Remove the release candidate files from the staging svn. - for example: + for example, from the SVN `stagingArea/svn_staging/rc1` directory: ```sh $ svn delete openwhisk---sources.tar.gz diff --git a/release-configs/cli-1.2.0.json b/release-configs/cli-1.2.0.json new file mode 100644 index 000..2e9db62 --- /dev/null +++ b/release-configs/cli-1.2.0.json @@ -0,0 +1,15 @@ +{ + "versioning": { +"version": "1.2.0", +"pre_release_version": "rc1" + }, + "RepoList": [ +"openwhisk-cli" + ], + "openwhisk_cli": { +"name": "OpenWhisk Command-line Interface (CLI)", +"hash": "7c47ef1dbad550566114baf976c091b4cdd9e678", +"repository": "https://github.com/apache/openwhisk-cli.git;, +"branch": "master" + } +}
svn commit: r46877 - in /dev/openwhisk/rc1: openwhisk-cli-1.2.0-sources.tar.gz openwhisk-cli-1.2.0-sources.tar.gz.asc openwhisk-cli-1.2.0-sources.tar.gz.sha512
Author: mrutkowski Date: Mon Apr 5 16:23:40 2021 New Revision: 46877 Log: Deleted file OpenWhisk Command-Line Interface (CLI) 1.2.0 staged files Removed: dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz.asc dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz.sha512
[openwhisk-website] branch master updated: Add CLI release 1.2.0 and freshen up home page (#476)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-website.git The following commit(s) were added to refs/heads/master by this push: new fd663dd Add CLI release 1.2.0 and freshen up home page (#476) fd663dd is described below commit fd663dd066c9dcc7ca9a734b02bc7f77e8e35363 Author: Matt Rutkowski AuthorDate: Mon Apr 5 10:55:25 2021 -0500 Add CLI release 1.2.0 and freshen up home page (#476) --- _layouts/downloads.html | 31 +++ _layouts/home.html | 14 +++--- 2 files changed, 26 insertions(+), 19 deletions(-) diff --git a/_layouts/downloads.html b/_layouts/downloads.html index 63fbc7e..b07a7b5 100644 --- a/_layouts/downloads.html +++ b/_layouts/downloads.html @@ -72,16 +72,17 @@ layout: default Developer Builds. -Older releases are archived at -http://archive.apache.org/dist/incubator/openwhisk/;>archive.apache.org (incubator releases) -and -http://archive.apache.org/dist/openwhisk/;>archive.apache.org. + Older releases are archived at + +http://archive.apache.org/dist/incubator/openwhisk/;>archive.apache.org (incubator releases) + and +http://archive.apache.org/dist/openwhisk/;>archive.apache.org. + Verifying -As an Apache project, all downloaded files are signed by a - project Release Manager and can be verified following these - instructions: +As an Apache project, all official release artifacts are provided as compressed archives and are signed by a + project Release Manager and can be verified following these instructions: https://www.apache.org/info/verification;>How to verify downloaded files @@ -109,7 +110,7 @@ layout: default Component Releases -Individual downloads of the latest released version of each OpenWhisk component are available. We group the components by their role in the platform. +Individual downloads of the latest released version of each OpenWhisk component are available. Components are grouped by their role in the platform. Please click on a platform role to see the individual downloadable components: Core System @@ -334,15 +335,18 @@ layout: default OpenWhisk CLIOpenWhisk command-line interface. - 1.1.0 + 1.2.0 https://www.apache.org/dyn/closer.cgi/openwhisk/openwhisk-cli-1.1.0-sources.tar.gz;>Source code + href="https://www.apache.org/dyn/closer.cgi/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz;>Source code https://downloads.apache.org/openwhisk/openwhisk-cli-1.1.0-sources.tar.gz.sha512;> + href="https://downloads.apache.org/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz.sha512;> SHA-512 checksum https://downloads.apache.org/openwhisk/openwhisk-cli-1.1.0-sources.tar.gz.asc;> + href="https://downloads.apache.org/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz.asc;> PGP signature + https://github.com/apache/openwhisk-cli/releases/tag/1.2.0;> +Binaries (GitHub, unofficial) @@ -359,6 +363,9 @@ layout: default https://downloads.apache.org/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc;> PGP signature + https://github.com/apache/openwhisk-wskdeploy/releases/tag/1.2.0;> +Binaries (GitHub, unofficial) diff --git a/_layouts/home.html b/_layouts/home.html index e21e78b..a1824ee 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -80,18 +80,18 @@ layout: default Work with what you know and love. OpenWhisk supports a growing list of your favorite languages such as -https://github.com/apache/openwhisk-runtime-nodejs;>NodeJS, https://github.com/apache/openwhisk-runtime-go;>Go, https://github.com/apache/openwhisk-runtime-java;>Java, -https://githu
[openwhisk-cli] annotated tag 1.2.0 updated (7c47ef1 -> 722de63)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a change to annotated tag 1.2.0 in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git. *** WARNING: tag 1.2.0 was modified! *** from 7c47ef1 (commit) to 722de63 (tag) tagging 7c47ef1dbad550566114baf976c091b4cdd9e678 (commit) replaces 1.1.0 by Matt Rutkowski on Thu Apr 1 17:34:00 2021 -0500 - Log - OpenWhisk Command-Line Interface (CLI) v1.2.0 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEE7Lt91z/GK9yqwC2HOVKCph2I0KwFAmBmSlgACgkQOVKCph2I 0KyZ5hAAmGVHgteo6VsdwqVUPuJjC006hYVX4o54BOdumRy9OG95Nbg+c8ccBEAF EDOASO7SA8u8Y4Z3sx/vok4T60iDlGLG3+FQrKMEidzUj5aXGEqYTMRMzk3Ta6Yg 2pX8FOYHITPTUS6LooAqDHCYvCB66+Zvn+WXLomtY+09zcGngeoAUC8tlDSBRcPa WYmXCu06bHmkgfvl3/7MzkbtHYJurzPPodjVYN8KbJbE3REU/mMf8FpKUeY0Nq1O Qv1Lesu3d5ZVskJ0lr7M2ElxhpPmGlxdivmOzyGSV5/Fq2qR3od+G99qobic47sF qnNi8mJPAuEa5JGLAU95+e3cDg18Yd9O7q36mRV8R8Gvym9QJ63y7r3dfs8Dj4yz jvijITGeuaT2Gm8a8Ic3eP2ijB8c0eop2yMyWoGCCNjnzwoVdyjv687PnwDnxyfS 2P8nehiDTrtOjTtG80jh1HutFnt+CBmCDLdkRSMc95mkvm7DpIk5+TNPBY8G9BEw N2mcohdvkEaOfv9TuMtdcSS+xBv3ItPACtwNPmVGCT+WTWjMvrUesHZd57SCTX9j 66GrvE+60uPpGB83NEOyKFYdOdp6Ap1lvyimVCrefaAZx+g8R25h4x8nV9eNUCrt QJlp8kBo3DkFkrn4tHxKAKLEaTwcDZqr2wL/9h/NH2vBjUAjyAw= =uYmA -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
svn commit: r46847 - in /release/openwhisk: openwhisk-cli-1.2.0-sources.tar.gz openwhisk-cli-1.2.0-sources.tar.gz.asc openwhisk-cli-1.2.0-sources.tar.gz.sha512
Author: mrutkowski Date: Thu Apr 1 22:06:44 2021 New Revision: 46847 Log: Apache OpenWhisk 1.2.0 release of OpenWhisk Command-Line Interface (CLI) Added: release/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz (with props) release/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz.asc release/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz.sha512 Added: release/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz == Binary file - no diff available. Propchange: release/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz -- svn:mime-type = application/octet-stream Added: release/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz.asc == --- release/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz.asc (added) +++ release/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz.asc Thu Apr 1 22:06:44 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEE7Lt91z/GK9yqwC2HOVKCph2I0KwFAmBh6DMACgkQOVKCph2I +0Kx5fA/9HFAefXJHZGw2gG15pJU3bK1TXyk2lyJ8Si7GXhZ53CVPNmuaomiG7Nd7 +tn6+s8oynHs50GQFXDWqhB3wMf7zc7r+UBaL0cYLcm62Bj/mHHg43j5riTLzjGsv +i6pgpV36g0QryPMx/a0PnmxYKnVp3BgzJuMqE05K1SvMLixLbc7xNj+KkWoH+3TL +zTyWWHjDRgg5px/sfQPc3fIVc8S67460boFJucsP4Y9wvmk0k1EeqUWR9I6gsWpZ +LW6BNMu0WJtKmCr4xr6sEFID6KXcbYmU0zkDelprqUwri5IWfsQMeYoLcRAvMTFD +PDKMt6UAPRqqle6+N9vdl4XhFR66LRV/Z7LmgNYNihVdy0l2P29y43V3hlwIQNVs +gVvD7YwpRYBV+dlZn1gHOawzWuHuYIHrjDzByujMvG0YxuLxWuqPcbigL5xNPaIU +KJ09ECVK6czzP3Yi5XOHXpIKdkpND9G2vo0eu1/xfb4eOUIi2f5HBzWFxy3xPw0Q +4TBgVjYEFn/8CX5S6E41gqUbL/pFn3di3vBPZ67WX5Q+A+3L0T2zNmHn/QDtssmc +j6wtqPH20KZeJ/5bXpHj/MiOlV0cs1+DKFgmVuNuHU3cRkx2IYSonsh719xbZXdU +aIAy9hmjt3tnwYTyMNTaxrox1S0NVYRLTMXDoLHUWpJ58aqqKEU= +=m4b2 +-END PGP SIGNATURE- Added: release/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz.sha512 == --- release/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz.sha512 (added) +++ release/openwhisk/openwhisk-cli-1.2.0-sources.tar.gz.sha512 Thu Apr 1 22:06:44 2021 @@ -0,0 +1,4 @@ +openwhisk-cli-1.2.0-sources.tar.gz: 6556A143 A5972A60 AF2143EE FECA3935 B1D536CA +183AFD70 60F97B83 C417A2E0 56A576D0 72182E3D +8A84CAAC A109D98F 10E9A8EC B9ABCD25 42C77669 +812052C6
svn commit: r46789 - in /dev/openwhisk/rc1: openwhisk-cli-1.2.0-sources.tar.gz openwhisk-cli-1.2.0-sources.tar.gz.asc openwhisk-cli-1.2.0-sources.tar.gz.sha512
Author: mrutkowski Date: Mon Mar 29 14:47:21 2021 New Revision: 46789 Log: Staging Apache OpenWhisk release candidates from ../release-configs/cli-1.2.0.json. Added: dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz (with props) dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz.asc dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz.sha512 Added: dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz == Binary file - no diff available. Propchange: dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz -- svn:mime-type = application/octet-stream Added: dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz.asc == --- dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz.asc (added) +++ dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz.asc Mon Mar 29 14:47:21 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEE7Lt91z/GK9yqwC2HOVKCph2I0KwFAmBh6DMACgkQOVKCph2I +0Kx5fA/9HFAefXJHZGw2gG15pJU3bK1TXyk2lyJ8Si7GXhZ53CVPNmuaomiG7Nd7 +tn6+s8oynHs50GQFXDWqhB3wMf7zc7r+UBaL0cYLcm62Bj/mHHg43j5riTLzjGsv +i6pgpV36g0QryPMx/a0PnmxYKnVp3BgzJuMqE05K1SvMLixLbc7xNj+KkWoH+3TL +zTyWWHjDRgg5px/sfQPc3fIVc8S67460boFJucsP4Y9wvmk0k1EeqUWR9I6gsWpZ +LW6BNMu0WJtKmCr4xr6sEFID6KXcbYmU0zkDelprqUwri5IWfsQMeYoLcRAvMTFD +PDKMt6UAPRqqle6+N9vdl4XhFR66LRV/Z7LmgNYNihVdy0l2P29y43V3hlwIQNVs +gVvD7YwpRYBV+dlZn1gHOawzWuHuYIHrjDzByujMvG0YxuLxWuqPcbigL5xNPaIU +KJ09ECVK6czzP3Yi5XOHXpIKdkpND9G2vo0eu1/xfb4eOUIi2f5HBzWFxy3xPw0Q +4TBgVjYEFn/8CX5S6E41gqUbL/pFn3di3vBPZ67WX5Q+A+3L0T2zNmHn/QDtssmc +j6wtqPH20KZeJ/5bXpHj/MiOlV0cs1+DKFgmVuNuHU3cRkx2IYSonsh719xbZXdU +aIAy9hmjt3tnwYTyMNTaxrox1S0NVYRLTMXDoLHUWpJ58aqqKEU= +=m4b2 +-END PGP SIGNATURE- Added: dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz.sha512 == --- dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz.sha512 (added) +++ dev/openwhisk/rc1/openwhisk-cli-1.2.0-sources.tar.gz.sha512 Mon Mar 29 14:47:21 2021 @@ -0,0 +1,4 @@ +openwhisk-cli-1.2.0-sources.tar.gz: 6556A143 A5972A60 AF2143EE FECA3935 B1D536CA +183AFD70 60F97B83 C417A2E0 56A576D0 72182E3D +8A84CAAC A109D98F 10E9A8EC B9ABCD25 42C77669 +812052C6
[openwhisk-release] branch master updated: Provide example of SVN cleanup (#381)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-release.git The following commit(s) were added to refs/heads/master by this push: new 927cdc6 Provide example of SVN cleanup (#381) 927cdc6 is described below commit 927cdc6aa2b07fd043bba225b89fbdc0c7e204df Author: Matt Rutkowski AuthorDate: Mon Mar 29 09:14:39 2021 -0500 Provide example of SVN cleanup (#381) * Provide example of SVN cleanup * Add Wskdeploy v1.2.0 release config * Anonymize example --- docs/release_instructions.md | 15 +++ release-configs/wskdeploy-1.2.0.json | 15 +++ tools/rcverify.sh| 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/docs/release_instructions.md b/docs/release_instructions.md index 1bf994d..63db9ec 100644 --- a/docs/release_instructions.md +++ b/docs/release_instructions.md @@ -457,6 +457,21 @@ When announcing a release, you must use the URL of the OpenWhisk Downloads page ### Post-release cleanup 1. Remove the release candidate files from the staging svn. + + for example: + + ```sh + $ svn delete openwhisk---sources.tar.gz + D openwhisk---sources.tar.gz + $ svn delete openwhisk--sources.tar.gz.asc + D openwhisk---sources.tar.gz.asc + $ svn delete openwhisk---sources.tar.gz.sha512 + D openwhisk---sources.tar.gz.sha512 + + $ svn commit -m "Deleted file OpenWhisk staged files." + + ``` + 1. If there is a prior release, remove it from the release svn (all releases are automatically archived, removing an old release from dist does not remove it from the archive). 1. Disable the Jenkins job to build and push Docker images to Docker hub if you released the `openwhisk` or `openwhisk-deploy-kube` repositories. diff --git a/release-configs/wskdeploy-1.2.0.json b/release-configs/wskdeploy-1.2.0.json new file mode 100644 index 000..46ba2de --- /dev/null +++ b/release-configs/wskdeploy-1.2.0.json @@ -0,0 +1,15 @@ +{ + "versioning": { +"version": "1.2.0", +"pre_release_version": "rc1" + }, + "RepoList": [ +"openwhisk-wskdeploy" + ], + "openwhisk_wskdeploy": { +"name": "OpenWhisk Wskdeploy", +"hash": "03df1126c3b5205d642738479a08bb7cd66a03b3", +"repository": "https://github.com/apache/openwhisk-wskdeploy.git;, +"branch": "master" + } +} diff --git a/tools/rcverify.sh b/tools/rcverify.sh index b1441ff..313095d 100755 --- a/tools/rcverify.sh +++ b/tools/rcverify.sh @@ -246,7 +246,7 @@ echo "$(tput setaf 6)$SHA$(tput sgr0)" printf "validating sha512..." validate "$EXPECTED" "$SHA" "$CMD" -printf "verifying asc..." +printf "verifying asc..." CMD="gpg --verify '$DIR/$TGZ.asc' '$DIR/$TGZ'" ASC=$(eval $CMD 2>&1) STATUS=$?
[openwhisk-wskdeploy] branch master updated: chore: fix spelling (#1127)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 d653592 chore: fix spelling (#1127) d653592 is described below commit d653592d8b8e8b7e64f228049bfa2f74db07a1e1 Author: John Bampton AuthorDate: Sat Mar 27 00:39:09 2021 +1000 chore: fix spelling (#1127) * chore: fix spelling * Regen. i18n_resources.go Co-authored-by: Matt Rutkowski --- deployers/deploymentreader_test.go | 4 +- deployers/whiskclient_test.go | 2 +- docs/sync_projects_between_client_and_server.md| 2 +- docs/wskdeploy_action_env_var_parms.md | 2 +- docs/wskdeploy_apigateway_http.md | 4 +- docs/wskdeploy_apigateway_http_sequence.md | 2 +- docs/wskdeploy_apigateway_open_api_spec.md | 2 +- docs/wskdeploy_faq.md | 2 +- docs/wskdeploy_sequence_basic.md | 4 +- parsers/manifest_parser.go | 2 +- specification/html/spec_packages.md| 2 +- specification/html/spec_rule.md| 2 +- specification/html/spec_trigger.md | 2 +- .../actions/find-delayed-pull-requests.js | 4 +- .../actions/track-pull-requests.js | 2 +- utils/file.go | 2 +- utils/misc_test.go | 2 +- utils/validation.go| 2 +- utils/zip.go | 24 +- wskenv/environment_test.go | 2 +- wski18n/i18n_resources.go | 397 + wski18n/resources/en_US.all.json | 12 +- 22 files changed, 124 insertions(+), 355 deletions(-) diff --git a/deployers/deploymentreader_test.go b/deployers/deploymentreader_test.go index b2c1f2a..3a44bfa 100644 --- a/deployers/deploymentreader_test.go +++ b/deployers/deploymentreader_test.go @@ -95,7 +95,7 @@ func testLoadAndBindDeploymentYAML(t *testing.T, path string, triggerName string dReader := NewDeploymentReader(sDeployer) err := dReader.HandleYaml() - // DEBUG() Uncomment to display initial DeploymentDescriptor (manifest, deployemnt befopre binding) + // DEBUG() Uncomment to display initial DeploymentDescriptor (manifest, deployment before binding) //fmt.Println(utils.ConvertMapToJSONString("BEFORE: dReader.DeploymentDescriptor", dReader.DeploymentDescriptor)) //fmt.Println(utils.ConvertMapToJSONString("BEFORE: sDeployer.Deployment", sDeployer.Deployment)) @@ -131,7 +131,7 @@ func TestDeploymentReader_ProjectBindTrigger(t *testing.T) { // Create an annotation (in manifest representation) with key we expect, with value that should be overwritten TEST_ANNOTATION := whisk.KeyValue{TEST_ANNOTATION_KEY, "foo"} - // create ServicedEployer + // create ServiceDeployer sDeployer, dReader := testLoadAndBindDeploymentYAML(t, TEST_DATA, TEST_TRIGGER, TEST_ANNOTATION) // test Project exists with expected name in Deployment file diff --git a/deployers/whiskclient_test.go b/deployers/whiskclient_test.go index 3c636c5..acbc29f 100644 --- a/deployers/whiskclient_test.go +++ b/deployers/whiskclient_test.go @@ -282,5 +282,5 @@ func TestNewWhiskConfigWithAdditionalHeaders(t *testing.T) { newHeaderValue := "NewValue" AddAdditionalHeader(newHeader, newHeaderValue) config, _ := NewWhiskConfig(propPath, deploymentPath, manifestPath) - assert.Equal(t, newHeaderValue, config.AdditionalHeaders.Get(newHeader), "Failed to set an addtional header") + assert.Equal(t, newHeaderValue, config.AdditionalHeaders.Get(newHeader), "Failed to set an additional header") } diff --git a/docs/sync_projects_between_client_and_server.md b/docs/sync_projects_between_client_and_server.md index 645263b..4576d15 100644 --- a/docs/sync_projects_between_client_and_server.md +++ b/docs/sync_projects_between_client_and_server.md @@ -33,7 +33,7 @@ whisk-managed: > Where the text “OpenWhisk” is a constant prefix and “\0” is the NULL > character. The and vary > depending on the file. -Now, subsequent deployments of the same project in `sync` mode, calculates a new `projectHash` on client and compares it with the one on the server for every entity in that project. This comparision could lead us to following two scenarios: +Now, subsequent deployments of the same project in `sync` mode, calculates a new `projectHash` on client and compares it with the one on the server for every entity in that project. This comparison could lead us to following tw
[openwhisk-cli] branch master updated: Update Whisk Deploy (openwhisk-wskdeploy) dependency to v1.2.0 (#510)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git The following commit(s) were added to refs/heads/master by this push: new 7c47ef1 Update Whisk Deploy (openwhisk-wskdeploy) dependency to v1.2.0 (#510) 7c47ef1 is described below commit 7c47ef1dbad550566114baf976c091b4cdd9e678 Author: Matt Rutkowski AuthorDate: Thu Mar 25 19:38:26 2021 -0500 Update Whisk Deploy (openwhisk-wskdeploy) dependency to v1.2.0 (#510) * Update Whisk Deploy (openwhisk-wskdeploy) dependency to v1.2.0 * Update CHANGELOG --- CHANGELOG.md | 8 +--- go.mod | 8 go.sum | 11 +++ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 658f2a5..1a26f59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,10 +21,12 @@ ## v1.2.0 +- Update Whisk Deploy (openwhisk-wskdeploy) dependency to v1.2.0 (#510) +- Prep. for potential 1.2.0 release (#498) - Update for travis migration (#492) -- bump openwhisk-client-go dependency (#493) -- remove trailing slash on apihost #481 (#485) -- recognize .rs extension as a Rust action kind (#495) +- Bump openwhisk-client-go dependency (#493) +- Remove trailing slash on apihost #481 (#485) +- Recognize .rs extension as a Rust action kind (#495) - Remove last Godeps, update Gogradle for gomod and Ansible setup (#496) - Update Gradle/Wrapper to latest version (#497) diff --git a/go.mod b/go.mod index 4cf15b7..d423c8f 100644 --- a/go.mod +++ b/go.mod @@ -3,13 +3,13 @@ module github.com/apache/openwhisk-cli go 1.15 require ( - github.com/apache/openwhisk-client-go v0.0.0-20210308161059-5cd1006dc35f - github.com/apache/openwhisk-wskdeploy v0.0.0-20210305213302-f4f94e757f09 + github.com/apache/openwhisk-client-go v0.0.0-20210311185314-87edc2364717 + github.com/apache/openwhisk-wskdeploy v0.0.0-20210316172333-03df1126c3b5 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6 // indirect github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 github.com/fatih/color v1.10.0 github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 - github.com/google/go-querystring v1.0.0 // indirect + github.com/google/go-querystring v1.1.0 // indirect github.com/jteeuwen/go-bindata v3.0.7+incompatible // indirect github.com/mattn/go-colorable v0.1.8 github.com/mitchellh/go-homedir v1.1.0 @@ -22,6 +22,6 @@ require ( github.com/stretchr/testify v1.6.1 github.com/ugorji/go v1.1.4 // indirect github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77 // indirect - golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b // indirect + golang.org/x/sys v0.0.0-20210324051608-47abb6519492 // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect ) diff --git a/go.sum b/go.sum index 871fc17..06ec20a 100644 --- a/go.sum +++ b/go.sum @@ -25,10 +25,16 @@ github.com/apache/openwhisk-client-go v0.0.0-20200927152356-49c58e00354d h1:eRcV github.com/apache/openwhisk-client-go v0.0.0-20200927152356-49c58e00354d/go.mod h1:jLLKYP7+1+LFlIJW1n9U1gqeveLM1HIwa4ZHNOFxjPw= github.com/apache/openwhisk-client-go v0.0.0-20210308161059-5cd1006dc35f h1:SVXVE9+snbgp5vtxfOQ7QrANTZQ/bcP9IFev6HXrtWc= github.com/apache/openwhisk-client-go v0.0.0-20210308161059-5cd1006dc35f/go.mod h1:SAQU4bHGJ0sg6c1vQ8ojmQKXgGaneVnexWX4+2/KMr8= +github.com/apache/openwhisk-client-go v0.0.0-20210311185314-87edc2364717 h1:7MsAB3W6JH0d9TZ4UJ55rwV8AR9jXXZf97Uzk+CJqqs= +github.com/apache/openwhisk-client-go v0.0.0-20210311185314-87edc2364717/go.mod h1:SAQU4bHGJ0sg6c1vQ8ojmQKXgGaneVnexWX4+2/KMr8= +github.com/apache/openwhisk-client-go v0.0.0-20210313152306-ea317ea2794c h1:G1xH1WDL9VsJYkcD2ni56hbmVnPO45haTTbacVMpPb8= +github.com/apache/openwhisk-client-go v0.0.0-20210313152306-ea317ea2794c/go.mod h1:SAQU4bHGJ0sg6c1vQ8ojmQKXgGaneVnexWX4+2/KMr8= github.com/apache/openwhisk-wskdeploy v0.0.0-20200827195556-535f5a9d3942 h1:SDeUi5Wqtv2J/4FkbjyZ3pCEMfy88DMTQix+qmAjo9I= github.com/apache/openwhisk-wskdeploy v0.0.0-20200827195556-535f5a9d3942/go.mod h1:jRNFwq0Ribf74Jd7oYvoDtBH+RXb5nCVAIHji47ESjY= github.com/apache/openwhisk-wskdeploy v0.0.0-20210305213302-f4f94e757f09 h1:+mxjBxL1qKwzPCt6mud6mw98ILdXd+0PVzj2ccfLt6k= github.com/apache/openwhisk-wskdeploy v0.0.0-20210305213302-f4f94e757f09/go.mod h1:BtqnIRBNfk6hM+o3CE8joQZ3lSQm2qS5eVPo/rtoOyE= +github.com/apache/openwhisk-wskdeploy v0.0.0-20210316172333-03df1126c3b5 h1:MocS3KmzireB/s+MkjWDI5cgebAWjOZpUm5Ki2AO2kw= +github.com/apache/openwhisk-wskdeploy v0.0.0-20210316172333-03df1126c3b5/go.mod h1:6CZs4G/NMAHtopqyNVelubokzJt6XGfmsoflAQ+qwjM= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api
[openwhisk-cli] branch master updated: Prep. for potential 1.2.0 release (#498)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git The following commit(s) were added to refs/heads/master by this push: new 89332e5 Prep. for potential 1.2.0 release (#498) 89332e5 is described below commit 89332e5ac6adea2b1637f9437d17645d0e05bfd1 Author: Matt Rutkowski AuthorDate: Thu Mar 25 13:09:57 2021 -0500 Prep. for potential 1.2.0 release (#498) * Prep. for potential 1.2.0 release * Update CHANGELOG and NOTICE files --- CHANGELOG.md | 57 +--- NOTICE.txt | 2 +- README.md| 26 ++-- go.mod | 25 +++ go.sum | 210 +++ 5 files changed, 265 insertions(+), 55 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index adbac00..658f2a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,35 +19,46 @@ # Changelog +## v1.2.0 + +- Update for travis migration (#492) +- bump openwhisk-client-go dependency (#493) +- remove trailing slash on apihost #481 (#485) +- recognize .rs extension as a Rust action kind (#495) +- Remove last Godeps, update Gogradle for gomod and Ansible setup (#496) +- Update Gradle/Wrapper to latest version (#497) + ## v1.1.0 - * Upgrade all Go dependencies to latest (#490) - * Migrated to using go mod to manage dependencies (#489) - * Upgrade travis to go 1.15 - * Support passing del annotation (#488) - * Add an overwrite flag to "package bind" (#474) - * Trigger parameter issue (#479) - * remove test for download of iOS SDK (#478) - * build binary test artifacts (#477) - * Update test file (#463) - * Fix regex for log stripping. (#462) - * Ensure that the pollSince is greater than Activation start time (#461) + +- Upgrade all Go dependencies to latest (#490) +- Migrated to using go mod to manage dependencies (#489) +- Upgrade travis to go 1.15 +- Support passing del annotation (#488) +- Add an overwrite flag to "package bind" (#474) +- Trigger parameter issue (#479) +- remove test for download of iOS SDK (#478) +- build binary test artifacts (#477) +- Update test file (#463) +- Fix regex for log stripping. (#462) +- Ensure that the pollSince is greater than Activation start time (#461) ## v1.0.0 - * Allow log stripping to tolerate a missing stream identifier. (#444) - * Add --logs options on activation get to return stripped logs as a convenience. (#445) - * RestAssured fixes (#441) - * Remove namespace property from wskprops (#434) - * "wsk property get" can now return raw output for specific properties (#430) - * Add dynamic column sizing to wsk activation list command (#427) + +- Allow log stripping to tolerate a missing stream identifier. (#444) +- Add --logs options on activation get to return stripped logs as a convenience. (#445) +- RestAssured fixes (#441) +- Remove namespace property from wskprops (#434) +- "wsk property get" can now return raw output for specific properties (#430) +- Add dynamic column sizing to wsk activation list command (#427) ## v0.10.0 -* Integrate wskdeploy via `project` subcommand -* Enhanced columnar output in `activation list` -* CLI support for OpenWhisk enhancements including: - * Support for specifying intra-container concurrency - * New supported action languages: Ballerina, .Net, and Go +- Integrate wskdeploy via `project` subcommand +- Enhanced columnar output in `activation list` +- CLI support for OpenWhisk enhancements including: +- Support for specifying intra-container concurrency +- New supported action languages: Ballerina, .Net, and Go ## v0.9.0 -* Initial release as an Apache Incubator project. +- Initial release as an Apache Incubator project. diff --git a/NOTICE.txt b/NOTICE.txt index caee469..10430ce 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache OpenWhisk Command-line Interface (CLI) -Copyright 2016-2020 The Apache Software Foundation +Copyright 2016-2021 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/README.md b/README.md index dd60344..5214f17 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ We also provide instructions on how to build your own binaries from source code. You can copy the `wsk` binary to any folder, and add the folder to your system `PATH` in order to run the OpenWhisk CLI command from anywhere on your system. To get the CLI command help, execute the following: -``` +```sh $ wsk --help ``` @@ -90,7 +90,7 @@ git clone g...@github.com:apache/openwhisk-cli or you can specify a release (tag) if you do not want the latest code by using the `--branch ` flag. For example, you can clone the source code for the tagged 1.1.0 [release](https://github.com/apache/openwhisk-cli/releases/tag/1.1.0) ```sh -git clone --branch 1.1.0 g...@git
[openwhisk-cli] branch master updated: chore: fix grammar (#502)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git The following commit(s) were added to refs/heads/master by this push: new 50f4f69 chore: fix grammar (#502) 50f4f69 is described below commit 50f4f69bbf6fa14099a8d7d2b19874283effd8dc Author: John Bampton AuthorDate: Thu Mar 25 06:10:33 2021 +1000 chore: fix grammar (#502) --- README.md | 2 +- commands/activation.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1dd1b00..dd60344 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ windows | 386 (32-bit), amd64 (64-bit) The project includes its own packaged version of Gradle called Gradle Wrapper which is invoked using the `./gradlew` command on Linux/Unix/Mac or `gradlew.bat` on Windows. -1. Gradle requires requires you to [install Java JDK version 8](https://gradle.org/install/) or higher +1. Gradle requires you to [install Java JDK version 8](https://gradle.org/install/) or higher 1. Clone the `openwhisk-cli` repo: diff --git a/commands/activation.go b/commands/activation.go index 2048653..94433a2 100644 --- a/commands/activation.go +++ b/commands/activation.go @@ -276,7 +276,7 @@ func lastFlag(args []string) ([]string, error) { whisk.Debug(whisk.DbgError, "Client.Activations.List(%#v) error during lastFlag: %s\n", options, err) return args, err } - if len(activations) == 0 { // Checks to to see if there are activations available + if len(activations) == 0 { // Checks to see if there are activations available whisk.Debug(whisk.DbgError, "No activations found in activation list\n") errStr := wski18n.T("Activation list does not contain any activations.") whiskErr := whisk.MakeWskError(errors.New(errStr), whisk.EXIT_CODE_ERR_GENERAL, whisk.DISPLAY_MSG, whisk.DISPLAY_USAGE)
svn commit: r46723 - in /dev/openwhisk/rc1: openwhisk-wskdeploy-1.2.0-sources.tar.gz openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512
Author: mrutkowski Date: Wed Mar 24 17:46:38 2021 New Revision: 46723 Log: Deleted file OpenWhisk Wskdeploy v1.2.0 staged files. Removed: dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512
[openwhisk-wskdeploy] annotated tag 1.2.0 updated (03df112 -> 6b73d4e)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a change to annotated tag 1.2.0 in repository https://gitbox.apache.org/repos/asf/openwhisk-wskdeploy.git. *** WARNING: tag 1.2.0 was modified! *** from 03df112 (commit) to 6b73d4e (tag) tagging 03df1126c3b5205d642738479a08bb7cd66a03b3 (commit) replaces 1.1.0 by Matt Rutkowski on Wed Mar 24 12:03:30 2021 -0500 - Log - OpenWhisk Whisk Deploy (wskdeploy) v1.2.0 -BEGIN PGP SIGNATURE- iQIzBAABCAAdFiEE7Lt91z/GK9yqwC2HOVKCph2I0KwFAmBbcOIACgkQOVKCph2I 0KzgEQ/+Id8hZrr9Trcl0qKsTQ3qvRVrmDgiu+wwRcvXJ1Adnzq51qbHxXvLS4BB NuDvE3vHwUSFAFO9v7DqgfirMUxdE9kMSuwuI48o59yhlZRXohBzYGcga13/yetY L8aq3AP6vKrTBWyV9zz3SqLB2tlsMZlDzUux2N2DNHSlbGxPcUz6B8teUzkl49Hh gj2BIYxlSdPt8Ndl+nm542SzMwowCTFbBigfWkaqhXOEzzAm2ZAcHQjrtX6QDNPj o+OiwrUJ3hJ1v1oWc8QV7hJ6V6+t66upxCkl48xDzwwaZXnsekwzZKGLR0XCX3/W gz661E5qBuBMIDeikeXJSnD141UQPPaJyB8U5Vekhn9Dp3+lNKr3og3CvZQsTjxZ N1PSwxIPDm4cG9UPaiR5q0C30gpBVsGWCHrJJEH9Bv/d8ahv2F6m+DT4ryYH4OHM Vg5cGnosyDeZVg/+g0SgbxIP9SzAXDcBSqXWaFCctoy6SWtK3iWDKiSABV0oFAEG gaKFHK9JLMQltfYZ5C+Tki6DBCxXJpqMewv+mBexXrjF/39PcmQzrCYma4YzS5gC L93V9cOQeS8MwRFqtUTCkOtsg9AWRCcXYtlslvF9abq7SHyRNwyHRDxAfnCRfib1 AGZcZLeruu2Vo1VzyjGreU7xJ1jpE973GQ6vk44Fsvae7G+T2YE= =PMY2 -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[openwhisk-website] branch master updated: Update downloads page with 1.2.0 release of Whisk Deploy (wskdeploy). (#475)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-website.git The following commit(s) were added to refs/heads/master by this push: new 0eb47e9 Update downloads page with 1.2.0 release of Whisk Deploy (wskdeploy). (#475) 0eb47e9 is described below commit 0eb47e953a248ed0c492d6e97c024c58e8febe7c Author: rodric rabbah AuthorDate: Wed Mar 24 09:13:16 2021 -0400 Update downloads page with 1.2.0 release of Whisk Deploy (wskdeploy). (#475) Co-authored-by: Matt Rutkowski --- README.md | 4 ++-- _layouts/downloads.html | 11 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 79b7c1e..05a37a9 100644 --- a/README.md +++ b/README.md @@ -102,9 +102,9 @@ for example, update "?v1.12" to "?v1.13". ## Using `rbenv` -If you need to maintain your existing system Ruby version, you can use the [https://github.com/rbenv/rbenv](https://github.com/rbenv/rbenv) utility. +If you need to maintain your existing system Ruby version, you can use the [https://github.com/rbenv/rbenv](https://github.com/rbenv/rbenv) utility to dynamically switch to the version this project requires. -The project already has a `.ruby_version` file which indicates it requires Ruby 2.7.2. All you need do is assure once `rbenv` is installed that you use the following commands from the bash shell you wish to compile the project: +The project already has a `.ruby_version` file which indicates it requires Ruby 2.7.2. All you need do is assure once `rbenv` is installed that you issue the following commands (one time) from the bash shell you wish to compile the project: ```sh $ rbenv init diff --git a/_layouts/downloads.html b/_layouts/downloads.html index edaad5f..63fbc7e 100644 --- a/_layouts/downloads.html +++ b/_layouts/downloads.html @@ -349,15 +349,15 @@ layout: default OpenWhisk Whisk Deploy (wskdeploy)Client utility to deploy, configure and manage OpenWhisk applications and packages with a single YAML Manifest file. - 1.1.0 + 1.2.0 https://www.apache.org/dyn/closer.cgi/openwhisk/openwhisk-wskdeploy-1.1.0-sources.tar.gz;> + href="https://www.apache.org/dyn/closer.cgi/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz;> Source code https://downloads.apache.org/openwhisk/openwhisk-wskdeploy-1.1.0-sources.tar.gz.sha512;> + href="https://downloads.apache.org/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512;> SHA-512 checksum https://downloads.apache.org/openwhisk/openwhisk-wskdeploy-1.1.0-sources.tar.gz.asc;> + href="https://downloads.apache.org/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc;> PGP signature @@ -473,9 +473,10 @@ layout: default
svn commit: r46694 - /release/openwhisk/
Author: mrutkowski Date: Fri Mar 19 20:54:36 2021 New Revision: 46694 Log: Apace OpenWhisk 1.2.0 release of Whisk Deploy (wskdeploy) Added: release/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz (with props) release/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc release/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512 Removed: release/openwhisk/openwhisk-wskdeploy-1.1.0-sources.tar.gz release/openwhisk/openwhisk-wskdeploy-1.1.0-sources.tar.gz.asc release/openwhisk/openwhisk-wskdeploy-1.1.0-sources.tar.gz.sha512 Added: release/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz == Binary file - no diff available. Propchange: release/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz -- svn:mime-type = application/octet-stream Added: release/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc == --- release/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc (added) +++ release/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc Fri Mar 19 20:54:36 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEE7Lt91z/GK9yqwC2HOVKCph2I0KwFAmBRDycACgkQOVKCph2I +0KzI0Q//TTNtj3Ke05/f2UfDNA90++s6qEonyj0BQKO8f53lU/gFNbwND+TdpDwe +1OkZYDAV4ZKLkPO6MnFoPKH9Fp0Jya+sPIo8OZckZ4XHdH+puKNDsXxUyh16Hy5O +XlEAkO7o9ha1mOn+e/e0PDHBMDXli/es8xI8VDok1jp4QwovQZYoH92ok12vp5i+ +Rv8WQx23wjWa40IHGQze2Um4UM1zST9q3Wau1H+/Lgoe97MgDi8i3uyMewitKVvY +87oLhRjHHLXnDH/PrNSwlDvYD6+yuVRu5Zhhs/tQwKhKdNEmX/g7BhZOK2u2DQnk +S41gQLh/p1j7oiNcAvJAwwU8A6/U35El4KDYba8kR+8VTDpK24qHOH4xLegWVNOk +qHe7VtUdWdSzwTmvngBPA4qjN6s5wRPkdnhHJl6DMdUCzAjhUA2vzRK57L2E5Xix +n3Sd4eEAzEf4BMvE9UIdaLUA08t7KgMmwWM8g/BbSWp8B2qvUoyn0mHn1B9sj4QV +7HRY7nhECPAD7KnWmlvQNKkpqoO9FsgYM+PUC0dGidyb8daq7GH7VcW1y46mPLd/ +wpBQw2ud0y5n6LwptvTTZ5Pz42QY39csc0ZUty3KjuF4USXZjB6tfE4sSYGcchXG +Yw0+OM6VDtRxRoBlCeauEgAYRZdL3gJ2bld7ToCZk8agYdVYvuI= +=AEpe +-END PGP SIGNATURE- Added: release/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512 == --- release/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512 (added) +++ release/openwhisk/openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512 Fri Mar 19 20:54:36 2021 @@ -0,0 +1,3 @@ +openwhisk-wskdeploy-1.2.0-sources.tar.gz: +B9EC1CCD 71AB7E8F DEE24BD8 88A8DAF5 207B3582 4C8F8905 D703110E E7F812EE EDA7DD7F + 1F261650 61CE9B87 7F5AF56B DBF29FE2 74053A6E E65A21BD AC16164B
svn commit: r46664 - in /dev/openwhisk/rc1: ./ openwhisk-wskdeploy-1.2.0-sources.tar.gz openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512
Author: mrutkowski Date: Tue Mar 16 20:04:48 2021 New Revision: 46664 Log: Staging Apache OpenWhisk release candidates from ../release-configs/wskdeploy-1.2.0.json. Added: dev/openwhisk/rc1/ dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz (with props) dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512 Added: dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz == Binary file - no diff available. Propchange: dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz -- svn:mime-type = application/octet-stream Added: dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc == --- dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc (added) +++ dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz.asc Tue Mar 16 20:04:48 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEE7Lt91z/GK9yqwC2HOVKCph2I0KwFAmBRDycACgkQOVKCph2I +0KzI0Q//TTNtj3Ke05/f2UfDNA90++s6qEonyj0BQKO8f53lU/gFNbwND+TdpDwe +1OkZYDAV4ZKLkPO6MnFoPKH9Fp0Jya+sPIo8OZckZ4XHdH+puKNDsXxUyh16Hy5O +XlEAkO7o9ha1mOn+e/e0PDHBMDXli/es8xI8VDok1jp4QwovQZYoH92ok12vp5i+ +Rv8WQx23wjWa40IHGQze2Um4UM1zST9q3Wau1H+/Lgoe97MgDi8i3uyMewitKVvY +87oLhRjHHLXnDH/PrNSwlDvYD6+yuVRu5Zhhs/tQwKhKdNEmX/g7BhZOK2u2DQnk +S41gQLh/p1j7oiNcAvJAwwU8A6/U35El4KDYba8kR+8VTDpK24qHOH4xLegWVNOk +qHe7VtUdWdSzwTmvngBPA4qjN6s5wRPkdnhHJl6DMdUCzAjhUA2vzRK57L2E5Xix +n3Sd4eEAzEf4BMvE9UIdaLUA08t7KgMmwWM8g/BbSWp8B2qvUoyn0mHn1B9sj4QV +7HRY7nhECPAD7KnWmlvQNKkpqoO9FsgYM+PUC0dGidyb8daq7GH7VcW1y46mPLd/ +wpBQw2ud0y5n6LwptvTTZ5Pz42QY39csc0ZUty3KjuF4USXZjB6tfE4sSYGcchXG +Yw0+OM6VDtRxRoBlCeauEgAYRZdL3gJ2bld7ToCZk8agYdVYvuI= +=AEpe +-END PGP SIGNATURE- Added: dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512 == --- dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512 (added) +++ dev/openwhisk/rc1/openwhisk-wskdeploy-1.2.0-sources.tar.gz.sha512 Tue Mar 16 20:04:48 2021 @@ -0,0 +1,3 @@ +openwhisk-wskdeploy-1.2.0-sources.tar.gz: +B9EC1CCD 71AB7E8F DEE24BD8 88A8DAF5 207B3582 4C8F8905 D703110E E7F812EE EDA7DD7F + 1F261650 61CE9B87 7F5AF56B DBF29FE2 74053A6E E65A21BD AC16164B
[openwhisk-wskdeploy] branch master updated: Prep. for potential 1.2.0 release (#1126)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 03df112 Prep. for potential 1.2.0 release (#1126) 03df112 is described below commit 03df1126c3b5205d642738479a08bb7cd66a03b3 Author: Matt Rutkowski AuthorDate: Tue Mar 16 12:23:33 2021 -0500 Prep. for potential 1.2.0 release (#1126) * Prep. for potential 1.2.0 release * Update OpenWisk Client Go dependency to new release version 1.2.0 --- CHANGELOG.md | 119 ++- NOTICE.txt | 2 +- go.mod | 4 +- go.sum | 9 + 4 files changed, 81 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12aa4f5..bfef161 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,59 +19,78 @@ # Apache OpenWhisk WskDeploy -# 1.1.0 - * Upgrade to Go 1.15 (#1105) - * Added interpolation to docker option in manifest.yaml (#1100) - * Migrate to using Go Module to manage dependencies (#1101) - * doc: spec_apis.md basePath, relativePath (#1096) - * Remove misleading web-export key (#1092) - * Fix link to spec. docs for triggers and rules (#1093) - * Support alt namespace uuid as tenant id on swagger api creates/deletes (#1091) - * Fix max int. comparison for 386 archs (#1090) - * replace the last few uses of nodejs@6 with nodejs@10 (#1089) - * Enable Web Secure token for sequences on API create (#1087) - * Enable setting user-supplied auth tokens on API create via require-whisk-auth annotation (#1083) - * Add the ability to specify api via swagger in manifest (#1078) - * Updating runtimes cache to match server side (#1086) - * Deprecate nodejs:6 and update runtime metadata (#1085) - * Dummy token issue (#1081) - * Support alt. namespace resource uuid as tenant id on undeploy (#1080) - * Support alt. namespace resource uuid as tenant id to API gatway service (#1076) - * gradle version 5 (#1075) +## 1.2.0 + +- Migration from travis-ci.org to travis-ci.com (#1108) +- Generate hosts script (#1112) +- Remove ansible files from local in favor of core's version (#1113) +- Remove unsupported Darwin-386 (23-bit) from GoLang 1.15 build matrix (#1115) +- Remove unused Godeps files; update README for Go Modules (#1114) +- Add Rust extension to list of known runtimes (#1117) +- Fix gogradle plugin to stop using vendor directory (#1118) +- Rust 1.34 support (#1119) +- Documentation cleanup, post-gogradle build changes (#1120) +- Streamline README for Gradle and cross-architecture builds & upgrade gogradle plugin (#1122) +- Upgrade Gradle/Wrapper to latest version (#1123) +- Update openwhisk-client-go to release 1.1.0 as well as other pkg dependencies (#1124) + +## 1.1.0 + +- Upgrade to Go 1.15 (#1105) +- Added interpolation to docker option in manifest.yaml (#1100) +- Migrate to using Go Module to manage dependencies (#1101) +- doc: spec_apis.md basePath, relativePath (#1096) +- Remove misleading web-export key (#1092) +- Fix link to spec. docs for triggers and rules (#1093) +- Support alt namespace uuid as tenant id on swagger api creates/deletes (#1091) +- Fix max int. comparison for 386 archs (#1090) +- replace the last few uses of nodejs@6 with nodejs@10 (#1089) +- Enable Web Secure token for sequences on API create (#1087) +- Enable setting user-supplied auth tokens on API create via require-whisk-auth annotation (#1083) +- Add the ability to specify api via swagger in manifest (#1078) +- Updating runtimes cache to match server side (#1086) +- Deprecate nodejs:6 and update runtime metadata (#1085) +- Dummy token issue (#1081) +- Support alt. namespace resource uuid as tenant id on undeploy (#1080) +- Support alt. namespace resource uuid as tenant id to API gatway service (#1076) +- gradle version 5 (#1075) ## 1.0.0 - * Auto supply a dummy API GW token (#1068) - * Support Description field in corresponding entities (#1057) - * Honor WSK_CONFIG_FILE if variable is set (#1054) - * Update version of whisk modules (#1067) - * Update openwhisk-client-go version (#1059); Fixes #1050. - * Fixes export project with feed bug (#1052) - * Added date and commit SHA to the version command (#1047) - * Account for variability in Account Limits from various provider impls. (#1048) + +- Auto supply a dummy API GW token (#1068) +- Support Description field in corresponding entities (#1057) +- Honor WSK_CONFIG_FILE if variable is set (#1054) +- Update version of whisk modules (#1067) +- Update openwhisk-client-go version (#1059); Fixes #1050. +- Fixes export project with feed bug (#1052) +- Added date and commit SHA to the version command (#1047) +- Account for variability in Account Limits from various provider impls. (#1048) ## 0.10.0-incubating - * Fix language:default runtime setting (#1039) - * Link api sc
svn commit: r46663 - in /release/openwhisk: openwhisk-client-go-1.1.0-sources.tar.gz openwhisk-client-go-1.1.0-sources.tar.gz.asc openwhisk-client-go-1.1.0-sources.tar.gz.sha512
Author: mrutkowski Date: Tue Mar 16 15:34:18 2021 New Revision: 46663 Log: removing up release files for OpenWhisk Client Go v1.1.0 Removed: release/openwhisk/openwhisk-client-go-1.1.0-sources.tar.gz release/openwhisk/openwhisk-client-go-1.1.0-sources.tar.gz.asc release/openwhisk/openwhisk-client-go-1.1.0-sources.tar.gz.sha512
svn commit: r46662 - /dev/openwhisk/rc1/
Author: mrutkowski Date: Tue Mar 16 15:32:21 2021 New Revision: 46662 Log: cleaning up staged release files for OpenWhisk Client Go v1.2.0 Removed: dev/openwhisk/rc1/
[openwhisk-release] branch master updated: Continue to refine release manager instructions (#380)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-release.git The following commit(s) were added to refs/heads/master by this push: new 79084ef Continue to refine release manager instructions (#380) 79084ef is described below commit 79084efe2b09712191c89da01ae48c2e660dae74 Author: Matt Rutkowski AuthorDate: Tue Mar 16 10:27:14 2021 -0500 Continue to refine release manager instructions (#380) * Continue to refine release manager instructions * Continue to refine release manager instructions * Continue to refine release manager instructions * Continue to refine release manager instructions * Continue to refine release manager instructions * Continue to refine release manager instructions * Continue to refine release manager instructions * Continue to refine release manager instructions * Continue to refine release manager instructions * Continue to refine release manager instructions * Continue to refine release manager instructions * Continue to refine release manager instructions --- docs/release_instructions.md | 98 + docs/release_manager_setup.md | 2 +- docs/tag_release.md | 109 -- 3 files changed, 119 insertions(+), 90 deletions(-) diff --git a/docs/release_instructions.md b/docs/release_instructions.md index 42f70e9..1bf994d 100644 --- a/docs/release_instructions.md +++ b/docs/release_instructions.md @@ -217,7 +217,7 @@ Use the [gen-release-vote.py](../tools/gen-release-vote.py) script to create the This script accepts a [mailer configuration file](https://github.com/apache/openwhisk-release/blob/master/tools/mail-config-template.yaml) which you can use to also send the vote email directly to the mailing list. _You should dry run this command with `-n` to sanity check the vote notice before it is sent._ -``` +```sh ./gen-release-vote.py ../release-configs/.json -mc .yaml ``` @@ -246,10 +246,15 @@ If this is not true (e.g., multiple parallel release votes), then the upload mus ``` Assuming the expected set of files were added, commit them: -``` + +```sh cd ../stagingArea/svn_release && svn commit -m "Apache OpenWhisk X.Y.Z release of " ``` +You can verify your commit to the Apache OpenWhisk official release folder: + +- https://dist.apache.org/repos/dist/release/openwhisk/ + Relatively soon after doing the svn commit, you should receive an email like the one shown below from reporter.apache.org asking you to add release data to its database information. ```text @@ -270,23 +275,96 @@ and add your release data (version and date) to the database. Please follow the link and perform the update; this information is quite useful for drafting our periodic reports to the ASF Board. -### Tag GitHub repos +### Tag GitHub repositories -Each GitHub repository needs to be tagged. Unfortunately, the naming conventions for tagging vary across the OpenWhisk project repositories and therefore we have not yet attempted to automate this step. +Each GitHub repository needs to be tagged. + +> **Note** Some naming conventions for tagging vary across the OpenWhisk project repositories and therefore we have not yet attempted to automate this step. + +For each released repository, the Release Manager should tag each released project using the same hash values specified in the release configuration file (i.e., `openwhisk-release/release-configs/.json`) and approved by member email `[VOTE]`. + +Open a terminal, go the home directory of the OpenWhisk project to be released and run the following commands: + +```sh +git tag -s -a -m "OpenWhisk v" +git push +``` -For each released repository, the Release Manager should examine the existing set of tags (`git tag`) and then add a new tag following the same convention using the git commit hash from .json. After tagging a repo, push the tag. +- [*Optional*] It is good practice to sign release tags using your GPG key by adding the `-s` flag which will use your system default key from your operating system keychain. + - See [Signing tags using GPG keys](#signing-tags-using-gpg-keys) below. +- Replace `` with the tag name for the release of the current project (e.g., 1.1.0). +- Update the commit message, `-m` to reflect the project name and version which should match the release tag +- Replace `` with the commit hash (ID) you designated for the release of the current project. This can either be the full commit hash or the first 8 letters of the hash (to assure unique lookup). +- Replace `` to the remote repository label of the OpenWhisk project which is typically set to `upstream` for a project Committer and maps to the full GitHub URL (e.g., `g...@gith
[openwhisk-website] branch master updated: Update downloads to include OpenWhisk Client Go v1.2.0 (#472)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-website.git The following commit(s) were added to refs/heads/master by this push: new 5197ec8 Update downloads to include OpenWhisk Client Go v1.2.0 (#472) 5197ec8 is described below commit 5197ec84ad96d952c6aae3a3ccdd46427df0f9e4 Author: Matt Rutkowski AuthorDate: Tue Mar 16 09:51:10 2021 -0500 Update downloads to include OpenWhisk Client Go v1.2.0 (#472) * Update downloads to include OpenWhisk Client Go v1.2.0 Signed-off-by: Matt Rutkowski * Update downloads to include OpenWhisk Client Go v1.2.0 Signed-off-by: Matt Rutkowski * Update README to make Ruby 2.7.2 a pre-req and add RBENV instructs. --- README.md | 31 +++- _layouts/downloads.html | 64 ++--- 2 files changed, 58 insertions(+), 37 deletions(-) diff --git a/README.md b/README.md index df4393b..79b7c1e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,10 @@ Apache OpenWhisk is a cloud-first distributed event-based programming service. I - Download and install Node.js (recommend v12 LTS): see [https://nodejs.org/](https://nodejs.org/) - Download and install NPM (recommend v6.14 latest): see [https://www.npmjs.com/package/npm](https://www.npmjs.com/package/npm) -- Download and install Ruby (recommend v2.7 stable): see [https://www.ruby-lang.org/en/documentation/installation/](https://www.ruby-lang.org/en/documentation/installation/) +- Download and install Ruby (recommend v2.7.2 stable): see [https://www.ruby-lang.org/en/documentation/installation/](https://www.ruby-lang.org/en/documentation/installation/) +> **Note** Currently, the website's Jekyll version will not compile with Ruby version 3 or higher. +- If you need to manage multiple Ruby versions, you may use [https://github.com/rbenv/rbenv](https://github.com/rbenv/rbenv). See [Using rbenv](#using-rbenv) below. + ```sh # Verify Node and Node Package Manager are installed @@ -97,6 +100,32 @@ for example, update "?v1.12" to "?v1.13". ``` +## Using `rbenv` + +If you need to maintain your existing system Ruby version, you can use the [https://github.com/rbenv/rbenv](https://github.com/rbenv/rbenv) utility. + +The project already has a `.ruby_version` file which indicates it requires Ruby 2.7.2. All you need do is assure once `rbenv` is installed that you use the following commands from the bash shell you wish to compile the project: + +```sh +$ rbenv init +$ rbenv install 2.7.2 +$ rbenv global 2.7.2 +$ eval "$(rbenv init -)" +``` + +When opening subsequent bash terminals, you need only issue the following command (as `rbenv init` has updated your system `.bash_profile`): + +```sh +eval "$(rbenv init -)" +``` + +You can verify the version changed by using: + +```sh +$ rbenv global +$ ruby -v +``` + ## Troubleshooting If you get an error 'bundle: command not found' attempting to build the site, you may need to manually install the 'bundler' package: diff --git a/_layouts/downloads.html b/_layouts/downloads.html index c8be60d..66b8b3c 100644 --- a/_layouts/downloads.html +++ b/_layouts/downloads.html @@ -347,7 +347,7 @@ layout: default -OpenWhisk Whisk DeployClient utility to deploy, configure and manage OpenWhisk applications and packages with a single YAML Manifest file. +OpenWhisk Whisk Deploy (wskdeploy)Client utility to deploy, configure and manage OpenWhisk applications and packages with a single YAML Manifest file. 1.1.0 -OpenWhisk wskdebugDebugging and live development tool for OpenWhisk +OpenWhisk Whisk Debug (wskdebug)Debugging and live development tool for OpenWhisk 1.3.0 - - - - -Package Catalog and Composer - - - - -OpenWhisk CatalogPackage catalogs of OpenWhisk, which provides an easy way to enhance your application with useful capabilities, and to access external services in the ecosystem. - - 0.11.0 + +OpenWhisk Client GoOpenWhisk client library in Go. + + 1.2.0 https://www.apache.org/dyn/closer.cgi/openwhisk/openwhisk-catalog-0.11.0-sources.tar.gz;> + href=&q
[openwhisk-client-go] annotated tag 1.2.0 updated (87edc23 -> 06dfe98)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a change to annotated tag 1.2.0 in repository https://gitbox.apache.org/repos/asf/openwhisk-client-go.git. *** WARNING: tag 1.2.0 was modified! *** from 87edc23 (commit) to 06dfe98 (tag) tagging 87edc23647174648fe52939201ebb276e0899f83 (commit) replaces 1.1.0 by Matt Rutkowski on Mon Mar 15 14:12:40 2021 -0500 - Log - OpenWhisk Client Go v1.2.0 -BEGIN PGP SIGNATURE- iQJKBAABCAA0FiEE7Lt91z/GK9yqwC2HOVKCph2I0KwFAmBPsagWHG1ydXRrb3dz a2lAYXBhY2hlLm9yZwAKCRA5UoKmHYjQrKUSD/9ejkMq0rF2ME4LTaC3fblzom7C 1jmyj7NRaaILC8ncstKfIQ1XPHpdMm/IrIklD9Up29xdQftbt3QFGcv+J5XY34BK YWT+QU0j4Zw0IjPYSqik7SdWOfTlPR9ERSH8ke+CicTI3mMBlTEkOrofdIdb149g 6lT/bSZg+nKHcVnqcOZxkEVOTbpMYkUTYV6ThSM7NokfuRxVQoPMCXAS02fOus9X 0RSpTCJCXqO5XLlJn1LhAipy8D/rT3H7S5WKBE5rXna+L8WFoVP5ystTkElqNX0c c0lThk989/n9X2jstkQk8p0Q97PT1YahRy2hTFKtCJEBk++758VvijI4qXCJWJM7 m/JRcG1IEmDHp5kEj+IpNVzKhW8t7s72zJmIgywjV3Keav4mt4/6hjeXcI4bBTRU P5Z3+aAG7V4SUbqDfiNfvVBxVNXFi/h3zOMtQ0vibAl11fe1P686zJLfZLp8wR0A CKJwvFBLVVfJgz0BJQWKg9Sz9Ok8J4qm0PYPD8pjW0arcchIsbkjB3UH0uUFcTUH i+IJHgg7YMTL4Cec/ypvwhu/v2iF7FsHd1V3LUBlN7/n+1/EcbGvusSR3XNh6EYy +NM6HK/vzqPYinhzBnVkpjEzZBEjb9OAEzNM4LehpWLjCMSeTlP1QOIkdMVs5+N0 YnZLBteCZ2KZ14T/+Q== =vV+C -END PGP SIGNATURE- --- No new revisions were added by this update. Summary of changes:
[openwhisk-client-go] annotated tag 1.2.0 updated (87edc23 -> c50c521)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a change to annotated tag 1.2.0 in repository https://gitbox.apache.org/repos/asf/openwhisk-client-go.git. *** WARNING: tag 1.2.0 was modified! *** from 87edc23 (commit) to c50c521 (tag) tagging 87edc23647174648fe52939201ebb276e0899f83 (commit) replaces 1.1.0 by Matt Rutkowski on Mon Mar 15 09:59:56 2021 -0500 - Log - OpenWhisk Client Go v1.2.0 --- No new revisions were added by this update. Summary of changes:
[openwhisk-wskdeploy] branch master updated: configure more github properties via asf.yaml (#1128)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 c2eb32f configure more github properties via asf.yaml (#1128) c2eb32f is described below commit c2eb32f6431636c0525ed84982a517f2145af777 Author: David Grove AuthorDate: Mon Mar 15 10:10:03 2021 -0400 configure more github properties via asf.yaml (#1128) --- .asf.yaml | 42 -- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/.asf.yaml b/.asf.yaml index 96c95f7..1739754 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -19,13 +19,35 @@ github: description: "Apache OpenWhisk utility for deploying and managing OpenWhisk projects and packages" homepage: https://openwhisk.apache.org/ labels: - - apache - - continuous-delivery - - continuous-deployment - - deployment - - faas - - functions - - functions-as-a-service - - openwhisk - - serverless - - serverless-functions +- apache +- continuous-delivery +- continuous-deployment +- deployment +- faas +- functions +- functions-as-a-service +- openwhisk +- serverless +- serverless-functions + protected_branches: +master: + required_status_checks: +strict: false +contexts: + - "Travis CI - Pull Request" + required_pull_request_reviews: +required_appoving_review_count: 1 + required_signatures: false + enabled_merge_buttons: +merge: false +squash: true +rebase: true + features: +issues: true + +notifications: + commits: commits@openwhisk.apache.org + issues_status: iss...@openwhisk.apache.org + issues_comment: iss...@openwhisk.apache.org + pullrequests_status: iss...@openwhisk.apache.org + pullrequests_comment: iss...@openwhisk.apache.org
[openwhisk-release] branch master updated: Refine release manager pre-reqs and instructions (#379)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-release.git The following commit(s) were added to refs/heads/master by this push: new 115c84d Refine release manager pre-reqs and instructions (#379) 115c84d is described below commit 115c84d49a69ac2e0936021984c10aab8dcba17c Author: Matt Rutkowski AuthorDate: Thu Mar 11 17:46:41 2021 -0600 Refine release manager pre-reqs and instructions (#379) * Refine release manager pre-reqs and instructions * Refine release manager pre-reqs and instructions * Refine release manager pre-reqs and instructions * Refine release manager pre-reqs and instructions * Refine release manager pre-reqs and instructions * Refine release manager pre-reqs and instructions * Refine release manager pre-reqs and instructions * Refine release manager pre-reqs and instructions * Add client-go release config * Refine release manager pre-reqs and instructions * Update client-go commit hash in release config * Upload final release config: client-go-1.2.0.json * Fix URL path to specific commit hash --- docs/license_compliance.md | 7 +- docs/release_instructions.md | 404 +++ docs/release_manager_setup.md| 141 release-configs/client-go-1.2.0.json | 15 ++ tools/gen-release-vote.py| 2 +- 5 files changed, 299 insertions(+), 270 deletions(-) diff --git a/docs/license_compliance.md b/docs/license_compliance.md index 12f6e44..8c9f48b 100644 --- a/docs/license_compliance.md +++ b/docs/license_compliance.md @@ -28,10 +28,12 @@ This document describes how the Apache OpenWhisk project's source code and relea ## Policies and rules The Apache OpenWhisk project repositories MUST follow [Apache Release Policy](http://www.apache.org/legal/release-policy.html#licensing). every artifact distributed MUST contain only appropriately licensed code per Apache Licensing Policy. It includes two check points: + - Each project repository MUST provide a LICENSE file and a NOTICE file. - With a few exceptions, source files consisting of works submitted directly to the ASF by the copyright owner or owner's agent must contain the appropriate ASF license header. Here are the exceptions: - + Files without any degree of creativity don't require a license header. - + Sometimes shorter form of ASF license header can be used if the recommended Apache source header is not appropriate. + + - Files without any degree of creativity don't require a license header. + - Sometimes shorter form of ASF license header can be used if the recommended Apache source header is not appropriate. ## Project specific rules @@ -68,7 +70,6 @@ In addition, the recommended type of approved ASF license header (i.e., "full" o - Full ASF License headers are always accepted regardless if a "Mini" header is recommended as best practice. - Action source files used in performance testing may be added to "[Known exclusions](#known-exclusions)" when justified. - ## General Exclusions In accordance with Apache LICENSE policies, the table below lists general exclusions by file (type) as agreed to by the project community along with the justification. diff --git a/docs/release_instructions.md b/docs/release_instructions.md index 2b7a420..42f70e9 100644 --- a/docs/release_instructions.md +++ b/docs/release_instructions.md @@ -21,75 +21,62 @@ ## Release Manager Initial Setup -If you have never served as a Release Manager (or it has been a while -since you have done it), first read the -[Release Manager Setup](release_manager_setup.md) instructions. -We have scripts that automate many of the tasks a Release Manager must -perform, but these scripts assume you have followed the instructions -in the Release Manager Setup before you start executing them. +If you have never served as a Release Manager (or it has been a while since you have done it), first read the [Release Manager Setup](release_manager_setup.md) instructions. + +This repository includes scripts that automate many of the tasks a Release Manager must perform, but these scripts assume you have followed the instructions in the Release Manager Setup before you start executing them. ## Non-PMC Release Managers -Actually publishing a release is an official act of the OpenWhisk -Project Management Committee (PMC). If you are an OpenWhisk Committer, -but not an OpenWhisk PMC member, you will need to pair-up with a PMC member to -accomplish some of the steps. In brief, any step that adds or removes -an artifact from a public distribution channel must be executed by -an OpenWhisk PMC member. +Publishing a release is an official act of the OpenWhisk Project Management Committee (PMC). If
svn commit: r46593 - in /dev/openwhisk/rc1: openwhisk-client-go-1.2.0-sources.tar.gz openwhisk-client-go-1.2.0-sources.tar.gz.asc openwhisk-client-go-1.2.0-sources.tar.gz.sha512
Author: mrutkowski Date: Thu Mar 11 22:41:10 2021 New Revision: 46593 Log: Staging Apache OpenWhisk release candidates from ../release-configs/client-go-1.2.0.json. Added: dev/openwhisk/rc1/openwhisk-client-go-1.2.0-sources.tar.gz (with props) dev/openwhisk/rc1/openwhisk-client-go-1.2.0-sources.tar.gz.asc dev/openwhisk/rc1/openwhisk-client-go-1.2.0-sources.tar.gz.sha512 Added: dev/openwhisk/rc1/openwhisk-client-go-1.2.0-sources.tar.gz == Binary file - no diff available. Propchange: dev/openwhisk/rc1/openwhisk-client-go-1.2.0-sources.tar.gz -- svn:mime-type = application/octet-stream Added: dev/openwhisk/rc1/openwhisk-client-go-1.2.0-sources.tar.gz.asc == --- dev/openwhisk/rc1/openwhisk-client-go-1.2.0-sources.tar.gz.asc (added) +++ dev/openwhisk/rc1/openwhisk-client-go-1.2.0-sources.tar.gz.asc Thu Mar 11 22:41:10 2021 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCAAdFiEE7Lt91z/GK9yqwC2HOVKCph2I0KwFAmBKbvcACgkQOVKCph2I +0KzJcRAAxCSZXiJ+lZcLBppPQVkRLcbyfkUETMhN3STa9jjBWzCU8q51DoMS0J7i +exN2mFKLaDDWOXvUc5UtTbmg+yCIM8QvSg1pXL/+xtAKhTNMVkdClYGafVyTdk/k +/sudQhh8La+CxmGNNsB8AXL415GqWvZXJgkMY38OGffuNkalBWqOUpMTBqSbCyE7 +cD5ZUECrQhoZJQTcH2lyf/uXiPJK7Uclw+yUea/qqFTQva8lf5Hc1tQ1Lut8EdqX +DpOhmhUPHkBGmare6/tPWCzxb6HHggdRWMJnKgcYMGW5Gc5g2rjIVslwHypolNIX +y9Yxaq8ZHXmoFnxde7VisX2PO6ljklcvUzpFMP1ZcIOtT4inBv65Za7/aUopidAv +tKuHtP0bTmUKt5Ix2l3Axe3eE4Omj/5zO7EIiuCn7xUjAUPb/meb0ovBYzNyRCni +GJJKAcWjv+hUxojtnxmtOmhLXRBTl/Fk5YNxn0Ke4sWCsINISwgz4mvOsvLKjaXX +NzLHDR01rFExg0gp1nNbmZJSCHue9oQbmmnaM1hl7OBoQFYPxY0qXbwX4R1l+6dQ +GNITIrGSKde69M86F74z2lUf821V4X8C5mX+eGpOxmnI9DmBixwUeCkk3O1ENO7h +q6uX3AiLlFb+ljAdogN0X8S6rlj3U+D3mrx5WhE94Me+RDmwH/I= +=D6Bq +-END PGP SIGNATURE- Added: dev/openwhisk/rc1/openwhisk-client-go-1.2.0-sources.tar.gz.sha512 == --- dev/openwhisk/rc1/openwhisk-client-go-1.2.0-sources.tar.gz.sha512 (added) +++ dev/openwhisk/rc1/openwhisk-client-go-1.2.0-sources.tar.gz.sha512 Thu Mar 11 22:41:10 2021 @@ -0,0 +1,3 @@ +openwhisk-client-go-1.2.0-sources.tar.gz: +4D7BE653 556CDAF1 1A4BBC09 ED5CE610 AE726AB0 87F57133 804B0486 1BA4AFA3 2CBCA82F + 1B251999 BC85D7E1 2D67521E 7057077B 13FFBA3A ABF8FEC1 D44E8C6D
svn commit: r46588 - /release/openwhisk/KEYS
Author: mrutkowski Date: Thu Mar 11 19:40:45 2021 New Revision: 46588 Log: Add Matt Rutkowski to KEYS file Modified: release/openwhisk/KEYS Modified: release/openwhisk/KEYS == --- release/openwhisk/KEYS (original) +++ release/openwhisk/KEYS Thu Mar 11 19:40:45 2021 @@ -685,3 +685,62 @@ xC2vML7+VP8lp4zKPdvI+3u3rcPagQDlCuTLfQNl oS9/H30J5/Aw8QFtEgeoAA== =KDIH -END PGP PUBLIC KEY BLOCK- +pub rsa4096 2021-03-10 [SC] + ECBB7DD73FC62BDCAAC02D87395282A61D88D0AC +uid [ultimate] Matt Rutkowski +sig 3395282A61D88D0AC 2021-03-10 Matt Rutkowski +sub rsa4096 2021-03-10 [E] +sig 395282A61D88D0AC 2021-03-10 Matt Rutkowski + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBGBJRdQBEADU5ERvePqK1ZpO1Xd3WVx1x6XrvZyvnt4p6wHmS0b/XqASACfW +v2WNkbrqecnhSXS9IOvd6uDzv0pW2n87p8EgNTPBOnxT9U1dxlRDx+topow8WZvl +y2C3ozTLS7EJwNFbRdowqKKeuHSu45XOVQnFN8uSviAg2Nu3btQUGiGIR6a3AjiP +O7jL2CeRBZZiijMmwD6tx2SEVSA/oOikQDk3bqoftAR50FUPK0lHfFYlhkD/j1TC +w0cK2QOQyeJLtLojGtSEPrg0ytZtJ/RzXLY0+HocNOY1LUUecUjnUjWi8poqBsr1 +1JOg8y1Uti1raXBmYdRQx6GicNJF1C3NXByTVgQd3/R62k2BkQQbR92efwkI8CRS +KKMQkSy73eYAWe85+ZvSvSX+3W9qqd8eBZz9RCP9C0PzoZZkuzDkSyq3O7sFTgNr +ZBl5itVBiU25HYDcyiu6xTFzKs8xTb4fgbG+RhnMfh0uP9Tl6vgEuUQmWXkfDZQo +MjXmiZ3uhDpdwFVl5DvgoTmEcrmn2GRtMcZ+zyDjgtd7u78NMtLI5QMWOZ5EPFc1 +7IIoxsv6wlUYCtEFfFUCDQAbmx0hK1jaeR9U0wGpadjwTMxVyVlFay962f6EEoWu +w9UXPKkJu8RBBXCVUUH9EIA7HnqWt9EatySfFx/0Ns2j7ZlsvTMqs3OkWQARAQAB +tCZNYXR0IFJ1dGtvd3NraSA8bXJ1dGtvd3NraUBhcGFjaGUub3JnPokCTgQTAQgA +OBYhBOy7fdc/xivcqsAthzlSgqYdiNCsBQJgSUXUAhsDBQsJCAcCBhUKCQgLAgQW +AgMBAh4BAheAAAoJEDlSgqYdiNCs+0sP/RwyFTQheBnbxFIGsiVXaQhJK37aLEbB +Rnm3/NabzYfaRPy7P8N8No7K0kA35fbAwIV0CiZsi+ktz4BljYw0m49vjsFWBJwI +Jx8fYKQoVZBMviOgRRsV801Eb8KnzIJWEr/FE5dziaIMpDVKntg0WyeS4Wt7FspN +hnOEREvRk94uHsnYB4cANI0LalVQcRcAmhwwVMFSpHd8ArqdHluIqfwAZP7ymE95 +94G9pNgfh2NBzTsDXJoxWpqoiI9aX2f+B81JJM43wuQk1CGFXYBVZbPuOhV3B6ZQ +sNEbklI9J/rNJNQOynwCkNPZukA/C5lSf/jJqNgxh50ys2HH2qE0jgNGH2KaZ3HH +xHn7vXXexCL4n0SEelFi2+DoJ2AODJNyML0wDZdjy63TZgSS3Z4S+JbpQakkDnHE +08Fsvf8TMLLBffLwjnkCHWQWQOhwgdkDHyaMqlrFa30hCXYX1tPxH5DPV7FEwxkP +UehiG8Qfwrjk6qboWCzKaU4Hfj5ld1DEyP/6hD44YLKFBLMBZtGVNUF27TmlXU5Y +VyEwsiw7pMkFMR98cktlDtAmBfKRnzqgrNF7paw9mBBClaxyD8CyvlD9EEA68QBX +O/KCb3N8ugj1sHZb99ltJ13jnxkd1mjuQbMT9dN8QfyKg5S83lw6tVDhn4twHAGq +hSOGwb5em96buQINBGBJRdQBEACu9FyxtRyaRl1cZTHRcxyFpnaG9ds+RCYIDFAv +5bnmtnqHOCu1V6BWcBujasjak4xlVht73UWrcPp9UIa85Ep8cOfSGF7hSwDfRpMA ++NOloSi26jWD8u9WcJOXpyvxQ7DfJNjKhdzHkNGrxp5t1rDVb7dzGHLL62XUV2x8 +9iV4szA5QQHpGIZC2KiZqInxppUPkOljq7UW34hfQ8mNAkvQ8Lou158TkXozhEmZ +t5gNWjdxjZa3woNBf7n++iqPhA8b0n7fb1Y1C83UofV7RzFu/31qTunO1NOfRZIA +MATXDt+qyPv6tSW5irin3o8bivJ1/CxHeoJQg68NW3m11XNNUiAuWwkC8KQivk4e +yBFbGQNM1GEdwrwfZmGucxHo7iyy0q+jRj+AjnPriGb53/mu/p1G5Gj5iqt8ZlC4 +vqTdV8UDBtARRXR9qHIrQIjEPR9VMr4Q2C5Xgdr5Bcqs+3AlR7uQ5yBNB1vYqTFO +kE3su3YTj8YsFvVlJelrmtI2VpduIyM9TzY1tWS267XNx8Zu7I44Mq2yaKjxnPP6 +LhAo+86Vetqo876zRQPwhiTZaqo9Rwl58v+1UFQ9LSeuCBPsklbykmh81tWXN5Lr +L69etmYn2dDcfFQ+p7PShkqixABa3uAYTsojNkmh/kPh/P4YZ3+x1BLufmLNtLeR +8UhpLQARAQABiQI2BBgBCAAgFiEE7Lt91z/GK9yqwC2HOVKCph2I0KwFAmBJRdQC +GwwACgkQOVKCph2I0KybSw/7B7CmaTvJa2wsiw0PU265459QWyDrXb4SmvU7OSJa +o4bkl/gW/87LuCHtDVU7bL76ktc4iXjvZoY7IctWrJ6LGYXJi4fDsWqVeoE+dBqV +9ZOeNxRPDwMqcmYhdTCXpzVUCJwrZEu2P2Vh65VXgGd5h4MvBoJzddPkWDN6Z4s9 +qR45iwdfT3ZG1owHAWfiNl0nlVzA6VLoSJllm0MbRtaQ/oLFQGnZ9rtSTgSTi9T4 +Md+hRgFFHZj6eMaNxsLmWudBQlQIsUNxY08RhdK/6cYZE8ZAcnQNyUVzzPlhGuvs +MUgAIBlwq5aiM24x9PQKG1B9zZB91ToMg1doRHa95oogDrdVgLlXDE4x7r6DcAh8 +Y6ParvSaYvwql3FIQimtA9DW+FwEARk+tqaR7lYFu8uLYrTTDfpmZpS5NxALwS3Z +xzvfMvUwVbUJTLVKPcBEZhI5S5Zf2NyZpUKd7WvMSFm0BEz7KehpOtIe8rptNGfk +eD/0XrPyjprdjh72jKCzoDyIu7+a4Aa6RVHTolfGujV28dqE9UADykQum7oIicnQ +U6MrIB2C/VpxJSp8XW8hQU2rvH/GEmQrHCSmSRVlr7dCWdxFinYzD0v0aqgfptjf +VcxlmXDYV/5UHuFy2jRqAboPJ/nkbJ5bDZfj62IHRwD+hnb8+eZ7kAeQDtESCtd4 +puU= +=4IPK +-END PGP PUBLIC KEY BLOCK-
[openwhisk-client-go] branch master updated: Prep. for 1.2.0 release (#147)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-client-go.git The following commit(s) were added to refs/heads/master by this push: new 87edc23 Prep. for 1.2.0 release (#147) 87edc23 is described below commit 87edc23647174648fe52939201ebb276e0899f83 Author: Matt Rutkowski AuthorDate: Thu Mar 11 12:53:14 2021 -0600 Prep. for 1.2.0 release (#147) --- CHANGELOG.md | 50 -- NOTICE.txt | 2 +- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bdb3f0..78872e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,28 +19,42 @@ # Apache OpenWhisk Client Go +## 1.2.0 + +- Update for travis migration (#140) +- Add omit tag to ErrorResponse.Response field (#121) +- update status code if action returns error (#142) +- Migrate to Go Modules (#143) +- Update docs & provide example code (#144) +- Update testify dep. version and clarify use of go get (#145) +- Update go.mod to use go v1.15 (#146) + ## 1.1.0 - + Add DelAnnotations field to support del annotation (#137) - + Bump up go version to 1.13.14 for travis (#138) - + Add `updated` field on package, rule, and trigger entity (#135) - + Add updated field on Action struct (#129) - + Parse an action's application error (#133) - + Support alt. namespace resource uuid as tenant id to API gateway service (#130) + +- Add DelAnnotations field to support del annotation (#137) +- Bump up go version to 1.13.14 for travis (#138) +- Add `updated` field on package, rule, and trigger entity (#135) +- Add updated field on Action struct (#129) +- Parse an action's application error (#133) +- Support alt. namespace resource uuid as tenant id to API gateway service (#130) ## 1.0.0 - + Handle err return from url.Parse in GetUrlBase (#123) - + Add dynamic column sizing to wsk activation list command (#120) + +- Handle err return from url.Parse in GetUrlBase (#123) +- Add dynamic column sizing to wsk activation list command (#120) ## 0.10.0-incubating - + Added extra columns to activation records summary rows (#116) - + Replace godep with govendor (#113) - + Load X509 cert on client creation (#112) - + Add Concurrency to Limits (#94) - + Fix invalid warning message (#91) - + Allow NewClient to run concurrently (#103) - + Update Go Version (#104) - + Allow additional headers to override auth header val (#100) - + Replace trigger service type with interface (#99) + +- Added extra columns to activation records summary rows (#116) +- Replace godep with govendor (#113) +- Load X509 cert on client creation (#112) +- Add Concurrency to Limits (#94) +- Fix invalid warning message (#91) +- Allow NewClient to run concurrently (#103) +- Update Go Version (#104) +- Allow additional headers to override auth header val (#100) +- Replace trigger service type with interface (#99) ## 0.9.0-incubating - Initial Apache Release + +- Initial Apache Release diff --git a/NOTICE.txt b/NOTICE.txt index bf88710..27342a7 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache OpenWhisk Client Go -Copyright 2016-2020 The Apache Software Foundation +Copyright 2016-2021 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
[openwhisk-client-go] branch master updated: Update go.mod to use go v1.15 (#146)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-client-go.git The following commit(s) were added to refs/heads/master by this push: new 5cd1006 Update go.mod to use go v1.15 (#146) 5cd1006 is described below commit 5cd1006dc35f7f431b958f5cfb7fd288e5364fe0 Author: Matt Rutkowski AuthorDate: Mon Mar 8 10:10:59 2021 -0600 Update go.mod to use go v1.15 (#146) --- README.md | 2 +- go.mod| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 92a53e1..3254655 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ or simply build just the whisk commands: $ go build -v ./whisk ``` -> **Note**: There is no `main` function in this project as the `./whish` packages are treated together as a client library. +> **Note**: There is no `main` function in this project as the `./whisk` packages are treated together as a client library. ### Testing using `go test` diff --git a/go.mod b/go.mod index 867db3c..0491f2d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/apache/openwhisk-client-go -go 1.14 +go 1.15 require ( github.com/BurntSushi/toml v0.3.1 // indirect
[openwhisk-client-go] branch master updated: Update testify dep. version and clarify use of go get (#145)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-client-go.git The following commit(s) were added to refs/heads/master by this push: new 08fe785 Update testify dep. version and clarify use of go get (#145) 08fe785 is described below commit 08fe785b89789c02227139ad1bdbd15afe18af0a Author: Matt Rutkowski AuthorDate: Mon Mar 8 08:06:36 2021 -0600 Update testify dep. version and clarify use of go get (#145) --- README.md | 31 +-- go.mod| 4 +++- go.sum| 11 +++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 83e6627..92a53e1 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ $ go build -v ./whisk Open a terminal, change into the project directory and use the following command to run the unit tests: -``` +```sh $ go test -v ./... -tags=unit ``` @@ -177,7 +177,7 @@ func main() { } ``` -Then run it with the go tool: +Then run it with the `go` tool: ``` $ cd example @@ -218,3 +218,30 @@ If the openWhisk service is available and your configuration is correct, you sho > Be sure to [Sync your > fork](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork) > before starting any contributions to keep it up-to-date with the upstream > repository. +### Adding new dependencies + +Please use `go get` to add new dependencies to the `go.mod` file: + +```sh +go get -u github.com/project/libname@v1.2.0 +``` + +> Please avoid using commit hashes for referencing non-OpenWhisk libraries. + +### Updating dependency versions + +Although you might be tempted to edit the go.mod file directly, please use the recommended method of using the `go get` command: + +```sh +go get -u github.com/project/libname # Using "latest" version +go get -u github.com/project/libname@v1.1.0 # Using tagged version +go get -u github.com/project/libname@aee5cab1c # Using a commit hash +``` + +### Updating Go version + +Although you could edit the version directly in the go.mod file, it is better to use the `go edit` command: + +```sh +go mod edit -go=1.15 +``` diff --git a/go.mod b/go.mod index cbbbd42..867db3c 100644 --- a/go.mod +++ b/go.mod @@ -13,5 +13,7 @@ require ( github.com/onsi/ginkgo v1.15.0 // indirect github.com/onsi/gomega v1.10.5 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/stretchr/testify v1.3.1-0.20190109162356-363ebb24d041 + github.com/stretchr/objx v0.3.0 // indirect + github.com/stretchr/testify v1.6.1 + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect ) diff --git a/go.sum b/go.sum index d1c04f6..25fcb1b 100644 --- a/go.sum +++ b/go.sum @@ -3,6 +3,7 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuijfIjZyjZaHq9xDUh0tNitwXshJpbLkqMOJv4H3do= github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= @@ -48,9 +49,15 @@ github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/9 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= +github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.3.1-0.20190109162356-363ebb24d041 h1:/8BeG8ppzttbNYq43j+0izFSyhj3rXBQIQQTju6WC/I= github.com/stretchr/testify v1.3.1-0.20190109162356-363ebb24d041/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= +github.com/stretchr/
[openwhisk-wskdeploy] branch master updated: Update openwhisk-client-go to release 1.1.0 as well as other pkg dependencies (#1124)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 f4f94e7 Update openwhisk-client-go to release 1.1.0 as well as other pkg dependencies (#1124) f4f94e7 is described below commit f4f94e757f094905d3a324634f7dbcc0bddefc72 Author: Matt Rutkowski AuthorDate: Fri Mar 5 15:33:02 2021 -0600 Update openwhisk-client-go to release 1.1.0 as well as other pkg dependencies (#1124) * Update openwhisk-client-go to release 1.1.0 as well as other pkg dependencies * Update go-colorable to v1.10 * Update go-querystring, go-prettyjson to latest * Update magiconair/properties, pelletier/go-toml, spf13/viper and its deps. * Update go-18n to latest 1.x version, Do not adopt 2.0 in this PR * Update goi18n to 1.10.1, ginkgo to 1.15.0, cobra to 1.1.3 * Update testify to 1.7.1 and tidy up * Update DEPENDENCIES.md file --- DEPENDENCIES.md | 10 +- README.md | 61 + go.mod | 43 +++ go.sum | 387 ++-- 4 files changed, 408 insertions(+), 93 deletions(-) diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md index c2c5de4..6140b6a 100644 --- a/DEPENDENCIES.md +++ b/DEPENDENCIES.md @@ -19,18 +19,16 @@ # Library dependencies for openwhisk-wskdeploy tool -Like other open source projects, openwhisk-wskdeploy is dependent on open source libraries, we -list them here to assure that all code dependencies have Apache 2.0 compatible licenses. +Like other open source projects, openwhisk-wskdeploy is dependent on open source libraries. The full list of direct dependencies is viewable in the Go module [go.mod](go.mod) file. Of those dependencies, some have Apache 2.0 compatible licenses which we make note of here: | Library name | Licenses Type | License/Project Link | | --| -- | -- | -| jibber_jabber | Apache 2.0 | https://github.com/cloudfoundry-attic/jibber_jabber | -| color | MIT | https://github.com/fatih/color | - +| jibber_jabber | Apache 2.0 | [https://github.com/cloudfoundry-attic/jibber_jabber/blob/master/LICENSE](https://github.com/cloudfoundry-attic/jibber_jabber/blob/master/LICENSE) | +| color | MIT | [https://github.com/fatih/color/blob/master/LICENSE.md](https://github.com/fatih/color/blob/master/LICENSE.md) | # Library dependencies for unit and integration testing | Library name | Licenses Type | License/Project Link | | --| -- | -- | -| Testify | ad-hoc (Liberal)| [https://github.com/stretchr/testify/blob/master/LICENCE.txt](https://github.com/stretchr/testify/blob/master/LICENCE.txt) | +| Testify | MIT | [https://github.com/stretchr/testify/blob/master/LICENSE](https://github.com/stretchr/testify/blob/master/LICENSE) | | Viper | MIT | [https://github.com/spf13/viper/blob/master/LICENSE](https://github.com/spf13/viper/blob/master/LICENSE) | diff --git a/README.md b/README.md index 4a11439..d3e6577 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,7 @@ Here are some quick links to help you get started: ## Downloading released binaries Executable binaries of `wskdeploy` are available for download on the project's GitHub [releases](https://github.com/apache/openwhisk-wskdeploy/releases) page: + - [https://github.com/apache/openwhisk-wskdeploy/releases](https://github.com/apache/openwhisk-wskdeploy/releases). We currently provide binaries for the following Operating Systems (OS) and architecture combinations: @@ -220,7 +221,6 @@ gradle -version > **Note** If using your own local Gradle installation, use the `gradle` > command instead of the `./gradlew` command in the build instructions below. - Building for internationalization Please follow this process for building any changes to translatable strings: @@ -273,6 +273,25 @@ $ go run main.go -m tests/usecases/triggerrule/manifest.yml -d tests/usecases/tr > Be sure to [Sync your > fork](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork) > before starting any contributions to keep it up-to-date with the upstream > repository. +### Running unit tests + +You may use `go test` to test all unit tests within a package, for example: + +```sh +go test ./deployers -tags=unit -v +go test ./parsers -tags=unit -v +``` + +or to run individual function tests, for example: + +```sh +go test ./parsers -tags=unit -v -run TestParseManifestForSingleLineParams +``` + +### Running integration tests + +Integration tests are best left to the Travis CI build as they depend on a fully functional OpenWhisk environment to be deployed. + ### Adding new dependencies Please use `go get` to add new dependencies to the `go.mod` file: @@ -295,22 +314,10 @@ go mod tidy
[openwhisk-cli] branch master updated: Update Gradle/Wrapper to latest version (#497)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git The following commit(s) were added to refs/heads/master by this push: new 2d98247 Update Gradle/Wrapper to latest version (#497) 2d98247 is described below commit 2d9824708ba7bd43ca49584d6dee071ef276a653 Author: Matt Rutkowski AuthorDate: Wed Mar 3 14:00:41 2021 -0600 Update Gradle/Wrapper to latest version (#497) * Update Gradle/Wrapper to latest version * Update gradle wrapper to version 6.8.3 * add ASF license header to generated gradle-wrapper.properties file * Update README to reflect current gradlew version supported * Update README to reflect current gradlew version supported * Update README to reflect current gradlew version supported --- README.md| 6 +++-- gradle/wrapper/gradle-wrapper.jar| Bin 52818 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 39 ++- gradlew.bat | 29 +++ 5 files changed, 32 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index a6e9c5f..4b116a4 100644 --- a/README.md +++ b/README.md @@ -192,7 +192,7 @@ The project includes its own packaged version of Gradle called Gradle Wrapper wh Using your own local Gradle to build -Alternatively, you can choose to [Install Gradle](https://gradle.org/install/) and use it instead of the project's Gradle Wrapper. If so, you would use the `gradle` command instead of `gradlew`. If you do elect to use your own Gradle, verify its version is `6.6` or higher: +Alternatively, you can choose to [Install Gradle](https://gradle.org/install/) and use it instead of the project's Gradle Wrapper. If so, you would use the `gradle` command instead of `gradlew`. If you do elect to use your own Gradle, verify its version is `6.8.1` or higher: ```sh gradle -version @@ -209,6 +209,8 @@ $ go get -u github.com/jteeuwen/go-bindata/... $ go-bindata -pkg wski18n -o wski18n/i18n_resources.go wski18n/resources ``` +> **Note**: the `go-bindata` package will automatically be installed if the `go build` command is used in the project as it is listed in the `go.mod` dependency file. + ### Running unit tests # Using Go @@ -296,7 +298,7 @@ go get github.com/project/libname Using a release tag: ```sah -go get github.com/project/libname +go get github.com/project/libname@1.1.0 ``` Using a commit hash: diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index deedc7f..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1aabd6..61a258f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -16,6 +16,6 @@ # distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-6.6-all.zip diff --git a/gradlew b/gradlew index d4ee78f..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -44,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -125,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mi
[openwhisk-wskdeploy] branch master updated: Upgrade Gradle/Wrapper to latest version (#1123)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 07217e2 Upgrade Gradle/Wrapper to latest version (#1123) 07217e2 is described below commit 07217e22168154d2496b4b741cf25ab840b4cf83 Author: Matt Rutkowski AuthorDate: Wed Mar 3 13:34:15 2021 -0600 Upgrade Gradle/Wrapper to latest version (#1123) * Upgrade Gradle/Wrapper to latest version * Upgrade Gradle/Wrapper to latest version * Update gradle wrapper to version 6.8.3 * add ASF license header to generated gradle-wrapper.properties file * Update README to reflect current gradlew version supported --- README.md| 4 ++-- build.gradle | 5 gradle/wrapper/gradle-wrapper.jar| Bin 53557 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 2 +- gradlew | 39 ++- gradlew.bat | 29 +++ 6 files changed, 35 insertions(+), 44 deletions(-) diff --git a/README.md b/README.md index 9ca2247..4a11439 100644 --- a/README.md +++ b/README.md @@ -212,7 +212,7 @@ The project includes its own packaged version of Gradle called Gradle Wrapper wh Using your own local Gradle to build -Alternatively, you can choose to [Install Gradle](https://gradle.org/install/) and use it instead of the project's Gradle Wrapper. If so, you would use the `gradle` command instead of `gradlew`. If you do elect to use your own Gradle, verify its version is `5.5.1` or higher: +Alternatively, you can choose to [Install Gradle](https://gradle.org/install/) and use it instead of the project's Gradle Wrapper. If so, you would use the `gradle` command instead of `gradlew`. If you do elect to use your own Gradle, verify its version is `6.8.1` or higher: ```sh gradle -version @@ -304,7 +304,7 @@ go get github.com/project/libname Using a release tag: ```sah -go get github.com/project/libname +go get github.com/project/libname@1.1.0 ``` Using a commit hash: diff --git a/build.gradle b/build.gradle index d2200b8..4c9ce40 100644 --- a/build.gradle +++ b/build.gradle @@ -44,6 +44,11 @@ golang { // into a "/vendor" directory and use them to build the project (which will fail) installDependencies.enabled = false resolveBuildDependencies.enabled = false +resolveTestDependencies.enabled = false + +// Disable "go vet" and "gofmt" as gogradle uses deprecated syntax +goVet.enabled = false +gofmt.enabled = false // File exclusions for the Apache Rat scanning tool rat { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e42b368..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d475d27..61a258f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -16,6 +16,6 @@ # distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip diff --git a/gradlew b/gradlew index d4ee78f..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -7,7 +7,7 @@ # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# https://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, @@ -44,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -125,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch pat
[openwhisk-client-go] branch master updated: chore: update docs & provide example code (#144)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-client-go.git The following commit(s) were added to refs/heads/master by this push: new cc53c35 chore: update docs & provide example code (#144) cc53c35 is described below commit cc53c351d9eb501ba8c3f9fefa57485210e43f0e Author: Sameer Bihari AuthorDate: Tue Mar 2 18:19:04 2021 -0500 chore: update docs & provide example code (#144) Co-authored-by: Sameer Bihari <> --- README.md | 78 +++-- example/example_list_actions.go | 50 ++ 2 files changed, 109 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index af9d261..83e6627 100644 --- a/README.md +++ b/README.md @@ -88,7 +88,10 @@ available for you to run this library. We use a configuration file called _wskprop_ to specify all the parameters necessary for this Go client library to access the OpenWhisk services. Make sure you create or edit the file _~/.wskprops_, and add the mandatory parameters APIHOST, APIVERSION, NAMESPACE and AUTH. -- The parameter `APIHOST` is the OpenWhisk API hostname (for example, openwhisk.ng.bluemix.net, 172.17.0.1, and so on). +- The parameter `APIHOST` is the OpenWhisk API hostname. +- If you are using a local [quick start standalone](https://github.com/apache/openwhisk#quick-start), OpenWhisk services APIHOST will look like `http://localhost:3233` +- If you are using IBM cloud functions as your provider, APIHOST will look like `.functions.cloud.ibm.com` where region can be `us-east`, `us-south` or any additional [regions](https://cloud.ibm.com/docs/openwhisk?topic=openwhisk-cloudfunctions_regions) + - The parameter `APIVERSION` is the version of OpenWhisk API to be used to access the OpenWhisk resources. - The parameter `NAMESPACE` is the OpenWhisk namespace used to specify the OpenWhisk resources about to be accessed. - The parameter `AUTH` is the authentication key used to authenticate the incoming requests to the OpenWhisk services. @@ -101,23 +104,23 @@ For more information regarding the REST API of OpenWhisk, please refer to [OpenW import "github.com/apache/openwhisk-client-go/whisk" ``` -Construct a new whisk client, then use various services to access different parts of the whisk api. For example to get the `hello` action: +Construct a new whisk client, then use various services to access different parts of the whisk api. For example to get the `hello` package actions: ```go client, _ := whisk.NewClient(http.DefaultClient, nil) -action, resp, err := client.Actions.List("hello") +actions, resp, err := client.Actions.List("hello", nil) ``` -Some API methods have optional parameters that can be passed. For example, to list the first 30 actions, after the 30th action: +Some API methods have optional parameters that can be passed. For example, to list the first 10 actions of the `hello` package: ```go client, _ := whisk.NewClient(http.DefaultClient, nil) options := { - Limit: 30, - Skip: 30, + Limit: 10, + Skip: 0, } -actions, resp, err := client.Actions.List(options) +actions, resp, err := client.Actions.List("hello", options) ``` By default, this Go client library is automatically configured by the configuration file _wskprop_. The parameters of APIHOST, APIVERSION, @@ -127,22 +130,25 @@ In addition, it can also be configured by passing in a `*whisk.Config` object as ```go config := { - Host: "openwhisk.ng.bluemix.net", - Version: "v1" - Namespace: "_", - AuthKey: "a-b-c-d-e" + Host: "", + Version: "", + Namespace: "", + AuthToken: "", } client, err := whisk.Newclient(http.DefaultClient, config) ``` ### Example -You need to have an OpenWhisk service accessible, to run the following example. +You need to have an OpenWhisk service accessible, to run the following [example](https://github.com/apache/openwhisk-client-go/blob/master/example/example_list_actions.go). ```go +package main + import ( + "os" + "fmt" "net/http" - "net/url" "github.com/apache/openwhisk-client-go/whisk" ) @@ -155,26 +161,60 @@ func main() { } options := { -Limit: 30, -Skip: 30, +Limit: 10, +Skip: 0, } - actions, resp, err := client.Actions.List(options) + actions, resp, err := client.Actions.List("", options) if err != nil { fmt.Println(err) os.Exit(-1) } fmt.Println("Returned with status: ", resp.Status) - fmt.Println("Returned actions: \n%+v", actions) + fmt.Printf("Returned actions: \n%+v", actions) } ``` -Then build it with the go tool: +Then run it with the go
[openwhisk-cli] branch master updated: Remove last Godeps, update Gogradle for gomod and Ansible setup (#496)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git The following commit(s) were added to refs/heads/master by this push: new 9cbb032 Remove last Godeps, update Gogradle for gomod and Ansible setup (#496) 9cbb032 is described below commit 9cbb032885b4225e6c802fec041bd91e57a5e7f7 Author: Matt Rutkowski AuthorDate: Tue Mar 2 12:09:25 2021 -0600 Remove last Godeps, update Gogradle for gomod and Ansible setup (#496) * Remove last Godeps, update Gogradle for gomod and Ansible setup * Remove last Godeps, update Gogradle for gomod and Ansible setup * Add dependson clause to build i18n (i18n_resources.go) before the goBuild task * Update build.gradle to use Exec tasks for go-bindata and i18n * Update build.gradle to use Exec tasks for go-bindata and i18n * Task goGetBinData for i18n support must run as a deps. of goPrepare not goBuild * Cleanup build.gradle; remove old tasks * Fix golint command * Fix golint command * Fix golint command * Use latest go.mod * Use latest go.mod * Use latest go.mod * Remove goVet and gofmt tasks as they use older go conventions * Remove goVet and gofmt tasks as they use older go conventions * Remove failing localhost/SDK scala tests * Try some regex fixes for scala SDK tests * Fix regex for SDK scala tests; Remove govendor from README * Revamp README to reflect current Go mod and Gradle build instructions * Revamp README to reflect current Go mod and Gradle build instructions * Revamp README to reflect current Go mod and Gradle build instructions * Revamp README to reflect current Go mod and Gradle build instructions --- .gitignore | 13 +- .travis.yml| 2 +- Godeps/Godeps.json | 154 -- Godeps/Readme | 5 - README.md | 330 ++--- build.gradle | 107 +++ go.mod | 14 +- go.sum | 32 +- .../src/test/scala/system/basic/WskSdkTests.scala | 6 +- tools/travis/test_openwhisk.sh | 8 +- 10 files changed, 337 insertions(+), 334 deletions(-) diff --git a/.gitignore b/.gitignore index 1128fb1..b831ede 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,14 @@ -javascript/ + +# Built or generated files +openwhisk-cli wsk wsk.exe scripts -Godeps/_workspace +Godeps/ *~ # IDE-related exclusions +/.vscode/ .idea/ *.iml @@ -20,3 +23,9 @@ wski18n/i18n_resources.go bin/ tests/build/ tests/out/ + +# Scala +/.metals/ + +# Misc +javascript/ diff --git a/.travis.yml b/.travis.yml index 6bf7b01..bf6a223 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,7 +52,7 @@ install: before_script: - cd $TRAVIS_BUILD_DIR - ./gradlew --console=plain checkScalafmtAll - - GO_FILES=$(find . -iname '*.go' -type f | grep -v /vendor/) + - GO_FILES=$(find . -iname '*.go' -type f) - test -z "$(gofmt -s -l $(echo $GO_FILES))" - cd $TRAVIS_BUILD_DIR/.. - git clone https://github.com/apache/openwhisk-utilities.git diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json deleted file mode 100644 index 6996cb9..000 --- a/Godeps/Godeps.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "ImportPath": "github.com/apache/openwhisk-cli", - "GoVersion": "go1.14", - "GodepVersion": "v80", - "Deps": [ - { - "ImportPath": "github.com/apache/openwhisk-client-go/whisk", - "Comment": "1.1.0-3-g17d5563", - "Rev": "17d556327cd39cb6d6854667fa75c35ef9f2e6f1" - }, - { - "ImportPath": "github.com/apache/openwhisk-client-go/wski18n", - "Comment": "1.1.0-3-g17d5563", - "Rev": "17d556327cd39cb6d6854667fa75c35ef9f2e6f1" - }, - { - "ImportPath": "github.com/apache/openwhisk-wskdeploy/cmd", - "Comment": "latest-4-g3b4b09d", - "Rev": "3b4b09d539d2591c903acbb7b9257beef49110dd" - }, - { - "ImportPath": "github.com/apache/openwhisk-wskdeploy/conductor", - "Com
[openwhisk-wskdeploy] branch master updated: Streamline README for Gradle and cross-architecture builds & upgrade gogradle plugin (#1122)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 c867379 Streamline README for Gradle and cross-architecture builds & upgrade gogradle plugin (#1122) c867379 is described below commit c86737994d80d1b5bf1e9890a600375c12b39f2c Author: Matt Rutkowski AuthorDate: Mon Mar 1 19:03:44 2021 -0600 Streamline README for Gradle and cross-architecture builds & upgrade gogradle plugin (#1122) * Fix parameter names for inmline type tests * Update gogradle and improve docs * Streamline the README instructions and provide better description of archs. * Streamline the README instructions and provide better description of archs. * Streamline the README instructions and provide better description of archs. * Streamline the README instructions and provide better description of archs. * Streamline the README instructions and provide better description of archs. * Streamline the README instructions and provide better description of archs. * Streamline the README instructions and provide better description of archs. * Streamline the README instructions and provide better description of archs. --- .gitignore | 1 + README.md | 89 ++--- build.gradle| 4 +- parsers/manifest_parser_test.go | 2 +- 4 files changed, 61 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index 50384bf..b2b8683 100644 --- a/.gitignore +++ b/.gitignore @@ -41,6 +41,7 @@ Packages/ # Gradle .gradle +.gogradle build/ #emacs diff --git a/README.md b/README.md index 392a737..9ca2247 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![Build Status](https://travis-ci.com/apache/openwhisk-wskdeploy.svg?branch=master)](https://travis-ci.com/apache/openwhisk-wskdeploy) -`wskdeploy` is a utility to help you describe and deploy any part of the OpenWhisk programming model using a Manifest file written in YAML. Use it to deploy all your OpenWhisk [Packages](https://github.com/apache/openwhisk/blob/master/docs/packages.md), [Actions](https://github.com/apache/openwhisk/blob/master/docs/actions.md), [Triggers, and Rules](https://github.com/apache/openwhisk/blob/master/docs/triggers_rules.md) using a single command! +`wskdeploy` is a utility to help you describe and deploy any part of the OpenWhisk programming model using a YAML manifest file. Use it to deploy all of your OpenWhisk project's [Packages](https://github.com/apache/openwhisk/blob/master/docs/packages.md), [Actions](https://github.com/apache/openwhisk/blob/master/docs/actions.md), [Triggers, and Rules](https://github.com/apache/openwhisk/blob/master/docs/triggers_rules.md), together, using a single command! Running `wskdeploy` standalone @@ -61,15 +61,20 @@ Here are some quick links to help you get started: ## Downloading released binaries -Binaries of `wskdeploy` are available for download on the project's GitHub release page: +Executable binaries of `wskdeploy` are available for download on the project's GitHub [releases](https://github.com/apache/openwhisk-wskdeploy/releases) page: - [https://github.com/apache/openwhisk-wskdeploy/releases](https://github.com/apache/openwhisk-wskdeploy/releases). -For each release, we typically provide binaries built for Linux, Mac OS (Darwin) and Windows on the AMD64 architecture. However, we provide instructions on how to build your own binaries as well from source code with the Go tool. See [Building the project](#building-the-project). +We currently provide binaries for the following Operating Systems (OS) and architecture combinations: -_If you are a Developer or Contributor, **we recommend building from the latest source code** from the project's master branch._ +Operating System | Architectures +--- | --- +Linux | 386, AMD64, ARM, ARM64, PPC64 (Power), S/390 and IBM Z +Mac OS (Darwin) | 386[1](#1), AMD64 +Windows | 386, AMD64 -for end-users, please use versioned releases of binaries. -- [https://github.com/apache/openwhisk-wskdeploy/releases](https://github.com/apache/openwhisk-wskdeploy/releases) +1. Mac OS, 32-bit (386) released versions are not available for builds using Go lang version 1.15 and greater. + +We also provide instructions on how to build your own binaries from source code. See [Building the project](#building-the-project). --- @@ -107,7 +112,7 @@ if you just want to build the code and do not intend to be a Contributor, you ca git clone g...@github.com:apache/openwhisk-wskdeploy ``` -or you can specify a rele
[openwhisk-client-go] branch master updated: Migrate to Go Modules (#143)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-client-go.git The following commit(s) were added to refs/heads/master by this push: new 9c1b901 Migrate to Go Modules (#143) 9c1b901 is described below commit 9c1b9014e7850042a69fe6ddc3104b78a0d195bf Author: Matt Rutkowski AuthorDate: Tue Feb 23 15:49:57 2021 -0600 Migrate to Go Modules (#143) * Migrate to Go Modules * Migrate to Go Modules * Migrate to Go Modules * Migrate to Go Modules * Migrate to Go Modules * update README for go mod * Apply sugg. changes from Rodric * Apply sugg. changes from Rodric * Apply sugg. changes from Rodric --- .travis.yml | 5 +-- README.md| 84 ++- go.mod | 17 go.sum | 109 +++ vendor/vendor.json | 25 whisk/action.go | 3 +- whisk/client.go | 1 + whisk/client_test.go | 5 ++- 8 files changed, 184 insertions(+), 65 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9642a5..6eb4e5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: include: - os: linux sudo: required - go: "1.13.14" + go: "1.15" services: docker dist: xenial @@ -37,9 +37,8 @@ notifications: before_install: - cd $TRAVIS_BUILD_DIR - - GO_FILES=$(find . -iname '*.go' -type f | grep -v /vendor/) + - GO_FILES=$(find . -iname '*.go' -type f) - test -z "$(gofmt -s -l $(echo $GO_FILES))" - #- pip install --upgrade pip setuptools - pip install --user --upgrade pip setuptools - ./tools/travis/setup.sh diff --git a/README.md b/README.md index 451992a..af9d261 100644 --- a/README.md +++ b/README.md @@ -21,55 +21,81 @@ [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![Build Status](https://travis-ci.com/apache/openwhisk-client-go.svg?branch=master)](https://travis-ci.com/apache/openwhisk-client-go) -This project `openwhisk-client-go` is a Go client library to access Openwhisk API. +This project `openwhisk-client-go` is a Go client library to access the Openwhisk API. +--- + +## Building the project ### Prerequisites -You need to install the following package in order to run this Go client library: -- [Go](https://golang.org/doc/install) -- [govendor](https://github.com/kardianos/govendor) +The Openwhisk Go Client library requires you to [Download and install GoLang](https://golang.org/dl/) onto your local machine. + +> **Note** Go version 1.15 or higher is recommended Make sure you select the package that fits your local environment, and [set the GOPATH environment variable](https://github.com/golang/go/wiki/SettingGOPATH). +### Download the source code from GitHub + +As the code is managed using GitHub, it is easiest to retrieve the code using the `git clone` command. + +If you just want to build the code and do not intend to be a Contributor, you can clone the latest code from the Apache repository: + +```sh +git clone g...@github.com:apache/openwhisk-client-go +``` + +You can also specify a release (tag), if you do not want the latest code, by using the `--branch ` flag. For example, you can clone the source code for the tagged 1.1.0 [release](https://github.com/apache/openwhisk-client-go/releases) + +```sh +git clone --branch 1.1.0 g...@github.com:apache/openwhisk-client-go +``` + +You can also pull the code from a fork of the repository. If you intend to become a Contributor to the project, read the section [Contributing to the project](#contributing-to-the-project) below on how to setup a fork. + +### Building using `go build` -### Installation +Change into the cloned project directory and use the following command to build all packages: -After you download the source code either from the Github or the release page of OpenWhisk, you should have a directory named -_openwhisk-client-go_ to host all the source code. Please copy this root directory _openwhisk-client-go_ -into the directory $GOPATH/src/github.com/apache. +```sh +$ go build -v ./... +``` + +or simply build just the whisk commands: + +```sh +$ go build -v ./whisk +``` +> **Note**: There is no `main` function in this project as the `./whish` packages are treated together as a client library. -### Test +### Testing using `go test` -Open a terminal, and run the following commands to run the unit tests: +Open a terminal, change into the project directory and use the following command to run the unit tests: ``` -$ cd $GOPATH/src/github.com/apache/openwhisk-client-go -$ govendor sync $ go test -v ./... -tags=unit ``` -You should see all the un
[openwhisk-wskdeploy] branch master updated: Rust 1.34 support (#1119)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 3169ed7 Rust 1.34 support (#1119) 3169ed7 is described below commit 3169ed7218b58819a5dcf3e1010a04e810567a06 Author: Daniel Hartig AuthorDate: Mon Feb 22 10:19:04 2021 -0600 Rust 1.34 support (#1119) * Verified working wskdeploy with rust * Added unit tests * Working tests; rs file extension still does not work * Added headers to files and removed un-needed Cargo source files * Merge resolution Co-authored-by: Daniel Hartig --- runtimes/runtimes.go | 24 ++- specification/html/spec_actions.md | 6 +++ tests/src/integration/runtimetests/manifest.yaml | 18 + .../integration/runtimetests/src/helloCargo.zip| Bin 0 -> 746 bytes tests/src/integration/runtimetests/src/lib.rs | 44 + 5 files changed, 90 insertions(+), 2 deletions(-) diff --git a/runtimes/runtimes.go b/runtimes/runtimes.go index 76e083e..db1bea9 100644 --- a/runtimes/runtimes.go +++ b/runtimes/runtimes.go @@ -43,8 +43,8 @@ const ( PHP_FILE_EXTENSION = "php" ZIP_FILE_EXTENSION = "zip" RUBY_FILE_EXTENSION = "rb" - RUST_FILE_EXTENSION = "rs" GO_FILE_EXTENSION = "go" + RUST_FILE_EXTENSION = "rs" NODEJS_RUNTIME = "nodejs" SWIFT_RUNTIME = SWIFT_FILE_EXTENSION PYTHON_RUNTIME = "python" @@ -52,8 +52,8 @@ const ( DOTNET_RUNTIME = ZIP_FILE_EXTENSION PHP_RUNTIME = PHP_FILE_EXTENSION RUBY_RUNTIME= "ruby" - RUST_RUNTIME= "rust" GO_RUNTIME = GO_FILE_EXTENSION + RUST_RUNTIME= "rust" HTTP_CONTENT_TYPE_KEY = "Content-Type" HTTP_CONTENT_TYPE_VALUE = "application/json; charset=UTF-8" RUNTIME_NOT_SPECIFIED = "NOT SPECIFIED" @@ -214,6 +214,8 @@ func FileExtensionRuntimes(op OpenWhiskInfo) (ext map[string]string) { } else if strings.Contains(k, DOTNET_RUNTIME) { ext[CSHARP_FILE_EXTENSION] = k ext[ZIP_FILE_EXTENSION] = k + } else if strings.Contains(k, RUST_RUNTIME) { + ext[RUST_FILE_EXTENSION] = k } } return @@ -243,6 +245,8 @@ func FileRuntimeExtensions(op OpenWhiskInfo) (rte map[string]string) { rte[v[i].Kind] = GO_FILE_EXTENSION } else if strings.Contains(k, DOTNET_RUNTIME) { rte[v[i].Kind] = CSHARP_FILE_EXTENSION + } else if strings.Contains(k, RUST_RUNTIME) { + rte[v[i].Kind] = RUST_FILE_EXTENSION } } } @@ -503,6 +507,22 @@ var RUNTIME_DETAILS = []byte(`{ "attachmentType": "text/plain" } } +], +"rust": [ +{ +"kind": "rust:1.34", +"default": true, +"deprecated": false, +"attached": { +"attachmentName": "codefile", +"attachmentType": "text/plain" +}, +"image": { +"prefix": "openwhisk", +"name": "actionloop-rust-v1.34", +"tag": "latest" +} +} ] }, "blackboxes": [ diff --git a/specification/html/spec_actions.md b/specification/html/spec_actions.md index 56920c6..6995348 100644 --- a/specification/html/spec_actions.md +++ b/specification/html/spec_actions.md @@ -168,6 +168,7 @@ The following runtime values are currently supported by the OpenWhisk platform " | swift@3.1.1 **(deprecated)** | swift:3.1.1 | [openwhisk/action-swift-v3.1.1](https://hub.docker.com/r/openwhisk/action-swift-v3.1.1) | nightly | Swift 3.1.1 language runtime | | dotnet dotnet@2.2 (default) | dotnet:2.2 | [openwhisk/action-dotnet-v2.2](https://hub.docker.com/r/openwhisk/action-dotnet-v2.2) | nightly | .NET Core 2.2 runtime | | dotnet@3.1 | dotnet:3.1 | [openwhisk/action-dotnet-v3.1](https://hub.docker.com/r/openwhisk/action-dotnet-v3.1) | nightly | .NET Core
[openwhisk-wskdeploy] branch master updated: remove ansible files from local in favor of core's version (#1113)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 e747876 remove ansible files from local in favor of core's version (#1113) e747876 is described below commit e747876d67d8ce0e7fb88897badb1a27e6e4ccae Author: Matt Rutkowski AuthorDate: Thu Feb 11 09:43:49 2021 -0600 remove ansible files from local in favor of core's version (#1113) * remove ansible file from local in favor of core's version * remove ansible file from local in favor of core's version --- ansible/environments/local/group_vars/all | 53 --- ansible/environments/local/hosts | 44 - 2 files changed, 97 deletions(-) diff --git a/ansible/environments/local/group_vars/all b/ansible/environments/local/group_vars/all deleted file mode 100644 index 86918c5..000 --- a/ansible/environments/local/group_vars/all +++ /dev/null @@ -1,53 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -whisk_version_name: local -config_root_dir: /tmp/wskconf -whisk_logs_dir: /tmp/wsklogs -docker_registry: "" -docker_dns: "" - -db_prefix: whisk_local_ - -# Auto lookup to find the db credentials -db_provider: "{{ lookup('ini', 'db_provider section=db_creds file={{ playbook_dir }}/db_local.ini') }}" -db_username: "{{ lookup('ini', 'db_username section=db_creds file={{ playbook_dir }}/db_local.ini') }}" -db_password: "{{ lookup('ini', 'db_password section=db_creds file={{ playbook_dir }}/db_local.ini') }}" -db_protocol: "{{ lookup('ini', 'db_protocol section=db_creds file={{ playbook_dir }}/db_local.ini') }}" -db_host: "{{ lookup('ini', 'db_host section=db_creds file={{ playbook_dir }}/db_local.ini') }}" -db_port: "{{ lookup('ini', 'db_port section=db_creds file={{ playbook_dir }}/db_local.ini') }}" - -# API GW connection configuration -apigw_auth_user: "" -apigw_auth_pwd: "" -apigw_host_v2: "http://{{ groups['apigateway']|first }}:{{apigateway.port.api}}/v2" - -controller_arguments: '-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.port=1098' -invoker_arguments: "{{ controller_arguments }}" - -invoker_allow_multiple_instances: true - -# Set kafka topic retention -kafka_heap: '512m' -kafka_topics_completed_retentionBytes: 104857600 -kafka_topics_completed_retentionMS: 30 -kafka_topics_health_retentionBytes: 104857600 -kafka_topics_health_retentionMS: 30 -kafka_topics_invoker_retentionBytes: 104857600 -kafka_topics_invoker_retentionMS: 30 - -env_hosts_dir: "{{ playbook_dir }}/environments/local" diff --git a/ansible/environments/local/hosts b/ansible/environments/local/hosts deleted file mode 100644 index 7b0fe4d..000 --- a/ansible/environments/local/hosts +++ /dev/null @@ -1,44 +0,0 @@ -; -; Licensed to the Apache Software Foundation (ASF) under one or more contributor -; license agreements. See the NOTICE file distributed with this work for additional -; information regarding copyright ownership. The ASF licenses this file to you -; under the Apache License, Version 2.0 (the # "License"); you may not use this -; file except in compliance with the License. You may obtain a copy of the License -; at: -; -; http://www.apache.org/licenses/LICENSE-2.0 -; -; Unless required by applicable law or agreed to in writing, software distributed -; under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -; CONDITIONS OF ANY KIND, either express or implied. See the License for the -; specific language governing permissions and limitations under the License. -; -; the first parameter in a host is the inventory_hostname - -; used for local actions only -ansible ansible_connection=local - -[edge] -172.17.0.1 ansible_host=172.17.0.1 ansible_connection=local - -[controllers] -controller0 ansibl
[openwhisk-wskdeploy] branch master updated: Generate hosts script (#1112)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 b5c1bd4 Generate hosts script (#1112) b5c1bd4 is described below commit b5c1bd49de63531d992c3aeab47c705fb88c1755 Author: Dominic Kim AuthorDate: Thu Feb 11 00:27:09 2021 +0900 Generate hosts script (#1112) * Generate hosts script * Change the go version --- tests/src/integration/helloworld/manifest.yaml | 2 +- tools/travis/script.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/src/integration/helloworld/manifest.yaml b/tests/src/integration/helloworld/manifest.yaml index 3a65418..4451de1 100644 --- a/tests/src/integration/helloworld/manifest.yaml +++ b/tests/src/integration/helloworld/manifest.yaml @@ -178,7 +178,7 @@ packages: msg["greeting"] = "Hello, " + name + "!" return msg } - runtime: go:1.11 + runtime: go:1.15 sequences: # sequence of helloworld in all four runtimes hello-world-series: diff --git a/tools/travis/script.sh b/tools/travis/script.sh index af2c353..12d534b 100755 --- a/tools/travis/script.sh +++ b/tools/travis/script.sh @@ -44,7 +44,7 @@ WHISKDIR="$HOMEDIR/openwhisk" cd $WHISKDIR ./tools/travis/setup.sh -ANSIBLE_CMD="ansible-playbook -i ${ROOTDIR}/ansible/environments/local -e docker_image_prefix=openwhisk -e docker_image_tag=nightly" +ANSIBLE_CMD="ansible-playbook -i ${WHISKDIR}/ansible/environments/local -e docker_image_prefix=openwhisk -e docker_image_tag=nightly" cd $WHISKDIR/ansible $ANSIBLE_CMD setup.yml
[openwhisk-wskdeploy] branch master updated: migration from travis-ci.org to travis-ci.com (#1108)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 a881c28 migration from travis-ci.org to travis-ci.com (#1108) a881c28 is described below commit a881c280ee122907caccc04d0623ff6ec491aefd Author: David Grove AuthorDate: Mon Feb 8 16:51:29 2021 -0500 migration from travis-ci.org to travis-ci.com (#1108) As the build problem is not with this token change (but is a runtime deprecation issue)AND this change should not be convoluted with other commits IMO. I am merging this and will open a separate issue/PR to address the go:1.11 -> go:1.15 change. --- .travis.yml | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 391c717..3444ab7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,7 +34,7 @@ notifications: webhooks: urls: # travis2slack webhook to enable DMs on openwhisk-team.slack.com to PR authors with TravisCI results - secure: "gfROHzycfSxU85pp/jscreWed1bABKlBa1w+fBH40mZDIYI9Dhgbnq1lqpkBLz51RasPsCmKvZP8j3gm5NunRJWwPeMk0ZmwPuBzVCiOdEr7r/SOr4hQM6CJjLuQWVg8gIR1ZeIQhIc+oHc8KGPDBJdSPo9b89QNCyVXNL47/M9KAKUn2ilwTdHaezlwGnT3yiTvhvYEQhwaXLxHHIfCtlQjPg+d8Ch93xYRCvqfKu4g3owr1bbZZE5AERH7dkKzq5HtzYAxr3M1UZLfSwiQfktnq4cGWrw9XxXCmENTm6HDKCLc7pcOvLZF5NqpItRd4Od1kma5lPKfR1qK8+SjyohpWqakhrJlnBe5x68zXyyq4Y48yuNuGXqVkdQ1faUF1gY0cE6KvsfFLYUvRXUmPZNYYd1xMaouUM6fiVRSyM/liuR8zK750umNRdgNNTlmYXQNJwg/YlF155hqIblf7Idf2Sg6A [...] + secure: "NaDCtHwbFUEy0h0u/QrAt395o0/9FstJ5/Tv4uBSLCBdaUNU+0q6/RXVH76dKbujoxrLded2gyeJSAbI4kl4SM7FyilSHzKTikF0VsgM3G5veh65tVY5ztsvl40hDmK2E/PmWI3HkZNeWJO32WjraqPmhSWL0BZOWhA/4gJSCIsLnNRQXmpZoDqC7V8IG1BWYGwd5qcNkEjItLjYCUy1s2K8bj3QmhshYRVLTNbXxh0yJVKjM04I+bWhMXqvL8GS55qeicJ3fUwm5g1PDVCtzxLwAHCPo2jusjtNSnV+BaZgMBSahv3MD7ApxfF58e1buejggH3qZAhNGccC4bYJCahqVv/KKoA10kO6exH5iGwlHPWQTjMuF++PHmAk+FeQ1jh+JoUSBnIHExPnaD4CQIArHvUuQom+WJBnOz+L1H755VyPGzeDQ+ZUDlhOiQ6CDP/sqaRH3Wmo4IzhsqTsLaQs0dS1Y [...] before_install: - "./tools/travis/cloneutils.sh" diff --git a/README.md b/README.md index 6c391d2..47c1e1f 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ # Whisk Deploy `wskdeploy` [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) -[![Build Status](https://travis-ci.org/apache/openwhisk-wskdeploy.svg?branch=master)](https://travis-ci.org/apache/openwhisk-wskdeploy) +[![Build Status](https://travis-ci.com/apache/openwhisk-wskdeploy.svg?branch=master)](https://travis-ci.com/apache/openwhisk-wskdeploy) `wskdeploy` is a utility to help you describe and deploy any part of the OpenWhisk programming model using a Manifest file written in YAML. Use it to deploy all your OpenWhisk [Packages](https://github.com/apache/openwhisk/blob/master/docs/packages.md), [Actions](https://github.com/apache/openwhisk/blob/master/docs/actions.md), [Triggers, and Rules](https://github.com/apache/openwhisk/blob/master/docs/triggers_rules.md) using a single command!
[openwhisk] branch master updated (fb3220c -> ed3f76e)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk.git. from fb3220c fix: add new Windows docker.exe location (#4991) add ed3f76e Switch from hardcoded "https" protocol (#4990) No new revisions were added by this update. Summary of changes: core/routemgmt/common/apigw-utils.js | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-)
[openwhisk-website] branch master updated: Updated references around Node.js runtimes (#443)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-website.git The following commit(s) were added to refs/heads/master by this push: new 2d566a4 Updated references around Node.js runtimes (#443) 2d566a4 is described below commit 2d566a46045b9185198600659687929139f281ec Author: Raghuveer Raavi AuthorDate: Thu Sep 3 18:04:36 2020 -0400 Updated references around Node.js runtimes (#443) * Updated references around Node.js runtimes * Update _layouts/documentation.html Co-authored-by: David Grove * Fixed references to all broken links Co-authored-by: Raghuveer Raavi Co-authored-by: David Grove --- README.md | 2 +- _layouts/community.html | 13 ++--- _layouts/documentation.html | 16 +++ events.md | 112 ++-- 4 files changed, 72 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index d0d8990..b4d56d8 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Apache OpenWhisk is a cloud-first distributed event-based programming service. I ### Install Prerequisites -- Download and install Node.js (recommend v10 LTS): see [https://nodejs.org/](https://nodejs.org/) +- Download and install Node.js (recommend v12 LTS): see [https://nodejs.org/](https://nodejs.org/) - Download and install NPM (recommend v6.14 latest): see [https://www.npmjs.com/package/npm](https://www.npmjs.com/package/npm) - Download and install Ruby (recommend v2.7 stable): see [https://www.ruby-lang.org/en/documentation/installation/](https://www.ruby-lang.org/en/documentation/installation/) diff --git a/_layouts/community.html b/_layouts/community.html index 798f178..f87ea72 100644 --- a/_layouts/community.html +++ b/_layouts/community.html @@ -85,7 +85,7 @@ layout: default - https://www.mashape.com/; target="_blank"> + https://konghq.com; target="_blank"> @@ -113,13 +113,14 @@ layout: default alt="Nepente supports Apache OpenWhisk"> --> - + + https://nimbella.com/; target="_blank"> Project Wiki - The project maintains a https://cwiki.apache.org/confluence/display/OPENWHISK/OpenWhisk+Project+Wiki;>Confluence Wiki site that provides the community a place to share their thoughts about and collaborate around any aspect of the project; whether it's about the platform architecture, an existing or planned feature or about its use cases and integrations. Examples include: + The project maintains a https://cwiki.apache.org/confluence/display/OPENWHISK/Apache+OpenWhisk+Project+Wiki;>Confluence Wiki site that provides the community a place to share their thoughts about and collaborate around any aspect of the project; whether it's about the platform architecture, an existing or planned feature or about its use cases and integrations. Examples include: - https://cwiki.apache.org/confluence/display/OPENWHISK/Apache+OpenWhisk+Project+Wiki#ApacheOpenWhiskProjectWiki-how-to-contribute;>How to contribute? - https://cwiki.apache.org/confluence/display/OPENWHISK/Apache+OpenWhisk+Project+Wiki#ApacheOpenWhiskProjectWiki-becoming-a-contributor;>How do I become a Contributor or Committer? +How to contribute? +How do I become a Contributor or Committer? https://cwiki.apache.org/confluence/display/OPENWHISK/Proposals;>Proposals (Design) https://cwiki.apache.org/confluence/display/OPENWHISK/Presentations%2C+Meeting+Notes+and+Transcripts;>Meeting Notes and Transcripts https://cwiki.apache.org/confluence/display/OPENWHISK/Processes;>Processes diff --git a/_layouts/documentation.html b/_layouts/documentation.html index 848a6b1..e17dc07 100644 --- a/_layouts/documentation.html +++ b/_layouts/documentation.html @@ -207,7 +207,7 @@ layout: default https://github.com/apache/openwhisk-runtime-dotnet#readme;>.Net - OpenWhisk runtime for .Net Core 2.2 https://github.com/apache/openwhisk-runtime-go#readme;>Go - OpenWhisk runtime for Go https://github.com/apache/openwhisk-runtime-java#readme;>Java - OpenWhisk runtime for Java 8 (OpenJDK 8, JVM OpenJ9) - https://github.com/apache/openwhisk-runtime-nodejs#readme;>JavaScript - OpenWhisk runtime for Node.js v6, v8 and v10 + https://github.com/apache/openwhisk-runtime-nodejs#readme;>JavaScript - OpenWhisk runtime for Node
[openwhisk-wskdeploy] branch master updated: Upgraded Go 1.15 (#1105)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 535f5a9 Upgraded Go 1.15 (#1105) 535f5a9 is described below commit 535f5a9d39421a4ce0ebe73d724cd7439a0630d0 Author: huydoan2 AuthorDate: Thu Aug 27 14:55:56 2020 -0500 Upgraded Go 1.15 (#1105) * Upgraded Go 1.15 * Used rune to help convert integer to string Co-authored-by: Huy Doan --- .travis.yml | 158 parsers/manifest_parser_test.go | 12 +-- utils/managedannotations.go | 2 +- 3 files changed, 86 insertions(+), 86 deletions(-) diff --git a/.travis.yml b/.travis.yml index 032e715..391c717 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: include: - os: linux sudo: required - go: "1.14" + go: "1.15" services: docker dist: xenial @@ -37,96 +37,96 @@ notifications: secure: "gfROHzycfSxU85pp/jscreWed1bABKlBa1w+fBH40mZDIYI9Dhgbnq1lqpkBLz51RasPsCmKvZP8j3gm5NunRJWwPeMk0ZmwPuBzVCiOdEr7r/SOr4hQM6CJjLuQWVg8gIR1ZeIQhIc+oHc8KGPDBJdSPo9b89QNCyVXNL47/M9KAKUn2ilwTdHaezlwGnT3yiTvhvYEQhwaXLxHHIfCtlQjPg+d8Ch93xYRCvqfKu4g3owr1bbZZE5AERH7dkKzq5HtzYAxr3M1UZLfSwiQfktnq4cGWrw9XxXCmENTm6HDKCLc7pcOvLZF5NqpItRd4Od1kma5lPKfR1qK8+SjyohpWqakhrJlnBe5x68zXyyq4Y48yuNuGXqVkdQ1faUF1gY0cE6KvsfFLYUvRXUmPZNYYd1xMaouUM6fiVRSyM/liuR8zK750umNRdgNNTlmYXQNJwg/YlF155hqIblf7Idf2Sg6A [...] before_install: -- "./tools/travis/cloneutils.sh" + - "./tools/travis/cloneutils.sh" install: -- export DEPLOY_BUILD_READY=false -- go get -u golang.org/x/lint/golint -- go get -u github.com/stretchr/testify -- go get -u github.com/tools/godep + - export DEPLOY_BUILD_READY=false + - go get -u golang.org/x/lint/golint + - go get -u github.com/stretchr/testify + - go get -u github.com/tools/godep before_script: -- GO_FILES=$(find . -iname '*.go' -type f -not -path "./wski18n/i18n_resources.go") -- export BAD_GO=$(gofmt -s -l $(echo $GO_FILES)) -- echo "["$BAD_GO"]" + - GO_FILES=$(find . -iname '*.go' -type f -not -path "./wski18n/i18n_resources.go") + - export BAD_GO=$(gofmt -s -l $(echo $GO_FILES)) + - echo "["$BAD_GO"]" #- test -z "$BAD_GO" #- test -z "$(gofmt -s -l $(echo $GO_FILES))" script: -- echo $TRAVIS -- echo $TRAVIS_PULL_REQUEST -- echo $TRAVIS_SECURE_ENV_VARS -- printenv -- "./tools/travis/script.sh" + - echo $TRAVIS + - echo $TRAVIS_PULL_REQUEST + - echo $TRAVIS_SECURE_ENV_VARS + - printenv + - "./tools/travis/script.sh" after_success: -- DEPLOY_BUILD_READY=true -- if [ "$TRAVIS_EVENT_TYPE" == "cron" ] ; then + - DEPLOY_BUILD_READY=true + - if [ "$TRAVIS_EVENT_TYPE" == "cron" ] ; then export DEPLOY_BUILD_READY=false; - fi +fi after_script: -- make clean + - make clean before_deploy: -- export build_file_name=wskdeploy -- go get github.com/inconshreveable/mousetrap -- export GIT_TAG="latest" -- export TAG=false -- if [ ! -z "$TRAVIS_TAG" ] ; then - export GIT_TAG=$TRAVIS_TAG; - export TAG=true; - fi -- ./gradlew --console=plain releaseBinaries -PpackageVersion=$GIT_TAG -PgitCommit=$(git rev-parse HEAD) -PbuildDate=$(date -u +"%Y-%m-%dT%H:%M:%SZ") -- "./tools/travis/build_tag_releases.sh $build_file_name $GIT_TAG" -- export RELEASE_PKG_FILE="$(cd "$TRAVIS_BUILD_DIR/release" && ls ${zip_file_name}-*.tgz ${zip_file_name}-*.zip)" -- echo "Deploying $RELEASE_PKG_FILE to GitHub releases." -- if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_EVENT_TYPE" == "push" ] && [ "$TRAVIS_OS_NAME" == "linux" ] ; then - git config --global user.email "bui...@travis-ci.com"; - git config --global user.name "Travis CI"; - git tag -d $GIT_TAG; - git push -q https://$api_...@github.com/apache/openwhisk-wskdeploy :refs/tags/$GIT_TAG; - GIT_COMMITTER_DATE="$(git show --format=%aD | head -1)" git tag $GIT_TAG -a -m "Generated tag from Travis CI build $TRAVIS_BUILD_NUMBER"; - git push -f -q https://$api_...@github.com/apache/openwhisk-wskdeploy $GIT_TAG; - fi -- echo "TRAVIS_EVENT_TYPE is " -- echo $TRAVIS_EVENT_TYPE -- echo "GIT_TAG is " -- echo $GIT_TAG + - export build_file_name=wskdeploy + - go get github.com/inconshreveable/mousetrap + - export GIT_TAG="latest" + - export TAG=false + - if [ ! -z "$TRAVIS_TAG" ] ; then +export GIT_TAG=$TRAVIS_TAG; +export TAG=true; +fi + - ./gradlew --console=plain releaseBinaries
[openwhisk-cli] branch master updated: Migrated to using go mod to manage dependencies (#489)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git The following commit(s) were added to refs/heads/master by this push: new 53cb108 Migrated to using go mod to manage dependencies (#489) 53cb108 is described below commit 53cb1084ebc540200a63af5fff42e927deac4253 Author: huydoan2 AuthorDate: Tue Aug 25 11:07:23 2020 -0500 Migrated to using go mod to manage dependencies (#489) * Migrated to using go mod to manage dependencies * Upgrade travis to go 1.15 Co-authored-by: Huy Doan --- .travis.yml | 24 +- Godeps/Godeps.json | 154 + Godeps/Readme| 5 + go.mod | 25 ++ go.sum | 100 ++ gradle/wrapper/gradle-wrapper.properties | 2 +- vendor/vendor.json | 553 --- 7 files changed, 297 insertions(+), 566 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17c592c..971eeff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: include: - os: linux sudo: required - go: "1.9.3" + go: "1.15" services: docker dist: xenial @@ -66,7 +66,7 @@ script: - cd $TRAVIS_BUILD_DIR - export BUILD_VERSION="latest" - if [ ! -z "$TRAVIS_TAG" ] ; then -export BUILD_VERSION=$TRAVIS_TAG; +export BUILD_VERSION=$TRAVIS_TAG; fi - ./gradlew --console=plain releaseBinaries -PpackageVersion=$BUILD_VERSION - ./tools/travis/test_openwhisk.sh $BUILD_VERSION @@ -74,7 +74,7 @@ script: after_success: - export DEPLOY_BUILD_READY=true - if [ "$TRAVIS_EVENT_TYPE" == "cron" ] ; then - export DEPLOY_BUILD_READY=false; +export DEPLOY_BUILD_READY=false; fi before_deploy: @@ -83,18 +83,18 @@ before_deploy: - export GIT_TAG="latest" - export TAG=false; - if [ ! -z "$TRAVIS_TAG" ] ; then - export GIT_TAG=$TRAVIS_TAG; - export TAG=true; +export GIT_TAG=$TRAVIS_TAG; +export TAG=true; fi # This tag is automatically generated for the latest merged commit in master branch. - if [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_EVENT_TYPE" == "push" ] && [ "$TRAVIS_OS_NAME" == "linux" ] ; then - git config --global user.email "bui...@travis-ci.com"; - git config --global user.name "Travis CI"; - export GIT_TAG="latest"; - git tag -d $GIT_TAG; - git push -q https://$api_...@github.com/apache/openwhisk-cli :refs/tags/$GIT_TAG; - GIT_COMMITTER_DATE="$(git show --format=%aD | head -1)" git tag $GIT_TAG -a -m "Generated tag from Travis CI build $TRAVIS_BUILD_NUMBER"; - git push -f -q https://$api_...@github.com/apache/openwhisk-cli $GIT_TAG; +git config --global user.email "bui...@travis-ci.com"; +git config --global user.name "Travis CI"; +export GIT_TAG="latest"; +git tag -d $GIT_TAG; +git push -q https://$api_...@github.com/apache/openwhisk-cli :refs/tags/$GIT_TAG; +GIT_COMMITTER_DATE="$(git show --format=%aD | head -1)" git tag $GIT_TAG -a -m "Generated tag from Travis CI build $TRAVIS_BUILD_NUMBER"; +git push -f -q https://$api_...@github.com/apache/openwhisk-cli $GIT_TAG; fi - echo "The GIT_TAG of this Travis build is $GIT_TAG." diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json new file mode 100644 index 000..d28be41 --- /dev/null +++ b/Godeps/Godeps.json @@ -0,0 +1,154 @@ +{ + "ImportPath": "github.com/apache/openwhisk-cli", + "GoVersion": "go1.14", + "GodepVersion": "v80", + "Deps": [ + { + "ImportPath": "github.com/apache/openwhisk-client-go/whisk", + "Comment": "1.0.0-1-gee5b870", + "Rev": "ee5b8709787cd37201c42e38040e9709f6d1e9c8" + }, + { + "ImportPath": "github.com/apache/openwhisk-client-go/wski18n", + "Comment": "1.0.0-1-gee5b870", + "Rev": "ee5b8709787cd37201c42e38040e9709f6d1e9c8" + }, + { + "ImportPath": "github.com/apache/openwhisk-wskdeploy/cmd", + "Comment": "latest-4-g3b4b09d", + "Rev": "3b4b09d539d2591c903acbb7b9257beef49110dd"
[openwhisk-wskdeploy] branch master updated: Added interpolation to docker option in manifest.yaml (#1100)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 1979827 Added interpolation to docker option in manifest.yaml (#1100) 1979827 is described below commit 19798274025c54b11329df940c13f2726af5694b Author: huydoan2 AuthorDate: Fri Aug 21 12:51:31 2020 -0500 Added interpolation to docker option in manifest.yaml (#1100) * Added interpolation to docker option in manifest.yaml * Migrate to using Go Module. Upgraded Go version to 1.14 alongside with other packages. Modified unit tests to accomodate changes. * Upgraded Travis Go version to 1.14 * Added End-of-Line to a test data file * Fixed test manifest.yml for integration test. Applied golint and sanitized code * Added example for docker interpolation in manifest.yaml Co-authored-by: Huy Doan --- docs/wskdeploy_interpolation.md| 3 ++ parsers/manifest_parser.go | 5 ++- parsers/manifest_parser_test.go| 9 - .../manifest_data_compose_actions_for_docker.yaml | 44 +++--- 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/docs/wskdeploy_interpolation.md b/docs/wskdeploy_interpolation.md index 57f5d19..b067c6a 100644 --- a/docs/wskdeploy_interpolation.md +++ b/docs/wskdeploy_interpolation.md @@ -76,6 +76,9 @@ project: function: ${OPENWHISK_FUNCTION_PYTHON}.py hello4: function: https://${OPENWHISK_FUNCTION_GITHUB_DIR}.js function: github.com/apache/openwhisk-test/packages/helloworlds +hello5: +function: $OPENWHISK_FUNCTION_FILE +docker: $DOCKER_HUB_IMAGE ``` Trigger Feed diff --git a/parsers/manifest_parser.go b/parsers/manifest_parser.go index beff9cc..bf5ad9f 100644 --- a/parsers/manifest_parser.go +++ b/parsers/manifest_parser.go @@ -29,6 +29,8 @@ import ( "gopkg.in/yaml.v2" + "net/url" + "github.com/apache/openwhisk-client-go/whisk" "github.com/apache/openwhisk-wskdeploy/conductor" "github.com/apache/openwhisk-wskdeploy/dependencies" @@ -40,7 +42,6 @@ import ( "github.com/apache/openwhisk-wskdeploy/wski18n" "github.com/apache/openwhisk-wskdeploy/wskprint" yamlHelper "github.com/ghodss/yaml" - "net/url" ) const ( @@ -796,7 +797,7 @@ func (dm *YAMLParser) composeActionExec(manifestFilePath string, manifestFileNam if action.Native { exec.Image = NATIVE_DOCKER_IMAGE } else { - exec.Image = action.Docker + exec.Image = wskenv.InterpolateStringWithEnvVar(action.Docker).(string) } } diff --git a/parsers/manifest_parser_test.go b/parsers/manifest_parser_test.go index 3782360..5068a45 100644 --- a/parsers/manifest_parser_test.go +++ b/parsers/manifest_parser_test.go @@ -928,7 +928,7 @@ func TestComposeActionsForFunctionWithRemoteDir(t *testing.T) { // validate manifest_parser.ComposeActions() method func TestComposeActionsForDocker(t *testing.T) { - + os.Setenv("image_name", "environmental_variable/image") file := "../tests/dat/manifest_data_compose_actions_for_docker.yaml" actionFile := "../tests/src/integration/docker/actions/exec.zip" @@ -960,8 +960,15 @@ func TestComposeActionsForDocker(t *testing.T) { assert.NotNil(t, action.Action.Exec.Code, TEST_MSG_ACTION_CODE_MISSING) assert.Equal(t, runtimes.BLACKBOX, action.Action.Exec.Kind, fmt.Sprintf(TEST_MSG_ACTION_DOCKER_KIND_MISMATCH, action.Action.Exec.Kind)) assert.Equal(t, "mydockerhub/myimage", action.Action.Exec.Image, TEST_MSG_ACTION_DOCKER_IMAGE_MISMATCH) + case "CustomDockerAction6": + println(action.Action.Exec.Image) + assert.NotNil(t, action.Action.Exec.Code, TEST_MSG_ACTION_CODE_MISSING) + assert.Equal(t, runtimes.BLACKBOX, action.Action.Exec.Kind, fmt.Sprintf(TEST_MSG_ACTION_DOCKER_KIND_MISMATCH, action.Action.Exec.Kind)) + assert.Equal(t, os.Getenv("image_name"), action.Action.Exec.Image, TEST_MSG_ACTION_DOCKER_IMAGE_MISMATCH) } } + + os.Unsetenv("image_name") } func TestComposeActionsForEnvVariableInFunction(t *testing.T) { diff --git a/tests/dat/manifest_data_compose_actions_for_docker.yaml b/tests/dat/manifest_data_compose_actions_for_docker.yaml index 8bb10c1..
[openwhisk-wskdeploy] branch master updated: Migrate to using Go Module to manage dependencies (#1101)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 507665d Migrate to using Go Module to manage dependencies (#1101) 507665d is described below commit 507665dcdc83fca178ff23551a814bf93f356ef8 Author: huydoan2 AuthorDate: Tue Aug 18 12:46:18 2020 -0500 Migrate to using Go Module to manage dependencies (#1101) * Migrate to using Go Module. Upgraded Go version to 1.14 alongside with other packages. Modified unit tests to accomodate changes. * Upgraded Travis Go version to 1.14 * Added End-of-Line to a test data file * Fixed test manifest.yml for integration test. Applied golint and sanitized code Co-authored-by: Huy Doan --- .travis.yml| 2 +- go.mod | 31 ++ go.sum | 115 + parsers/deploy_parser_test.go | 7 +- parsers/manifest_parser.go | 4 +- parsers/manifest_parser_test.go| 18 ++-- .../manifest_data_compose_actions_for_limits.yaml | 1 - tests/src/integration/webaction/manifest.yml | 6 +- utils/misc.go | 2 +- webaction/webaction.go | 84 +++ wskderrors/wskdeployerror.go | 3 +- wski18n/i18n_ids.go| 6 +- wski18n/i18n_resources.go | 34 +++--- 13 files changed, 227 insertions(+), 86 deletions(-) diff --git a/.travis.yml b/.travis.yml index 593c0f9..032e715 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ matrix: include: - os: linux sudo: required - go: "1.9.3" + go: "1.14" services: docker dist: xenial diff --git a/go.mod b/go.mod new file mode 100644 index 000..9b497f5 --- /dev/null +++ b/go.mod @@ -0,0 +1,31 @@ +module github.com/apache/openwhisk-wskdeploy + +go 1.14 + +require ( + github.com/apache/openwhisk-client-go v0.0.0-20191018191012-ee5b8709787c + github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 + github.com/fatih/color v1.5.0 + github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 + github.com/google/go-querystring v0.0.0-20160401233042-9235644dd9e5 // indirect + github.com/hashicorp/hcl v0.0.0-2016110927-973f376f0e7c // indirect + github.com/hokaccha/go-prettyjson v0.0.0-20141201065330-f75235bd99da + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/magiconair/properties v1.7.1-0.20160908093658-0723e352fa35 // indirect + github.com/mattn/go-colorable v0.0.7 + github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mitchellh/mapstructure v0.0.0-20161020161836-f3009df150da // indirect + github.com/nicksnyder/go-i18n v1.6.1-0.20161107021609-991e81cc94f6 + github.com/onsi/ginkgo v1.14.0 // indirect + github.com/pelletier/go-buffruneio v0.1.0 // indirect + github.com/pelletier/go-toml v0.3.6-0.20160920070715-45932ad32dfd // indirect + github.com/spf13/afero v0.0.0-20161109000953-06b7e5f50606 // indirect + github.com/spf13/cast v0.0.0-20160926084249-2580bc98dc0e // indirect + github.com/spf13/cobra v0.0.0-20161026012826-6e91dded25d7 + github.com/spf13/jwalterweatherman v0.0.0-20160311093646-33c24e77fb80 // indirect + github.com/spf13/pflag v0.0.0-20161024131444-5ccb023bc27d // indirect + github.com/spf13/viper v0.0.0-20161029213352-651d9d916abc + github.com/stretchr/testify v1.6.1 + golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed // indirect + gopkg.in/yaml.v2 v2.3.0 +) diff --git a/go.sum b/go.sum new file mode 100644 index 000..6dcd296 --- /dev/null +++ b/go.sum @@ -0,0 +1,115 @@ +github.com/apache/openwhisk-client-go v0.0.0-20191018191012-ee5b8709787c h1:HJim5LeEgcbd4ONmGTwX+ocW0iHK0ohGT3dz3tA0k9o= +github.com/apache/openwhisk-client-go v0.0.0-20191018191012-ee5b8709787c/go.mod h1:jLLKYP7+1+LFlIJW1n9U1gqeveLM1HIwa4ZHNOFxjPw= +github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21 h1:tuijfIjZyjZaHq9xDUh0tNitwXshJpbLkqMOJv4H3do= +github.com/cloudfoundry/jibber_jabber v0.0.0-20151120183258-bcc4c8345a21/go.mod h1:po7NpZ/QiTKzBKyrsEAxwnTamCoh8uDk/egRpQ7siIc= +github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/fatih/color v1.5.0 h1:vBh+kQp8lg9XPr56u1CPrWjFXtdphMoGWVHr9/1c+A0= +github.com/fatih/color v1.5.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fsnotify/fsnoti
[openwhisk-website] branch master updated: Add documentation about wsk deploy subcommand (#436)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-website.git The following commit(s) were added to refs/heads/master by this push: new aaf2b44 Add documentation about wsk deploy subcommand (#436) aaf2b44 is described below commit aaf2b44a68bb82de7f697c6eb7c627555c66e384 Author: Ellen Wyllie AuthorDate: Wed Jun 24 13:50:40 2020 -0500 Add documentation about wsk deploy subcommand (#436) --- _layouts/documentation.html | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/_layouts/documentation.html b/_layouts/documentation.html index 42c4cbf..6b02d58 100644 --- a/_layouts/documentation.html +++ b/_layouts/documentation.html @@ -286,7 +286,7 @@ layout: default Multiple actions, even implemented in different languages, may be composed together to create a longer processing pipeline called a https://github.com/apache/openwhisk/blob/master/docs/actions.md#creating-action-sequences;>sequence. - Sequence can be treated as a single action in terms of it creation + A sequence can be treated as a single action in terms of it's creation and invocation. @@ -669,6 +669,13 @@ $ wsk list -v and APIs using a single command using an application manifest. + + The functionality of wskdeploy is also embedded as a subcommand + of wsk in the CLI. You can use the wsk deploy + subcommand or follow the instructions below on installing the + wskdeploy utility. + + Installing Download and Install the wskdeploy utility for Linux, Mac or Windows.
[openwhisk-website] branch master updated: Fix typos in Actions documentation (#435)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-website.git The following commit(s) were added to refs/heads/master by this push: new 4d20c42 Fix typos in Actions documentation (#435) 4d20c42 is described below commit 4d20c4286669e31053913041a720246f25c1bc78 Author: Ellen Wyllie AuthorDate: Thu Jun 18 17:58:19 2020 -0500 Fix typos in Actions documentation (#435) --- _layouts/documentation.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/documentation.html b/_layouts/documentation.html index eb0293a..42c4cbf 100644 --- a/_layouts/documentation.html +++ b/_layouts/documentation.html @@ -234,8 +234,8 @@ layout: default Actions This section will answer some of the essential questions about - OpenWhisk Actions relative to the to the programming model. - If you want to more detailed information, + OpenWhisk Actions relative to the programming model. + If you want more detailed information, please read the project documentation on https://github.com/apache/openwhisk/blob/master/docs/actions.md#openwhisk-actions;> OpenWhisk Actions.
[openwhisk-runtime-nodejs] branch master updated: updating the package.json path (#174)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-nodejs.git The following commit(s) were added to refs/heads/master by this push: new f3aaa44 updating the package.json path (#174) f3aaa44 is described below commit f3aaa44856732455ddb138a7c18f424f1fc298ed Author: Priti Desai AuthorDate: Thu Jun 18 07:33:28 2020 -0700 updating the package.json path (#174) --- core/nodejs10Action/knative/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/nodejs10Action/knative/Dockerfile b/core/nodejs10Action/knative/Dockerfile index 2769c43..2453c2b 100644 --- a/core/nodejs10Action/knative/Dockerfile +++ b/core/nodejs10Action/knative/Dockerfile @@ -30,7 +30,7 @@ COPY ./core/nodejsActionBase/platform/*.js ./platform/ COPY . . # COPY the package.json to root container, so we can install npm packages a level up from user's packages, # so user's packages take precedence -COPY ./core/nodejs10Action/package.json / +COPY ./core/nodejsActionBase/package.json / RUN cd / && npm install --no-package-lock \ && npm cache clean --force EXPOSE 8080
[openwhisk-wskdeploy] branch master updated: doc: spec_apis.md basePath, relativePath (#1096)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 26308ca doc: spec_apis.md basePath, relativePath (#1096) 26308ca is described below commit 26308cad60c96335c57dd02b27ffc49692e9edeb Author: Steven R. Loomis AuthorDate: Tue May 26 06:01:53 2020 -0700 doc: spec_apis.md basePath, relativePath (#1096) Update spec to say that basePath and relativePath must NOT start with `/` Fixes: https://github.com/apache/openwhisk-wskdeploy/issues/1095 --- specification/html/spec_apis.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/html/spec_apis.md b/specification/html/spec_apis.md index b26d02c..df59fa7 100644 --- a/specification/html/spec_apis.md +++ b/specification/html/spec_apis.md @@ -99,8 +99,8 @@ packages: ### Requirements - The API name MUST be less than or equal to 256 characters. -- The API `basePath` value MUST start with a `/` character. -- The APi `relativePath` value MUST start with a `/` character. +- The API `basePath` value MUST NOT start with a `/` character. +- The API `relativePath` value MUST NOT start with a `/` character. - The API entity schema includes all required fields declared above. - Only web actions, actions having `web-export` set to `true`, can be used as an API endpoint's action. - If needed, the action will be automatically converted to a web action during deployment.
[openwhisk-wskdeploy] branch master updated: Remove misleading web-export key (#1092)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 5073943 Remove misleading web-export key (#1092) 5073943 is described below commit 507394340d77f8bbdefcbab16aa3c1da77809f71 Author: Dominic Kim AuthorDate: Thu Apr 30 23:03:04 2020 +0900 Remove misleading web-export key (#1092) * Remove misleading web-export key * Support the top-level web-export field. * Revert changes on test data to keep the sanity check for the top-level web-export field. --- docs/examples/manifest_hello_world_apigateway.yaml | 3 +- .../manifest_hello_world_apigateway_http.yaml | 6 +- ...ifest_hello_world_apigateway_open_api_spec.yaml | 1 + docs/export.md | 4 +- docs/wskdeploy_apigateway_helloworld.md| 5 +- docs/wskdeploy_apigateway_open_api_spec.md | 1 + parsers/yamlparser.go | 2 +- specification/html/spec_actions.md | 4 +- specification/html/spec_apis.md| 3 +- ...ifest_data_compose_actions_for_invalid_web.yaml | 3 +- .../dat/manifest_data_compose_actions_for_web.yaml | 1 + ...ata_compose_actions_for_web_and_web_export.yaml | 12 ++-- tests/dat/manifest_data_compose_api_records.yaml | 3 +- tests/src/integration/apigateway/manifest.yml | 3 +- .../defaultpackage/manifest-with-project.yaml | 6 +- tests/src/integration/defaultpackage/manifest.yaml | 6 +- tests/src/integration/export/manifest_apiexp.yaml | 3 +- tests/src/integration/flagstests/manifest.yaml | 3 +- tests/src/integration/flagstests/manifest.yml | 3 +- tests/src/integration/runtimetests/manifest.yaml | 78 ++ tests/src/integration/webaction/manifest.yml | 15 +++-- 21 files changed, 109 insertions(+), 56 deletions(-) diff --git a/docs/examples/manifest_hello_world_apigateway.yaml b/docs/examples/manifest_hello_world_apigateway.yaml index 44e49ca..1861a78 100644 --- a/docs/examples/manifest_hello_world_apigateway.yaml +++ b/docs/examples/manifest_hello_world_apigateway.yaml @@ -23,7 +23,8 @@ packages: actions: hello_world: function: src/hello.js -web-export: true +annotations: + web-export: true apis: hello-world: hello: diff --git a/docs/examples/manifest_hello_world_apigateway_http.yaml b/docs/examples/manifest_hello_world_apigateway_http.yaml index afe96a4..c690021 100644 --- a/docs/examples/manifest_hello_world_apigateway_http.yaml +++ b/docs/examples/manifest_hello_world_apigateway_http.yaml @@ -23,10 +23,12 @@ packages: actions: hello_world: function: src/hello_http.js -web-export: true +annotations: + web-export: true hello_world_promise: function: src/hello_http_promise.js -web-export: true +annotations: + web-export: true apis: hello-world: hello: diff --git a/docs/examples/manifest_hello_world_apigateway_open_api_spec.yaml b/docs/examples/manifest_hello_world_apigateway_open_api_spec.yaml index 26826e9..31a0171 100644 --- a/docs/examples/manifest_hello_world_apigateway_open_api_spec.yaml +++ b/docs/examples/manifest_hello_world_apigateway_open_api_spec.yaml @@ -25,4 +25,5 @@ project: actions: hello_world: function: src/hello.js +annotations: web-export: true diff --git a/docs/export.md b/docs/export.md index 296ae7d..a06c252 100644 --- a/docs/export.md +++ b/docs/export.md @@ -191,13 +191,13 @@ packages: namespace: your_namespace/lib1_package credential: "" exposedUrl: "" -web-export: "" main: "" limits: null inputs: {} outputs: {} annotations: exec: nodejs:default + web-export: "" lib1_greeting2: name: lib1_greeting2 location: "" @@ -208,13 +208,13 @@ packages: namespace: your_namespace/lib1_package credential: "" exposedUrl: "" -web-export: "" main: "" limits: null inputs: {} outputs: {} annotations: exec: nodejs:default + web-export: "" lib1_greeting3: name: lib1_greeting3 location: "" diff --git a/docs/wskdeploy_apigateway_helloworld.md b/docs/wskdeploy_apigateway_helloworld.md index 4bcefe9..19ceaa7 100644 --- a/docs/wskdeploy_apigateway_helloworld.md +++ b/docs/wskdeploy_apigateway_helloworld.md @@ -37,7 +37,8 @@ packages: actions: hello_world: function: src/hello.js -web-export: true +
[openwhisk-release] branch master updated: Updates repository status table to include wskdebug (#333)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-release.git The following commit(s) were added to refs/heads/master by this push: new ddcbaa1 Updates repository status table to include wskdebug (#333) ddcbaa1 is described below commit ddcbaa161f8305d3d631c3ac53e3b0fc7ab9ad2b Author: Morgan Langlais AuthorDate: Tue Apr 7 14:46:24 2020 -0500 Updates repository status table to include wskdebug (#333) Co-authored-by: Morgan Langlais --- README.md | 7 +++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index ced3ed2..0d0d0dd 100644 --- a/README.md +++ b/README.md @@ -211,6 +211,13 @@ The following table can be used by Release Managers to check the status of all p https://github.com/apache/openwhisk-runtime-swift/blob/master/tools/travis/build.sh;>build.sh +https://github.com/apache/openwhisk-wskdebug;>openwhisk-wskdebug +https://travis-ci.org/apache/openwhisk-wskdebug;>https://travis-ci.com/apache/openwhisk-wskdebug.svg?branch=master; alt="" /> +https://github.com/apache/openwhisk-wskdebug/blob/master/LICENSE.txt;>https://img.shields.io/badge/license-Apache--2.0-blue.svg; alt="" /> +https://github.com/apache/openwhisk-wskdebug/blob/master/NOTICE.txt;>NOTICE +https://github.com/apache/openwhisk-wskdebug/blob/master/travis/scancode.sh;>scancode.sh + + https://github.com/apache/openwhisk-wskdeploy;>openwhisk-wskdeploy https://travis-ci.org/apache/openwhisk-wskdeploy/branches;>https://travis-ci.org/apache/openwhisk-wskdeploy.svg?branch=master; alt="" /> https://github.com/apache/openwhisk-wskdeploy/blob/master/LICENSE.txt;>https://img.shields.io/badge/license-Apache--2.0-blue.svg; alt="" />
[openwhisk-wskdeploy] branch master updated: Support alt namespace uuid as tenant id on swagger api creates/deletes (#1091)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 20d66fa Support alt namespace uuid as tenant id on swagger api creates/deletes (#1091) 20d66fa is described below commit 20d66fafdab977c390ea71b32df2c0cb64bb73ed Author: Will Plusnick AuthorDate: Fri Mar 20 10:10:24 2020 -0500 Support alt namespace uuid as tenant id on swagger api creates/deletes (#1091) * Support alt namespace resource uuid as tenant id on swagger api creates/deletes * Run go fmt on deployers/servicedeployers --- deployers/servicedeployer.go | 20 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/deployers/servicedeployer.go b/deployers/servicedeployer.go index 1bba645..613bbe8 100644 --- a/deployers/servicedeployer.go +++ b/deployers/servicedeployer.go @@ -1014,9 +1014,9 @@ func (deployer *ServiceDeployer) createAction(pkgname string, action *whisk.Acti func (deployer *ServiceDeployer) getAnnotationsFromPackageActionOrSequence(packageActionName string) *whisk.KeyValueArr { - if len(packageActionName)!=0 { + if len(packageActionName) != 0 { // Split the package name and action name being searched for - aActionName := strings.Split(packageActionName, parsers.PATH_SEPARATOR) + aActionName := strings.Split(packageActionName, parsers.PATH_SEPARATOR) // Attempt to locate the named action (or sequence) to return its annotations if pkg, found := deployer.Deployment.Packages[aActionName[0]]; found { @@ -1088,8 +1088,14 @@ func (deployer *ServiceDeployer) createSwaggerApi(api *whisk.ApiCreateRequest) e var response *http.Response apiCreateReqOptions := deployer.Deployment.SwaggerApiOptions - apiCreateReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0] apiCreateReqOptions.AccessToken = deployer.Client.Config.ApigwAccessToken + // In the case of IAM namespaces, we must use the ApigwTenantId as the SpaceGuid + // IAM namespaces can be detected by seeing if the ApigwTenantId is populated + if len(deployer.Client.Config.ApigwTenantId) > 0 { + apiCreateReqOptions.SpaceGuid = deployer.Client.Config.ApigwTenantId + } else { + apiCreateReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0] + } err = retry(DEFAULT_ATTEMPTS, DEFAULT_INTERVAL, func() error { _, response, err = deployer.Client.Apis.Insert(api, apiCreateReqOptions, true) @@ -1508,9 +1514,15 @@ func (deployer *ServiceDeployer) deleteSwaggerApi(api *whisk.ApiCreateRequest) e } apiDeleteReqOptions := new(whisk.ApiDeleteRequestOptions) - apiDeleteReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0] apiDeleteReqOptions.AccessToken = deployer.Client.Config.ApigwAccessToken apiDeleteReqOptions.ApiBasePath = swaggerObj.BasePath + // In the case of IAM namespaces, we must use the ApigwTenantId as the SpaceGuid + // IAM namespaces can be detected by seeing if the ApigwTenantId is populated + if len(deployer.Client.Config.ApigwTenantId) > 0 { + apiDeleteReqOptions.SpaceGuid = deployer.Client.Config.ApigwTenantId + } else { + apiDeleteReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0] + } a := new(whisk.ApiDeleteRequest) a.Swagger = swaggerString
[openwhisk] branch master updated: Add single entrypoint proxy interface documentation (#4850)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk.git The following commit(s) were added to refs/heads/master by this push: new e12c5de Add single entrypoint proxy interface documentation (#4850) e12c5de is described below commit e12c5de56aaf9e24a180f21f168204cf01125d1f Author: Will Plusnick AuthorDate: Tue Mar 10 10:34:43 2020 -0500 Add single entrypoint proxy interface documentation (#4850) * Add single entrypoint proxy interface documentation Several implementations of a single entrypoint proxy contract exist for multiple different runtimes. In effort to document this existing code, these changes have been put down as part of the documentation for OpenWhisk since they do not properly fit under the definition of any one runtime. In addition, a small footer has been added to the docs/action-new.md to make note of and link to the docs/single_entrypoint_proxy_contract.md describing and giving examples of this contract. * Add apache license to docs/single_entrypoint_proxy_contract.md * Convert html to markdown table in single entrypoint execution environment docs * Table experiment part 2 * Table experiment part 3 * Table experiment part 4 * Table experiment part 5 * Revert "Html to markdown conversion commits" This reverts commit 188d442c1a33513f91be349a897b6798cdd9852c. This reverts commit 7107927c420d5b5ffc092f296daf557712ced51e. This reverts commit 3f21577af72d2debad7d5b7c9c8f8af7609ef152. This reverts commit c58ca4cff1585fa3ad2f3ce3c9cf3fc034c0b35b. This reverts commit f87c08bd3279c3b0c7e618f94ac6a31cfec8aee3. * Add table with links to NodeJS tests to single entrypoint docs * Reword additional execution environments section in action-new doc * Add missing word to additional execution environment in action-new doc * Add a comment to the nodejs table in single entrypoint docs --- docs/actions-new.md | 8 + docs/single_entrypoint_proxy_contract.md | 385 +++ 2 files changed, 393 insertions(+) diff --git a/docs/actions-new.md b/docs/actions-new.md index b5a3767..664c2a9 100644 --- a/docs/actions-new.md +++ b/docs/actions-new.md @@ -282,3 +282,11 @@ other OpenWhisk clients. In which case, appropriate tests should be added as nec The OpenWhisk platform will perform a generic integration test as part of its basic system tests. This integration test will require a [test function](#the-test-action) to be available so that the test harness can create, invoke, and delete the action. + +### Supporting Additonal Execution Environments + +There are now several runtimes that support execution environments in addition to OpenWhisk. Currently only an interface for single entrypoint execution environments has been defined, but more could be defined in the future. + + Action Proxy Single Entrypoint Interface + +Single entrypoint proxies are proxies that have only onde addressable http endpoint. They do not use `/init` and `/run` enpoints utilized by standard OpenWhisk runtime environments; instead both the initialization and activation are handled through one endpoint. The first example of such a proxy was implemented for Knative Serving, but the same interface can be used for any single entrypoint execution environment. In an effort to standardize how the various action proxy implementation co [...] diff --git a/docs/single_entrypoint_proxy_contract.md b/docs/single_entrypoint_proxy_contract.md new file mode 100644 index 000..d364dbb --- /dev/null +++ b/docs/single_entrypoint_proxy_contract.md @@ -0,0 +1,385 @@ + +# Action Proxy Single Entrypoint Interface + +The typical endpoints used by the OpenWhisk control plane are not used in single entrypoint execution environments such as Knative. Initialization and running are still essential to how OpenWhisk runtimes function, but they are done in a different methodology than `/init` and `/run` endpoints. The proxy that shapes how the calls are preprocessed and postprocessed to emulate some of the functionality provided by the OpenWhisk control plane. In single entrypoint supported runtime proxy imp [...] + +## Init + +To initialize an undifferintiated stem cell, the interface is to pass a JSON object containing the key `init` to the `/` endpoint. The value corresponding to the `init` key is the same JSON object as the [initialization of standard OpenWhisk actions](actions-new.md#initialization). For example: +```json +{ + "init": { +"name" : "hello", +"main" : "main", +"code" : "function main(params) {return { payload: 'Hello ' + params.name + ' from ' + params.place + '!' };}", +"
[openwhisk-test] branch master updated: Initial commit for input and output for single entrypoint examples (#10)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-test.git The following commit(s) were added to refs/heads/master by this push: new ee58ea9 Initial commit for input and output for single entrypoint examples (#10) ee58ea9 is described below commit ee58ea91c4653c70a1bb8aae81f5cb33e8a0494c Author: Will Plusnick AuthorDate: Fri Mar 6 13:39:28 2020 -0600 Initial commit for input and output for single entrypoint examples (#10) * Initial commit for input and output for single entrypoint examples * Add init, run, and init-run as separate input files * Update single entrypoint example readme * Add license headers * Fix json typo --- runtimes/proxy/single_entrypoint/README.md | 23 + runtimes/proxy/single_entrypoint/hello_world.js| 20 ++ .../single_entrypoint/hello_world_with_params.js | 20 ++ .../input/hello_world-init-run.json| 20 ++ .../single_entrypoint/input/hello_world-init.json | 8 .../single_entrypoint/input/hello_world-run.json | 15 ++ .../input/hello_world_with_params-init-run.json| 20 ++ .../input/hello_world_with_params-init.json| 8 .../input/hello_world_with_params-run.json | 14 + .../input/web_action_hello_world-init-run.json | 19 + .../input/web_action_hello_world-init.json | 8 .../input/web_action_hello_world-run.json | 13 .../web_action_hello_world_no_input-init-run.json | 16 +++ .../web_action_hello_world_no_input-init.json | 8 .../input/web_action_hello_world_no_input-run.json | 10 + .../input/web_action_raw-init-run.json | 19 + .../input/web_action_raw-init.json | 8 .../input/web_action_raw-run.json | 13 .../single_entrypoint/output/hello_world.json | 3 +++ .../output/hello_world_with_params.json| 3 +++ .../output/web_action_hello_world.json | 1 + .../output/web_action_hello_world_no_input.json| 1 + .../single_entrypoint/output/web_action_raw.json | 16 +++ .../single_entrypoint/web_action_hello_world.js| 24 ++ .../web_action_hello_world_no_input.js | 24 ++ runtimes/proxy/single_entrypoint/web_action_raw.js | 20 ++ 26 files changed, 354 insertions(+) diff --git a/runtimes/proxy/single_entrypoint/README.md b/runtimes/proxy/single_entrypoint/README.md new file mode 100644 index 000..bc620d6 --- /dev/null +++ b/runtimes/proxy/single_entrypoint/README.md @@ -0,0 +1,23 @@ + +# Single Entrypoint Proxy + +This is a repo to store single entrypoint proxy example test cases, such as Knative Serving. All single entrypoint execution environments should follow the contract this defined in the single entrypoint documentation. + +The action code for each example is defined in the is directory, and the input directory has JSON files where the filename corresponds to the input for a the action code of the same file name, but with an -init, -run, or -init-run postfix. The output directory similarly has the expected output for that file. diff --git a/runtimes/proxy/single_entrypoint/hello_world.js b/runtimes/proxy/single_entrypoint/hello_world.js new file mode 100644 index 000..56a4ee7 --- /dev/null +++ b/runtimes/proxy/single_entrypoint/hello_world.js @@ -0,0 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the \"License\"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an \"AS IS\" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +function main() { + return {payload: 'Hello World!'}; +} diff --git a/runtimes/proxy/single_entrypoint/hello_world_with_params.js b/runtimes/proxy/single_entrypoint/hello_world_with_params.js new file mode 100644 index 000..ae45363 --- /dev/null +++ b/runtimes/proxy/single_entrypoint/hello_world_with_params.js @@ -0,0 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributo
[openwhisk-test] branch master updated: Add license headers to files missing it (#11)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-test.git The following commit(s) were added to refs/heads/master by this push: new 08c72cc Add license headers to files missing it (#11) 08c72cc is described below commit 08c72cc116596273753a7c6432ca6e1e1acd6608 Author: Will Plusnick AuthorDate: Fri Mar 6 13:31:11 2020 -0600 Add license headers to files missing it (#11) --- .travis.yml| 18 ++ packages/hellowhisk/manifest.yaml | 18 ++ packages/hellowhisk/src/greeting.js| 16 packages/hellowhisk/src/httpGet.swift | 19 ++- packages/helloworlds/manifest.yaml | 18 ++ packages/helloworlds/src/hello.js | 16 packages/helloworlds/src/helloworld.js | 16 packages/left-pad/index.js | 16 tools/travis/scancode.sh | 16 tools/travis/setupscan.sh | 16 10 files changed, 168 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f659501..c33557c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,21 @@ + # Licensed to the Apache Software Foundation (ASF) under one or more contributor # license agreements; and to You under the Apache License, Version 2.0. diff --git a/packages/hellowhisk/manifest.yaml b/packages/hellowhisk/manifest.yaml index 2f72914..b4d8715 100644 --- a/packages/hellowhisk/manifest.yaml +++ b/packages/hellowhisk/manifest.yaml @@ -1,3 +1,21 @@ + # Licensed to the Apache Software Foundation (ASF) under one or more contributor # license agreements; and to You under the Apache License, Version 2.0. diff --git a/packages/hellowhisk/src/greeting.js b/packages/hellowhisk/src/greeting.js index 2a6fc73..818a946 100644 --- a/packages/hellowhisk/src/greeting.js +++ b/packages/hellowhisk/src/greeting.js @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ // Licensed to the Apache Software Foundation (ASF) under one or more contributor // license agreements; and to You under the Apache License, Version 2.0. diff --git a/packages/hellowhisk/src/httpGet.swift b/packages/hellowhisk/src/httpGet.swift index fd2cc65..9131083 100644 --- a/packages/hellowhisk/src/httpGet.swift +++ b/packages/hellowhisk/src/httpGet.swift @@ -1,7 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + // Licensed to the Apache Software Foundation (ASF) under one or more contributor // license agreements; and to You under the Apache License, Version 2.0. -** +/** * Sample code using the experimental Swift 3 runtime * with links to KituraNet and GCD */ diff --git a/packages/helloworlds/manifest.yaml b/packages/helloworlds/manifest.yaml index 431e653..a48de86 100644 --- a/packages/helloworlds/manifest.yaml +++ b/packages/helloworlds/manifest.yaml @@ -1,3 +1,21 @@ + # Licensed to the Apache Software Foundation (ASF) under one or more contributor # license agreements; and to You under the Apache License, Version 2.0. diff --git a/packages/helloworlds/src/hello.js b/packages/helloworlds/src/hello.js index 2e5a044..637fe6f 100644 --- a/packages/helloworlds/src/hello.js +++ b/packages/helloworlds/src/hello.js @@ -1,3 +1,19 @@ +/* + * Li
[openwhisk-runtime-docker] branch master updated: Fix bug in knative raw handler
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-docker.git The following commit(s) were added to refs/heads/master by this push: new 950ccf0 Fix bug in knative raw handler new f18fa01 Merge pull request #83 from pwplusnick/raw_fix 950ccf0 is described below commit 950ccf0f6e59e8219acd523bb9f92525a48bfa1f Author: Will Plusnick AuthorDate: Thu Feb 27 10:15:47 2020 -0600 Fix bug in knative raw handler --- core/actionProxy/owplatform/knative.py | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/core/actionProxy/owplatform/knative.py b/core/actionProxy/owplatform/knative.py index fe89334..23ff832 100644 --- a/core/actionProxy/owplatform/knative.py +++ b/core/actionProxy/owplatform/knative.py @@ -108,7 +108,7 @@ def preProcessHTTPContext(msg, valueData): tmpBody = msg.get('value', {}) removeInitData(tmpBody) bodyStr = str(tmpBody) -valueData['__ow_body'] = base64.b64encode(bodyStr) +valueData['__ow_body'] = base64.b64encode(bodyStr.encode()) valueData['__ow_query'] = flask.request.query_string namespace = '' @@ -116,7 +116,7 @@ def preProcessHTTPContext(msg, valueData): namespace = os.getenv('__OW_NAMESPACE') valueData['__ow_user'] = namespace valueData['__ow_method'] = flask.request.method -valueData['__ow_headers'] = flask.request.headers +valueData['__ow_headers'] = { k: v for k, v in flask.request.headers.items() } valueData['__ow_path'] = '' def preProcessActivationData(activationData): @@ -239,21 +239,18 @@ class KnativeImpl: message['init'] = createInitDataFromEnvironment() dedicated_runtime = True +preProcessRequest(message) if hasInitData(message) and hasActivationData(message) and not dedicated_runtime: -preProcessRequest(message) self.initCode(message) removeInitData(message) response = self.runCode(message) response = postProcessResponse(request_headers, response) elif hasInitData(message) and not dedicated_runtime: -preProcessRequest(message) response = self.initCode(message) elif hasActivationData(message) and not dedicated_runtime: -preProcessRequest(message) response = self.runCode(message) response = postProcessResponse(request_headers, response) else: -preProcessRequest(message) # This is for the case when it is a dedicated runtime, but has not yet been # initialized from the environment if dedicated_runtime and self.proxy.initialized is False:
[openwhisk-runtime-docker] branch master updated: Enable multiple platforms to use actionproxy
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-docker.git The following commit(s) were added to refs/heads/master by this push: new d7ea472 Enable multiple platforms to use actionproxy new e02a5bb Merge pull request #82 from pwplusnick/platform d7ea472 is described below commit d7ea472c90339b40157e37329b6923f0b3ec47aa Author: Will Plusnick AuthorDate: Fri Feb 7 20:14:21 2020 -0600 Enable multiple platforms to use actionproxy * Add an ability to use action proxy with different platforms * Add openwhisk platform implementation * Add knative platform implementation * Update dockerfile * Note that there was a factory pattern implemented, but is currently bypassed --- core/actionProxy/Dockerfile| 5 +- core/actionProxy/actionproxy.py| 75 - core/actionProxy/owplatform/__init__.py| 87 ++ core/actionProxy/owplatform/knative.py | 314 + .../{Dockerfile => owplatform/openwhisk.py}| 26 +- 5 files changed, 471 insertions(+), 36 deletions(-) diff --git a/core/actionProxy/Dockerfile b/core/actionProxy/Dockerfile index c2cc072..173b050 100644 --- a/core/actionProxy/Dockerfile +++ b/core/actionProxy/Dockerfile @@ -29,8 +29,11 @@ RUN apk upgrade --update \ ENV FLASK_PROXY_PORT 8080 -RUN mkdir -p /actionProxy +RUN mkdir -p /actionProxy/owplatform ADD actionproxy.py /actionProxy/ +ADD owplatform/__init__.py /actionProxy/owplatform/ +ADD owplatform/knative.py /actionProxy/owplatform/ +ADD owplatform/openwhisk.py /actionProxy/owplatform/ RUN mkdir -p /action ADD stub.sh /action/exec diff --git a/core/actionProxy/actionproxy.py b/core/actionProxy/actionproxy.py index 39e1ea5..1812918 100644 --- a/core/actionProxy/actionproxy.py +++ b/core/actionProxy/actionproxy.py @@ -27,17 +27,27 @@ code when required. */ """ -import sys -import os +import base64 +import codecs +import io import json +import os import subprocess -import codecs +import sys +import zipfile + import flask from gevent.pywsgi import WSGIServer -import zipfile -import io -import base64 +# The following import is only needed if we actually want to use the factory pattern. +# See comment below for reasons we decided to bypass it. +#from owplatform import PlatformFactory, InvalidPlatformError +from owplatform.knative import KnativeImpl +from owplatform.openwhisk import OpenWhiskImpl + +PLATFORM_OPENWHISK = 'openwhisk' +PLATFORM_KNATIVE = 'knative' +DEFAULT_PLATFORM = PLATFORM_OPENWHISK class ActionRunner: """ActionRunner.""" @@ -215,8 +225,7 @@ def setRunner(r): runner = r -@proxy.route('/init', methods=['POST']) -def init(): +def init(message=None): if proxy.rejectReinit is True and proxy.initialized is True: msg = 'Cannot initialize the action more than once.' sys.stderr.write(msg + '\n') @@ -224,7 +233,7 @@ def init(): response.status_code = 403 return response -message = flask.request.get_json(force=True, silent=True) +message = message or flask.request.get_json(force=True, silent=True) if message and not isinstance(message, dict): flask.abort(404) else: @@ -247,14 +256,15 @@ def init(): return complete(response) -@proxy.route('/run', methods=['POST']) -def run(): +def run(message=None): def error(): response = flask.jsonify({'error': 'The action did not receive a dictionary as an argument.'}) response.status_code = 404 return complete(response) -message = flask.request.get_json(force=True, silent=True) +# If we have a message use that, if not try using the request json if it exists (returns None on no JSON) +# otherwise just make it an empty dictionary +message = message or flask.request.get_json(force=True, silent=True) or {} if message and not isinstance(message, dict): return error() else: @@ -264,9 +274,14 @@ def run(): if runner.verify(): try: -code, result = runner.run(args, runner.env(message or {})) -response = flask.jsonify(result) -response.status_code = code +if 'activation' in message: +code, result = runner.run(args, runner.env(message['activation'] or {})) +response = flask.jsonify(result) +response.status_code = code +else: +code, result = runner.run(args, runner.env(message or {})) +response = flask.jsonify(result) +response.status_code = code except Exception as e: response = flask.jsonify({'error': 'Internal error. {}'.format(e)}) response.status_code = 500 @@ -286,6 +301,36 @@ def complete(respons
[openwhisk-wskdeploy] branch master updated: replace the last few uses of nodejs@6 with nodejs@10 (#1089)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 eeae4b6 replace the last few uses of nodejs@6 with nodejs@10 (#1089) eeae4b6 is described below commit eeae4b68f702052179c2e316ed1a911a4da609be Author: David Grove AuthorDate: Wed Feb 19 17:32:00 2020 -0500 replace the last few uses of nodejs@6 with nodejs@10 (#1089) --- docs/examples/manifest_hello_world_runtime.yaml | 4 ++-- docs/wskdeploy_action_advanced_parms.md | 2 +- docs/wskdeploy_action_runtime.md | 4 ++-- tests/dat/deployment_data_action_with_inputs_outputs.yaml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/examples/manifest_hello_world_runtime.yaml b/docs/examples/manifest_hello_world_runtime.yaml index d9bd9ee..cbdc90c 100644 --- a/docs/examples/manifest_hello_world_runtime.yaml +++ b/docs/examples/manifest_hello_world_runtime.yaml @@ -15,7 +15,7 @@ # limitations under the License. # -# Example: explicit selection of the NodeJS version 6 runtime +# Example: explicit selection of the NodeJS version 10 runtime packages: hello_world_package: version: 1.0 @@ -23,4 +23,4 @@ packages: actions: hello_world_runtime: function: src/hello.js -runtime: nodejs@6 +runtime: nodejs@10 diff --git a/docs/wskdeploy_action_advanced_parms.md b/docs/wskdeploy_action_advanced_parms.md index e2229a0..99a75c7 100644 --- a/docs/wskdeploy_action_advanced_parms.md +++ b/docs/wskdeploy_action_advanced_parms.md @@ -37,7 +37,7 @@ packages: actions: hello_world_advanced_parms: function: src/hello_plus.js -runtime: nodejs@6 +runtime: nodejs@10 inputs: name: type: string diff --git a/docs/wskdeploy_action_runtime.md b/docs/wskdeploy_action_runtime.md index bebfd48..67da5b3 100644 --- a/docs/wskdeploy_action_runtime.md +++ b/docs/wskdeploy_action_runtime.md @@ -29,7 +29,7 @@ This example shows how to: - declare an explicit runtime for your Action's function. ### Manifest file - _Example: explicit selection of the NodeJS version 6 runtime_ + _Example: explicit selection of the NodeJS version 10 runtime_ ```yaml packages: hello_world_package: @@ -38,7 +38,7 @@ packages: actions: hello_world_runtime: function: src/hello.js -runtime: nodejs@6 +runtime: nodejs@10 ``` ### Deploying diff --git a/tests/dat/deployment_data_action_with_inputs_outputs.yaml b/tests/dat/deployment_data_action_with_inputs_outputs.yaml index 0e0d59f..5755f6d 100644 --- a/tests/dat/deployment_data_action_with_inputs_outputs.yaml +++ b/tests/dat/deployment_data_action_with_inputs_outputs.yaml @@ -39,7 +39,7 @@ packages: description: "output notice string" name: notice type: string - runtime: nodejs@6 + runtime: nodejs@10 version: 1.0 license: Apache-2.0 packagename: helloworld
[openwhisk-wskdeploy] branch master updated: Updating runtimes cache to match server side (#1086)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 fe1d299 Updating runtimes cache to match server side (#1086) fe1d299 is described below commit fe1d29961cb25809ab0bae89c2f089ff96fa046c Author: Priti Desai AuthorDate: Fri Jan 10 12:06:06 2020 -0800 Updating runtimes cache to match server side (#1086) --- runtimes/runtimes.go | 174 +++-- specification/html/spec_actions.md | 2 +- 2 files changed, 54 insertions(+), 122 deletions(-) diff --git a/runtimes/runtimes.go b/runtimes/runtimes.go index 7d9bd03..30e1bc0 100644 --- a/runtimes/runtimes.go +++ b/runtimes/runtimes.go @@ -275,46 +275,21 @@ func ListOfSupportedRuntimes(runtimes map[string][]string) (rt []string) { } var RUNTIME_DETAILS = []byte(`{ -"support": { -"github": "https://github.com/apache/openwhisk/issues;, -"slack": "http://slack.openwhisk.org; -}, -"description": "OpenWhisk", -"api_paths": [ -"/api/v1" -], "runtimes": { "nodejs": [ { -"kind": "nodejs", -"image": { -"prefix": "openwhisk", -"name": "nodejsaction", -"tag": "latest" -}, -"deprecated": true, -"attached": { -"attachmentName": "codefile", -"attachmentType": "text/plain" -} -}, -{ "kind": "nodejs:6", "default": false, "image": { "prefix": "openwhisk", "name": "nodejs6action", -"tag": "latest" +"tag": "nightly" }, "deprecated": true, "attached": { "attachmentName": "codefile", "attachmentType": "text/plain" -}, -"stemCells": [{ -"count": 2, -"memory": "256 MB" -}] +} }, { "kind": "nodejs:8", @@ -322,7 +297,7 @@ var RUNTIME_DETAILS = []byte(`{ "image": { "prefix": "openwhisk", "name": "action-nodejs-v8", -"tag": "latest" +"tag": "nightly" }, "deprecated": false, "attached": { @@ -336,36 +311,43 @@ var RUNTIME_DETAILS = []byte(`{ "image": { "prefix": "openwhisk", "name": "action-nodejs-v10", -"tag": "latest" +"tag": "nightly" }, "deprecated": false, "attached": { "attachmentName": "codefile", "attachmentType": "text/plain" -} -} -], -"python": [ +}, +"stemCells": [ +{ +"count": 2, +"memory": "256 MB" +} +] +}, { -"kind": "python", +"kind": "nodejs:12", +"default": false, "image": { "prefix": "openwhisk", -"name": "python2action", -"tag": "latest" +"name": "action-nodejs-v12", +"tag": "nightly" }, "deprecated": false, "attached": { "attachmentName": "codefile", "attachmen
[openwhisk-client-go] branch master updated: Parse an action's application error (#133)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-client-go.git The following commit(s) were added to refs/heads/master by this push: new d272b2b Parse an action's application error (#133) d272b2b is described below commit d272b2b1129269d384c1dbba6c39156abc10ad3c Author: Mark Deuser AuthorDate: Wed Dec 11 11:53:14 2019 -0500 Parse an action's application error (#133) * Generically parse the application error * Update vendor.json to include all dependent packages * gofmt * don't display the application error as the action's error * put back original vendor.json --- whisk/client.go | 99 +++- whisk/client_test.go | 19 ++ 2 files changed, 110 insertions(+), 8 deletions(-) diff --git a/whisk/client.go b/whisk/client.go index 91b8a79..9ea01bc 100644 --- a/whisk/client.go +++ b/whisk/client.go @@ -586,9 +586,13 @@ func parseApplicationError(resp *http.Response, data []byte, v interface{}) (*ht // Handle application errors that occur when --result option is false (#5) if err == nil && whiskErrorResponse != nil && whiskErrorResponse.Response != nil && whiskErrorResponse.Response.Status != nil { Debug(DbgInfo, "Detected response status `%s` that a whisk.error(\"%#v\") was returned\n", - *whiskErrorResponse.Response.Status, *whiskErrorResponse.Response.Result) + *whiskErrorResponse.Response.Status, whiskErrorResponse.Response.Result) + + errStr := getApplicationErrorMessage(whiskErrorResponse.Response.Result) + Debug(DbgInfo, "Application error received: %s\n", errStr) + errMsg := wski18n.T("The following application error was received: {{.err}}", - map[string]interface{}{"err": *whiskErrorResponse.Response.Result}) + map[string]interface{}{"err": errStr}) whiskErr := MakeWskError(errors.New(errMsg), resp.StatusCode-256, NO_DISPLAY_MSG, NO_DISPLAY_USAGE, NO_MSG_DISPLAYED, DISPLAY_PREFIX, APPLICATION_ERR) return parseSuccessResponse(resp, data, v), whiskErr @@ -600,10 +604,10 @@ func parseApplicationError(resp *http.Response, data []byte, v interface{}) (*ht // Handle application errors that occur with blocking invocations when --result option is true (#5) if err == nil && appErrResult.Error != nil { Debug(DbgInfo, "Error code is null, blocking with result invocation error has occurred\n") - errMsg := fmt.Sprintf("%v", *appErrResult.Error) - Debug(DbgInfo, "Application error received: %s\n", errMsg) + errStr := getApplicationErrorMessage(*appErrResult.Error) + Debug(DbgInfo, "Application error received: %s\n", errStr) - whiskErr := MakeWskError(errors.New(errMsg), resp.StatusCode-256, NO_DISPLAY_MSG, NO_DISPLAY_USAGE, + whiskErr := MakeWskError(errors.New(errStr), resp.StatusCode-256, NO_DISPLAY_MSG, NO_DISPLAY_USAGE, NO_MSG_DISPLAYED, DISPLAY_PREFIX, APPLICATION_ERR) return parseSuccessResponse(resp, data, v), whiskErr } @@ -616,6 +620,85 @@ func parseApplicationError(resp *http.Response, data []byte, v interface{}) (*ht return resp, whiskErr } +func getApplicationErrorMessage(errResp interface{}) string { + var errStr string + + // Handle error results that looks like: + // + // { + // "error": { + // "error": "An error string", + // "message": "An error message", + // "another-message": "Another error message" + // } + // } + // Returns "An error string; An error message; Another error message" + // + // OR + // { + // "error": "An error string" + // } + // Returns "An error string" + // + // OR + // { + // "error": { + // "custom-err": { + // "error": "An error string", + // "message": "An error message" + // } + // } + // } + // Returns "{"error": { "custom-err": { "error": "An error string", "message": "An error message" } } }" + + errMapIntf, errMapIntfOk := errResp.(map[string]interface{}) + if !errMapIntfOk { + errS
[openwhisk-wskdeploy] branch master updated: Dummy token issue (#1081)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 0e57fb3 Dummy token issue (#1081) 0e57fb3 is described below commit 0e57fb3ec10c9cb8271a597df1a79c89f5e5294f Author: Will Plusnick AuthorDate: Thu Dec 5 15:21:12 2019 -0600 Dummy token issue (#1081) * Allow travisci to be used as a ci/cd pipeline * Restructure travisci dummy token so that travis can be used as a ci/cd pipeline * Add documentation for credentials filling precedence * Add documentation to describe default credential values --- deployers/whiskclient.go | 17 +++-- docs/wskdeploy_faq.md| 9 + 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/deployers/whiskclient.go b/deployers/whiskclient.go index 4d980b4..741ec81 100644 --- a/deployers/whiskclient.go +++ b/deployers/whiskclient.go @@ -55,6 +55,9 @@ type PropertyValue struct { Source string } +// Note buyer beware this function returns the existing value, and only if there is not +// an existing value does it set it to newValue. We should perhaps rename this function +// as it implies that it is a getter, when this is not strictly true var GetPropertyValue = func(prop PropertyValue, newValue string, source string) PropertyValue { if len(prop.Value) == 0 && len(newValue) > 0 { prop.Value = newValue @@ -201,12 +204,6 @@ func NewWhiskConfig(proppath string, deploymentPath string, manifestPath string) // reset credential, apiHost, namespace, etc to avoid any conflicts as they initialized globally resetWhiskConfig() - // initialize APIGW_ACCESS_TOKEN to "DUMMY TOKEN" for Travis builds - if strings.ToLower(os.Getenv("TRAVIS")) == "true" { - apigwAccessToken.Value = "DUMMY TOKEN" - apigwAccessToken.Source = SOURCE_DEFAULT_VALUE - } - // read from command line readFromCLI() @@ -230,6 +227,14 @@ func NewWhiskConfig(proppath string, deploymentPath string, manifestPath string) // TODO() whisk.properties should be deprecated readFromWhiskProperty(pi) + // As a last resort initialize APIGW_ACCESS_TOKEN to "DUMMY TOKEN" for Travis builds + // The reason DUMMY TOKEN is not always true for Travis builds is that they may want + // to use Travis as a CD vehicle in which case we need to respect the other values + // that may be set before. + if strings.ToLower(os.Getenv("TRAVIS")) == "true" { + apigwAccessToken = GetPropertyValue(apigwAccessToken, "DUMMY TOKEN", SOURCE_DEFAULT_VALUE) + } + // set namespace to default namespace if not yet found if len(apiHost.Value) != 0 && len(credential.Value) != 0 && len(namespace.Value) == 0 { namespace.Value = whisk.DEFAULT_NAMESPACE diff --git a/docs/wskdeploy_faq.md b/docs/wskdeploy_faq.md index a6d478c..ef7017d 100644 --- a/docs/wskdeploy_faq.md +++ b/docs/wskdeploy_faq.md @@ -27,3 +27,12 @@ - The ```wskdeploy``` utility will cease deploying as soon as it receives an error from the target platform and display what error information it receives to you. - then it will attempt to undeploy any entities that it attempted to deploy. + +### What is the order of precedence for OpenWhisk credentials? + +- The ```wskdeploy``` utility finds the credentials (apihost, namespace, and auth) as well as the APIGW_ACCESS_TOKEN in the folowing precedence from highest to lowest: + - ```wskdeploy``` command line (i.e. ```wskdeploy --apihost --namespace --auth```) + - The deployment file + - The manifest file + - The .wskprops file +- So when filling out the credentials and the APIGW_ACCESS_TOKEN, it first looks to the command line. Anything not found on the command line is attempted to be filled by the deployment file. Next it searches for all the unfilled values in the manifest file, and finally any unfilled values are looked for in the .wskprops file. After failing to find a value in the places mentioned above, namespace will default to "_". In the case of a TravisCI environment, APIGW_ACCESS_TOKEN will be set to [...]
[openwhisk-catalog] branch master updated: Fix and provide clarity on access token scopes needed (#314)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-catalog.git The following commit(s) were added to refs/heads/master by this push: new 6997e19 Fix and provide clarity on access token scopes needed (#314) 6997e19 is described below commit 6997e190ef30bc2a897c74c6593c06a25e3355e2 Author: Matt Rutkowski AuthorDate: Tue Dec 3 14:55:42 2019 -0600 Fix and provide clarity on access token scopes needed (#314) --- packages/github/README.md | 11 --- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/github/README.md b/packages/github/README.md index b1eae9b..b0b9ad7 100644 --- a/packages/github/README.md +++ b/packages/github/README.md @@ -36,16 +36,19 @@ The `/whisk.system/github/webhook` feed configures a service to fire a trigger w - `username`: The user name of the GitHub repository. - `repository`: The GitHub repository. -- `accessToken`: Your GitHub personal access token. When you [create your token](https://github.com/settings/tokens), be sure to select the repo:status and public_repo scopes. Also, make sure that you don't have any webhooks already defined for your repository. +- `accessToken`: Your GitHub personal access token. - `events`: The [GitHub event type](https://developer.github.com/v3/activity/events/types/) of interest. The following is an example of creating a trigger that will be fired each time that there is a new commit to a GitHub repository. 1. Generate a GitHub [personal access token](https://github.com/settings/tokens). - The access token will be used in the next step. + - **Important** _When [creating your personal access token](https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line), be sure to select the following **scopes**:_ +- **repo**: **repo:status** to allow access to commit status. +- **admin:repo_hook**: **write:repo_hook** to allow the feed action to create your webhook. + - **Warning** _Make sure that you don't have any webhooks already defined for your repository or they may be overwritten._ -2. Create a package binding that is configured for your GitHub repository and with your access token. +2. Create a package binding that is configured for your GitHub repository and with the personal access token created in step 1. ``` wsk package bind /whisk.system/github myGit \ @@ -61,5 +64,7 @@ The following is an example of creating a trigger that will be fired each time t ``` A commit to the GitHub repository by using a `git push` causes the trigger to be fired by the webhook. If there is a rule that matches the trigger, then the associated action will be invoked. + The action receives the GitHub webhook payload as an input parameter. Each GitHub webhook event has a similar JSON schema, but is a unique payload object that is determined by its event type. + For more information about the payload content, see the [GitHub events and payload](https://developer.github.com/v3/activity/events/types/) API documentation.
[openwhisk-external-resources] branch master updated: Update page for Apache and curate contents. (#32)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-external-resources.git The following commit(s) were added to refs/heads/master by this push: new a4ea5be Update page for Apache and curate contents. (#32) a4ea5be is described below commit a4ea5bea5de5b369eb12e22d4ffee6d3d165e65b Author: Matt Rutkowski AuthorDate: Tue Dec 3 10:04:37 2019 -0600 Update page for Apache and curate contents. (#32) --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b0ddee2..7b2fbd0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ -# Awesome Apache OpenWhisk [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome) [https://raw.githubusercontent.com/openwhisk/openwhisk/master/docs/images/whisk_icon_full_color_with_tm_100x100-300dpi.png; width="100" align="right" alt="openwhisk">](https://github.com/openwhisk/openwhisk) -> Awesome [Apache OpenWhisk](https://github.com/apache/incubator-openwhisk) resources and tips. +# OpenWhisk External Resources [![Awesome](https://cdn.rawgit.com/sindresorhus/awesome/d7305f38d29fed78fa85652e3a63e154dd8e8829/media/badge.svg)](https://github.com/sindresorhus/awesome) [https://raw.githubusercontent.com/openwhisk/openwhisk/master/docs/images/whisk_icon_full_color_with_tm_100x100-300dpi.png; width="100" align="right" alt="openwhisk">](https://github.com/openwhisk/openwhisk) + +> Apache [OpenWhisk](https://www.github.com/apache/openwhisk) resources and tips. *Apache OpenWhisk is a cloud-first distributed event-based programming service. It provides a programming model to upload event handlers to a cloud service, and register the handlers to respond to various events.*
[openwhisk-wskdeploy] branch master updated: Support alt. namespace resource uuid as tenant id on undeploy (#1080)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-wskdeploy.git View the commit online: https://github.com/apache/openwhisk-wskdeploy/commit/5f5e0dda1f21400cc868f8bd2f17a150f3cc29c4 The following commit(s) were added to refs/heads/master by this push: new 5f5e0dd Support alt. namespace resource uuid as tenant id on undeploy (#1080) 5f5e0dd is described below commit 5f5e0dda1f21400cc868f8bd2f17a150f3cc29c4 Author: Will Plusnick AuthorDate: Wed Nov 20 09:28:10 2019 -0600 Support alt. namespace resource uuid as tenant id on undeploy (#1080) * Support alt. namespace resource uuid as tenant id to API gatway service during undeploy --- deployers/servicedeployer.go | 16 ++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/deployers/servicedeployer.go b/deployers/servicedeployer.go index 450090f..770ee6c 100644 --- a/deployers/servicedeployer.go +++ b/deployers/servicedeployer.go @@ -1351,7 +1351,13 @@ func (deployer *ServiceDeployer) isApi(api *whisk.ApiCreateRequest) bool { apiReqOptions := new(whisk.ApiGetRequestOptions) apiReqOptions.AccessToken = deployer.Client.Config.ApigwAccessToken apiReqOptions.ApiBasePath = api.ApiDoc.GatewayBasePath - apiReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0] + if len(deployer.Client.Config.ApigwTenantId) > 0 { + // Use it to identify the IAM namespace + apiReqOptions.SpaceGuid = deployer.Client.Config.ApigwTenantId + } else { + // assume a CF namespaces (SpaceGuid) which is part of the authtoken + apiReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0] + } a := new(whisk.ApiGetRequest) @@ -1379,7 +1385,13 @@ func (deployer *ServiceDeployer) deleteApi(api *whisk.ApiCreateRequest) error { apiDeleteReqOptions := new(whisk.ApiDeleteRequestOptions) apiDeleteReqOptions.AccessToken = deployer.Client.Config.ApigwAccessToken - apiDeleteReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0] + if len(deployer.Client.Config.ApigwTenantId) > 0 { + // Use it to identify the IAM namespace + apiDeleteReqOptions.SpaceGuid = deployer.Client.Config.ApigwTenantId + } else { + // assume a CF namespaces (SpaceGuid) which is part of the authtoken + apiDeleteReqOptions.SpaceGuid = strings.Split(deployer.Client.Config.AuthToken, ":")[0] + } apiDeleteReqOptions.ApiBasePath = api.ApiDoc.GatewayBasePath apiDeleteReqOptions.ApiRelPath = api.ApiDoc.GatewayRelPath apiDeleteReqOptions.ApiVerb = api.ApiDoc.GatewayMethod
[openwhisk] branch master updated: Document optional .wskprops related to provider-specific API Gateway … (#4713)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk.git The following commit(s) were added to refs/heads/master by this push: new d47f4ec Document optional .wskprops related to provider-specific API Gateway … (#4713) d47f4ec is described below commit d47f4ec91d467295ffcfa894401ddb113984c108 Author: Matt Rutkowski AuthorDate: Fri Nov 8 08:32:33 2019 -0600 Document optional .wskprops related to provider-specific API Gateway … (#4713) * Document optional .wskprops related to provider-specific API Gateway services * Document optional .wskprops related to provider-specific API Gateway services --- docs/cli.md | 15 ++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/docs/cli.md b/docs/cli.md index 901a7dd..1a91665 100644 --- a/docs/cli.md +++ b/docs/cli.md @@ -51,10 +51,23 @@ you can run the following command from your `openwhisk` directory: ./bin/wsk property set --auth `cat ansible/files/auth.guest` ``` -**Tip:** The OpenWhisk CLI stores the properties set in `~/.wskprops` by default. The location of this file can be altered by setting the `WSK_CONFIG_FILE` environment variable. +**Tip:** The OpenWhisk CLI stores properties in the `~/.wskprops` configuration file by default. The location of this file can be altered by setting the `WSK_CONFIG_FILE` environment variable. + +The required properties described above have the following keys in the `.wskprops` file: + +- **APIHOST** - Required key for the API host value. +- **AUTH** - Required key for the Authorization key. To verify your CLI setup, try [creating and running an action](./samples.md). +### Optional Whisk Properties + +Some OpenWhisk providers make use of optional properties that can be added to the `.wskprops` file. The following keys are optional: + +- **APIGW_ACCESS_TOKEN** - Optional, provider-specific authorization token for an independently hosted API Gateway service used for managing OpenWhisk API endpoints. + +- **APIGW_TENANT_ID** - Optional, provider-relative identifier of the tenant (owner for access control purposes) of any API endpoints that are created by the CLI. + ### Configure command completion for Openwhisk CLI For bash command completion to work, bash 4.1 or newer is required. The most recent Linux distributions should have the correct version of bash but Mac users will most likely have an older version.
[openwhisk-client-go] branch master updated: Support alt. namespace resource uuid as tenant id to API gateway service (#130)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-client-go.git The following commit(s) were added to refs/heads/master by this push: new ee5b870 Support alt. namespace resource uuid as tenant id to API gateway service (#130) ee5b870 is described below commit ee5b8709787cd37201c42e38040e9709f6d1e9c8 Author: Matt Rutkowski AuthorDate: Fri Oct 18 14:10:12 2019 -0500 Support alt. namespace resource uuid as tenant id to API gateway service (#130) * Support alt. namespace resource uuid as tenant id to API gateway service * gofmt * Update Travis base image to Xenial release for build * clean up unit tests * clean up unit tests * clean up unit tests --- .travis.yml| 5 ++-- whisk/client.go| 1 + whisk/wskprops.go | 23 ++-- whisk/wskprops_test.go | 75 +- 4 files changed, 67 insertions(+), 37 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1f19e31..bbe821b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,9 +21,9 @@ matrix: include: - os: linux sudo: required - group: deprecated-2017Q3 go: "1.9.3" services: docker + dist: xenial git: depth: 3 @@ -39,7 +39,8 @@ before_install: - cd $TRAVIS_BUILD_DIR - GO_FILES=$(find . -iname '*.go' -type f | grep -v /vendor/) - test -z "$(gofmt -s -l $(echo $GO_FILES))" - - pip install --upgrade pip setuptools + #- pip install --upgrade pip setuptools + - pip install --user --upgrade pip setuptools - ./tools/travis/setup.sh install: diff --git a/whisk/client.go b/whisk/client.go index 45de175..91b8a79 100644 --- a/whisk/client.go +++ b/whisk/client.go @@ -97,6 +97,7 @@ type Config struct { Insecure bool UserAgent string ApigwAccessToken string + ApigwTenantId string AdditionalHeaders http.Header } diff --git a/whisk/wskprops.go b/whisk/wskprops.go index 01b7d91..22e301f 100644 --- a/whisk/wskprops.go +++ b/whisk/wskprops.go @@ -40,13 +40,14 @@ const ( DEFAULT_VERSION = "v1" DEFAULT_NAMESPACE= "_" - NAMESPACE = "NAMESPACE" - AUTH = "AUTH" APIGW_ACCESS_TOKEN = "APIGW_ACCESS_TOKEN" + APIGW_TENANT_ID= "APIGW_TENANT_ID" + APIHOST= "APIHOST" APIVERSION = "APIVERSION" - KEY= "KEY" + AUTH = "AUTH" CERT = "CERT" - APIHOST= "APIHOST" + KEY= "KEY" + NAMESPACE = "NAMESPACE" DEFAULT_SOURCE = "wsk props" WSKPROP= "wsk props" @@ -54,14 +55,15 @@ const ( ) type Wskprops struct { - APIHoststring - AuthKeystring - Namespace string - AuthAPIGWKey string APIGWSpaceSuid string + APIGWTenantId string + APIHoststring Apiversion string - Keystring + AuthAPIGWKey string + AuthKeystring Cert string + Keystring + Namespace string Source string } @@ -177,6 +179,7 @@ func (pi PropertiesImp) GetPropsFromWskprops(path string) *Wskprops { dep.AuthKey = GetValue(results, AUTH, dep.AuthKey) dep.Namespace = GetValue(results, NAMESPACE, dep.Namespace) dep.AuthAPIGWKey = GetValue(results, APIGW_ACCESS_TOKEN, dep.AuthAPIGWKey) + dep.APIGWTenantId = GetValue(results, APIGW_TENANT_ID, dep.APIGWTenantId) if len(dep.AuthKey) > 0 { dep.APIGWSpaceSuid = strings.Split(dep.AuthKey, ":")[0] } @@ -194,6 +197,7 @@ func (pi PropertiesImp) GetPropsFromWhiskProperties() *Wskprops { results, err := ReadProps(path) if err == nil { + // TODO Determine why we have a hardcoed "test.auth" file here, is this only for unit tests? documented? authPath := GetValue(results, TEST_AUTH_FILE, "") b, err := ioutil.ReadFile(authPath) if err == nil { @@ -281,6 +285,7 @@ func GetDefaultWskprops(source string) *Wskprops { AuthKey:"", Namespace: DEFAULT_NAMESPACE, AuthAPIGWKey: "", + APIGWTenantId: "", APIGWSpaceSuid: "", Apiversion: DEFAULT_VERSION, Key:"", diff --g
[openwhisk-devtools] branch master updated: Reading Jar Contents from Env. (#297)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-devtools.git The following commit(s) were added to refs/heads/master by this push: new ae52354 Reading Jar Contents from Env. (#297) ae52354 is described below commit ae52354059af3a046499c8801329ab9eeedf196d Author: Priti Desai AuthorDate: Wed Oct 16 14:20:08 2019 -0700 Reading Jar Contents from Env. (#297) * reading code from env. * reading a filename instead of code. * converting string to path * cleaning up --- .../openwhisk/runtime/java/action/Proxy.java | 24 -- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/knative-build/runtimes/java/core/java8/proxy/src/main/java/org/apache/openwhisk/runtime/java/action/Proxy.java b/knative-build/runtimes/java/core/java8/proxy/src/main/java/org/apache/openwhisk/runtime/java/action/Proxy.java index 91b5c94..d6328c8 100644 --- a/knative-build/runtimes/java/core/java8/proxy/src/main/java/org/apache/openwhisk/runtime/java/action/Proxy.java +++ b/knative-build/runtimes/java/core/java8/proxy/src/main/java/org/apache/openwhisk/runtime/java/action/Proxy.java @@ -27,6 +27,7 @@ import java.lang.reflect.InvocationTargetException; import java.net.InetSocketAddress; import java.nio.charset.StandardCharsets; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import java.util.Set; @@ -42,6 +43,8 @@ public class Proxy { private HttpServer server; private JarLoader loader = null; private boolean allowMultipleInits = false; +private static final String OW_AUTO_INIT = "OW_AUTO_INIT"; +private static final String OW_AUTO_INIT_MAIN = "OW_AUTO_INIT_MAIN"; public Proxy(int port) throws IOException { long startTime = Debug.start(); @@ -158,8 +161,25 @@ public class Proxy { public void handle(HttpExchange t) throws IOException { long startTime = Debug.start(); if (loader == null) { -Proxy.writeError(t, "Cannot invoke an uninitialized action."); -return; +// check if the Jar file contents are set in the enviorment +// OW_AUTO_INIT: Jar file with absolute/relative path +// OW_AUTO_INIT_MAIN: name of the function in the "OW_AUTO_INIT" to call as the action handler +String ow_auto_init = System.getenv(OW_AUTO_INIT); +String ow_auto_init_main = System.getenv(OW_AUTO_INIT_MAIN); +if (ow_auto_init == null || ow_auto_init.isEmpty()) { +Proxy.writeError(t, "Cannot invoke an uninitialized action."); +return; +} else { +try { +Path jarPath = Paths.get(ow_auto_init); +loader = new JarLoader(jarPath, ow_auto_init_main); +} catch (Exception e) { +e.printStackTrace(System.err); +writeLogMarkers(); +Proxy.writeError(t, "An error has occurred (see logs for details): " + e); +return; +} +} } ClassLoader cl = Thread.currentThread().getContextClassLoader();
[openwhisk-client-go] branch rabbah-patch-1 deleted (was 3b82425)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a change to branch rabbah-patch-1 in repository https://gitbox.apache.org/repos/asf/openwhisk-client-go.git. was 3b82425 Update .gitignore The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[openwhisk-utilities] branch master updated: Improve pre-commit sample for openwhisk (#72)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-utilities.git The following commit(s) were added to refs/heads/master by this push: new 3988a24 Improve pre-commit sample for openwhisk (#72) 3988a24 is described below commit 3988a24e1252d913e027bb441ad1609b0dccb98b Author: Sven Lange-Last AuthorDate: Wed Sep 18 19:29:42 2019 +0200 Improve pre-commit sample for openwhisk (#72) The current code sample does not scan the full openwhisk directory but only starting from the current directory. In addition, no configuration file is specified. With this change, the pre-commit hook scans the full openwhisk directory and uses the scan configuration that is also used in the openwhisk Travis configuration. --- README.md | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ad37e5a..8966979 100644 --- a/README.md +++ b/README.md @@ -64,9 +64,12 @@ It is worth adding a Git [pre-commit hook](https://git-scm.com/book/en/v2/Custom $ cat /path/to/openwhisk/.git/hooks/pre-commit #!/usr/bin/env bash +# -- Code scanning -- +# See https://github.com/apache/openwhisk-utilities # determine openwhisk base directory root="$(git rev-parse --show-toplevel)" -python /path/to/openwhisk-utilities/scancode/scanCode.py . --config $root/tools/ --gitignore $root/.gitignore +scancode_path="/path/to/openwhisk-utilities/scancode" +python $scancode_path/scanCode.py --config $scancode_path/ASF-Release.cfg --gitignore $root/.gitignore $root ``` _Note_: A hook a locally installed, so if you check out the repository again, you will need to reinstall it.
[openwhisk-wskdeploy] branch master updated: Auto supply a dummy API GW token (#1068)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 01cfe67 Auto supply a dummy API GW token (#1068) 01cfe67 is described below commit 01cfe67c4393e93acc44935c5fc14196283ed137 Author: jiangpch AuthorDate: Wed Sep 11 21:15:40 2019 +0800 Auto supply a dummy API GW token (#1068) * Auto supply a dummy API GW token * Use package constant and print more clear message --- parsers/manifest_parser.go | 11 +++ wski18n/i18n_ids.go | 3 +++ wski18n/i18n_resources.go| 22 +++--- wski18n/resources/en_US.all.json | 4 4 files changed, 25 insertions(+), 15 deletions(-) diff --git a/parsers/manifest_parser.go b/parsers/manifest_parser.go index 7b77334..e25cc49 100644 --- a/parsers/manifest_parser.go +++ b/parsers/manifest_parser.go @@ -52,6 +52,8 @@ const ( NATIVE_DOCKER_IMAGE = "openwhisk/dockerskeleton" PARAM_OPENING_BRACKET = "{" PARAM_CLOSING_BRACKET = "}" + + DUMMY_APIGW_ACCESS_TOKEN = "DUMMY TOKEN" ) // Read existing manifest file or create new if none exists @@ -1148,12 +1150,13 @@ func (dm *YAMLParser) ComposeApiRecordsFromAllPackages(client *whisk.Config, man func (dm *YAMLParser) ComposeApiRecords(client *whisk.Config, packageName string, pkg Package, manifestPath string) ([]*whisk.ApiCreateRequest, map[string]*whisk.ApiCreateRequestOptions, error) { var requests = make([]*whisk.ApiCreateRequest, 0) - // verify APIGW_ACCESS_TOKEN is set before composing APIs - // until this point, we dont know whether APIs are specified in manifest or not + // supply a dummy API GW token as it is optional if pkg.Apis != nil && len(pkg.Apis) != 0 { if len(client.ApigwAccessToken) == 0 { - return nil, nil, wskderrors.NewWhiskClientInvalidConfigError( - wski18n.ID_MSG_CONFIG_MISSING_APIGW_ACCESS_TOKEN) + warningString := wski18n.T(wski18n.ID_MSG_CONFIG_PROVIDE_DEFAULT_APIGW_ACCESS_TOKEN, + map[string]interface{}{wski18n.KEY_DUMMY_TOKEN: DUMMY_APIGW_ACCESS_TOKEN}) + wskprint.PrintOpenWhiskWarning(warningString) + client.ApigwAccessToken = DUMMY_APIGW_ACCESS_TOKEN } } diff --git a/wski18n/i18n_ids.go b/wski18n/i18n_ids.go index 1203516..cb5b377 100644 --- a/wski18n/i18n_ids.go +++ b/wski18n/i18n_ids.go @@ -88,6 +88,7 @@ const ( KEY_API_RELATIVE_PATH = "apirelativepath" KEY_DESTINATION = "destination" KEY_INCLUDE = "include" + KEY_DUMMY_TOKEN = "dummytoken" ) // DO NOT TRANSLATE @@ -141,6 +142,7 @@ const ( ID_MSG_CONFIG_MISSING_APIHOST = "msg_config_missing_apihost" ID_MSG_CONFIG_MISSING_NAMESPACE = "msg_config_missing_namespace" ID_MSG_CONFIG_MISSING_APIGW_ACCESS_TOKEN= "msg_config_missing_apigw_access_token" + ID_MSG_CONFIG_PROVIDE_DEFAULT_APIGW_ACCESS_TOKEN= "msg_config_provide_default_apigw_access_token" ID_MSG_CONFIG_INFO_APIHOST_X_host_X_source_X= "msg_config_apihost_info" ID_MSG_CONFIG_INFO_AUTHKEY_X_source_X = "msg_config_authkey_info" ID_MSG_CONFIG_INFO_NAMESPACE_X_namespace_X_source_X = "msg_config_namespace_info" @@ -350,4 +352,5 @@ var I18N_ID_SET = [](string){ ID_WARN_RUNTIME_CHANGED_X_runtime_X_action_X, ID_WARN_WHISK_PROPS_DEPRECATED, ID_MSG_CONFIG_MISSING_APIGW_ACCESS_TOKEN, + ID_MSG_CONFIG_PROVIDE_DEFAULT_APIGW_ACCESS_TOKEN, } diff --git a/wski18n/i18n_resources.go b/wski18n/i18n_resources.go index d0e2c37..07b2822 100644 --- a/wski18n/i18n_resources.go +++ b/wski18n/i18n_resources.go @@ -92,12 +92,12 @@ func wski18nResourcesDe_deAllJson() (*asset, error) { return nil, err } - info := bindataFileInfo{name: "wski18n/resources/de_DE.all.json", size: 0, mode: os.FileMode(420), modTime: time.Unix(1539631576, 0)} + info := bindataFileInfo{name: "wski18n/resources/de_DE.all.json", size: 0, mode: os.FileMode(436), modTime: time.Unix(1566374831, 0)} a := {bytes: bytes, info: info} return a, nil } -var _wski18nResourcesEn_usAllJson = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x3c\x6b\x6f\x1b\x39\x92\xdf\xe7\x57\x14\x06\x0b\xcc\x2c\x20\xcb\xd9\xc5\xe1\xb0\x30\x2e\x07\x78\x13\x67\xd6\x3b\x49\x6c\xd8\xce\x0c\xe6\x12\xa3\x43\x75\x97\x24\xae\xbb\xc9\x5e\x92\x2d\x45\x63\xe8\xbf\x1f\xaa\x48\x76\xb7\
[openwhisk-wskdeploy] branch master updated: Support Description field in corresponding entities (#1057)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 8c8d6f5 Support Description field in corresponding entities (#1057) 8c8d6f5 is described below commit 8c8d6f5de40d9faea4c69a5e1b4a37c7d21b1855 Author: Alvaro Lopez Garcia AuthorDate: Tue Sep 10 18:24:16 2019 +0200 Support Description field in corresponding entities (#1057) The Description field should be supported across all entities, as it is included in the "Shared Entity Schema". Fixes: #548 --- parsers/yamlparser.go| 4 tests/dat/manifest_validate_package_grammar.yaml | 1 + tests/dat/manifest_validate_package_grammar_env_var.yaml | 1 + tests/dat/manifest_validate_trigger_action_rule_grammar.yaml | 4 4 files changed, 10 insertions(+) diff --git a/parsers/yamlparser.go b/parsers/yamlparser.go index 85864b8..b46ed98 100644 --- a/parsers/yamlparser.go +++ b/parsers/yamlparser.go @@ -113,6 +113,7 @@ type Action struct { Limits *Limits`yaml:"limits"` Inputs map[string]Parameter `yaml:"inputs"` Outputs map[string]Parameter `yaml:"outputs"` + Description string `yaml:"description,omitempty"` Annotations map[string]interface{} `yaml:"annotations,omitempty"` Include [][]string `yaml:"include,omitempty"` Exclude []string `yaml:"exclude,omitempty"` @@ -159,6 +160,7 @@ type Trigger struct { Credential string `yaml:"credential"` Inputs map[string]Parameter `yaml:"inputs"` Namestring + Description string `yaml:"description,omitempty"` Annotations map[string]interface{} `yaml:"annotations,omitempty"` // TODO() this is propoagated from package to trigger within that package //Parameters map[string]interface{} `yaml:parameters` @@ -185,6 +187,7 @@ type Rule struct { Rule string `yaml:"rule"` //used in manifest.yaml //mapping to wsk.Rule.Name Namestring + Description string `yaml:"description,omitempty"` Annotations map[string]interface{} `yaml:"annotations,omitempty"` } @@ -216,6 +219,7 @@ type Package struct { Rulesmap[string]Rule `yaml:"rules"` Inputs map[string]Parameter `yaml:"inputs"` Sequencesmap[string]Sequence `yaml:"sequences"` + Description string `yaml:"description,omitempty"` Annotations map[string]interface{} `yaml:"annotations,omitempty"` Apis map[string]map[string]map[string]map[string]APIMethodResponse `yaml:"apis"` } diff --git a/tests/dat/manifest_validate_package_grammar.yaml b/tests/dat/manifest_validate_package_grammar.yaml index ff9a047..c400d4f 100644 --- a/tests/dat/manifest_validate_package_grammar.yaml +++ b/tests/dat/manifest_validate_package_grammar.yaml @@ -20,3 +20,4 @@ packages: helloworld: version: 1.0 license: Apache-2.0 +description: Foo Bar diff --git a/tests/dat/manifest_validate_package_grammar_env_var.yaml b/tests/dat/manifest_validate_package_grammar_env_var.yaml index e439114..05769f7 100644 --- a/tests/dat/manifest_validate_package_grammar_env_var.yaml +++ b/tests/dat/manifest_validate_package_grammar_env_var.yaml @@ -20,6 +20,7 @@ packages: $package_name: version: 1.0 license: Apache-2.0 +description: Foo Bar $package_name_second: version: 1.0 license: Apache-2.0 diff --git a/tests/dat/manifest_validate_trigger_action_rule_grammar.yaml b/tests/dat/manifest_validate_trigger_action_rule_grammar.yaml index b0cbb13..bee6ef3 100644 --- a/tests/dat/manifest_validate_trigger_action_rule_grammar.yaml +++ b/tests/dat/manifest_validate_trigger_action_rule_grammar.yaml @@ -22,8 +22,10 @@ packages: license: Apache-2.0 actions: first_action: +description: Foo Bar 1 function: actions/dump_params.js second_action: +description: Foo Bar 2 function: actions/dump_params.js third_action: function: actions/dump_params.js @@ -32,9 +34,11 @@ packages: trigger2: rules: rule
[openwhisk-wskdeploy] branch master updated: Honor WSK_CONFIG_FILE if variable is set (#1054)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 479d769 Honor WSK_CONFIG_FILE if variable is set (#1054) 479d769 is described below commit 479d769c569dda174ba3e04318378e581acd6750 Author: Alvaro Lopez Garcia AuthorDate: Tue Sep 10 01:34:48 2019 + Honor WSK_CONFIG_FILE if variable is set (#1054) The OpenWhisk CLI (wsk) allows to set the WSK_CONFIG_FILE to point to the configuration file. wskdeploy does not honor this environment variable and it only relies on the --config flag. This change allows to use the environment variable (if present), making it consistent with the wsk CLI behaviour. Fixes #809 Fixes #436 --- cmd/root.go | 35 +++ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/cmd/root.go b/cmd/root.go index 57c8966..44f5e88 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -102,20 +102,31 @@ func init() { func initConfig() { userHome := utils.GetHomeDirectory() defaultPath := path.Join(userHome, whisk.DEFAULT_LOCAL_CONFIG) - if utils.Flags.CfgFile != "" { - // Read the file as a wskprops file, to check if it is valid. - _, err := whisk.ReadProps(utils.Flags.CfgFile) - if err != nil { - utils.Flags.CfgFile = defaultPath - warn := wski18n.T(wski18n.ID_WARN_CONFIG_INVALID_X_path_X, - map[string]interface{}{ - wski18n.KEY_PATH: utils.Flags.CfgFile}) - wskprint.PrintOpenWhiskWarning(warn) - } + // Precedence order for reading the configuration file should be: + // 1. --config + // 2. ENV variable WSK_CONFIG_FILE + // 3. Default $HOME/.wskprops + cfgFiles := []string{ + utils.Flags.CfgFile, + os.Getenv("WSK_CONFIG_FILE"), + defaultPath, + } - } else { - utils.Flags.CfgFile = defaultPath + for _, cfgFile := range cfgFiles { + if cfgFile != "" { + // Read the file as a wskprops file, to check if it is valid. + _, err := whisk.ReadProps(cfgFile) + if err != nil { + warn := wski18n.T(wski18n.ID_WARN_CONFIG_INVALID_X_path_X, + map[string]interface{}{ + wski18n.KEY_PATH: utils.Flags.CfgFile}) + wskprint.PrintOpenWhiskWarning(warn) + } else { + utils.Flags.CfgFile = cfgFile + break + } + } } }
[openwhisk-runtime-java] branch master updated: Update to AdoptOpenJDK's JDK8-OpenJ9 Critical Patch Update v0.15.1 (#98)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-java.git The following commit(s) were added to refs/heads/master by this push: new 6508577 Update to AdoptOpenJDK's JDK8-OpenJ9 Critical Patch Update v0.15.1 (#98) 6508577 is described below commit 65085770fa2441a88300d54a53568a4e5440f93f Author: Matt Rutkowski AuthorDate: Mon Sep 9 08:31:01 2019 -0500 Update to AdoptOpenJDK's JDK8-OpenJ9 Critical Patch Update v0.15.1 (#98) * Update to AdoptOpenJDK's JDK8-OpenJ9 Critical Patch Update v0.15.1 * ActionLoop requires tools.jar from Oracle JDK8 * Update UPDATE and BUILD env. vars. * Actually use the JDK... * put back old jdk for actionloop * put back old jdk for actionloop * Use AdoptOpen JDK8, OpenJ9 release version 0.15.1 for java8actionloop --- core/java8/Dockerfile | 7 --- core/java8actionloop/Dockerfile | 7 --- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/core/java8/Dockerfile b/core/java8/Dockerfile index abc0112..be41f27 100644 --- a/core/java8/Dockerfile +++ b/core/java8/Dockerfile @@ -15,7 +15,8 @@ # limitations under the License. # -FROM adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u212-b04_openj9-0.14.2 +# Use AdoptOpenJDK's JDK8, OpenJ9 Critical Patch Update (CPU) release version 0.15.1 +FROM adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u222-b10_openj9-0.15.1 RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update \ && apt-get install -y --no-install-recommends locales \ @@ -26,8 +27,8 @@ ENV LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ LC_ALL="en_US.UTF-8" \ VERSION=8 \ - UPDATE=162 \ - BUILD=12 + UPDATE=222 \ + BUILD=10 ADD proxy /javaAction diff --git a/core/java8actionloop/Dockerfile b/core/java8actionloop/Dockerfile index 83f5507..880f9dc 100644 --- a/core/java8actionloop/Dockerfile +++ b/core/java8actionloop/Dockerfile @@ -17,7 +17,8 @@ FROM golang:1.12 as builder RUN env CGO_ENABLED=0 go get github.com/apache/openwhisk-runtime-go/main -FROM adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u212-b04 +# Use AdoptOpen JDK8, OpenJ9 release version 0.15.1 +FROM adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u222-b10_openj9-0.15.1 RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update \ && apt-get install -y --no-install-recommends locales python vim \ @@ -28,8 +29,8 @@ ENV LANG="en_US.UTF-8" \ LANGUAGE="en_US:en" \ LC_ALL="en_US.UTF-8" \ VERSION=8 \ - UPDATE=212 \ - BUILD=3 + UPDATE=222 \ + BUILD=10 RUN locale-gen en_US.UTF-8 ;\ mkdir -p /javaAction/action /usr/java/src /usr/java/lib
[openwhisk-runtime-java] branch master updated: Update to new jdk base images. (#95)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-java.git The following commit(s) were added to refs/heads/master by this push: new a8e666f Update to new jdk base images. (#95) a8e666f is described below commit a8e666f7b38d533192fce897342037f4ca570a41 Author: falkzoll AuthorDate: Wed Aug 21 04:22:19 2019 +0200 Update to new jdk base images. (#95) - Update core/java8 to adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u212-b04_openj9-0.14.2 This will add container awareness and will adjust the heap size of the JVM according to the memory limit the container has. - Update core/java8actionloop to adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u212-b04. --- core/java8/CHANGELOG.md | 5 + core/java8/Dockerfile | 2 +- core/java8actionloop/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/java8/CHANGELOG.md b/core/java8/CHANGELOG.md index 4bbd41e..970771c 100644 --- a/core/java8/CHANGELOG.md +++ b/core/java8/CHANGELOG.md @@ -19,6 +19,11 @@ # Java 8 OpenWhisk Runtime Container +## 1.1.4 +Changes: +- Update jdk adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u212-b04_openj9-0.14.2 [jdk8u181-b13_openj9-0.9.0](https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/tags/) + Starting with [openj9-0.11.0}(https://github.com/eclipse/openj9/blob/b44844b02466ddf195eb9d8d6587ed89374a5f2a/doc/release-notes/0.11/0.11.md) container awareness is activated by default. This means, when the VM is running in a container, and a memory limit is set, the VM allocates more memory to the Java heap. Depending on the size of the memory limit. + ## 1.1.3 Changes: - Update jdk x86_64-ubuntu-jdk8u181-b13_openj9-0.9.0 and push latest hash [jdk8u181-b13_openj9-0.9.0](https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/tags/) [#77](https://github.com/apache/openwhisk-runtime-java/pull/77/files) diff --git a/core/java8/Dockerfile b/core/java8/Dockerfile index 3426869..abc0112 100644 --- a/core/java8/Dockerfile +++ b/core/java8/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -FROM adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u181-b13_openj9-0.9.0 +FROM adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u212-b04_openj9-0.14.2 RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update \ && apt-get install -y --no-install-recommends locales \ diff --git a/core/java8actionloop/Dockerfile b/core/java8actionloop/Dockerfile index 847537f..83f5507 100644 --- a/core/java8actionloop/Dockerfile +++ b/core/java8actionloop/Dockerfile @@ -17,7 +17,7 @@ FROM golang:1.12 as builder RUN env CGO_ENABLED=0 go get github.com/apache/openwhisk-runtime-go/main -FROM adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u212-b03 +FROM adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u212-b04 RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update \ && apt-get install -y --no-install-recommends locales python vim \
[openwhisk-runtime-java] branch master updated: tlp: remove incubator references (#96)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-java.git The following commit(s) were added to refs/heads/master by this push: new 1c78fcb tlp: remove incubator references (#96) 1c78fcb is described below commit 1c78fcb6b7d75bfed8e7da7a8c85f1b93d9d5d4d Author: David Grove AuthorDate: Tue Aug 20 19:41:49 2019 -0400 tlp: remove incubator references (#96) --- .github/ISSUE_TEMPLATE.md | 2 +- core/java8/CHANGELOG.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 8ff1432..049789d 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -14,7 +14,7 @@ information shown below. If you are reporting an enhancement request, please include information on what you are trying to achieve and why that enhancement would help you. For more information about reporting issues, see -https://github.com/apache/incubator-openwhisk/blob/master/CONTRIBUTING.md#raising-issues +https://github.com/apache/openwhisk/blob/master/CONTRIBUTING.md#raising-issues Use the commands below to provide key information from your environment: You do not have to include this information if this is a feature request. diff --git a/core/java8/CHANGELOG.md b/core/java8/CHANGELOG.md index 62cd6e0..4bbd41e 100644 --- a/core/java8/CHANGELOG.md +++ b/core/java8/CHANGELOG.md @@ -21,11 +21,11 @@ ## 1.1.3 Changes: -- Update jdk x86_64-ubuntu-jdk8u181-b13_openj9-0.9.0 and push latest hash [jdk8u181-b13_openj9-0.9.0](https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/tags/) [#77](https://github.com/apache/incubator-openwhisk-runtime-java/pull/77/files) +- Update jdk x86_64-ubuntu-jdk8u181-b13_openj9-0.9.0 and push latest hash [jdk8u181-b13_openj9-0.9.0](https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/tags/) [#77](https://github.com/apache/openwhisk-runtime-java/pull/77/files) ## 1.1.2 Changes: -- Update run handler to accept more environment variables [#67](https://github.com/apache/incubator-openwhisk-runtime-java/pull/67) +- Update run handler to accept more environment variables [#67](https://github.com/apache/openwhisk-runtime-java/pull/67) ## 1.1.1 Changes:
[openwhisk-wskdeploy] branch master updated: Update version of whisk modules (#1067)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 538a248 Update version of whisk modules (#1067) 538a248 is described below commit 538a248d69ac8a1db3a1d8e2162029a6a76549e7 Author: 김건희 AuthorDate: Tue Aug 20 21:46:19 2019 +0900 Update version of whisk modules (#1067) --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0a60d48..bc5c8d0 100644 --- a/build.gradle +++ b/build.gradle @@ -62,8 +62,8 @@ dependencies { build(['name':'github.com/nicksnyder/go-i18n/i18n/bundle', 'version':'991e81cc94f6c54209edb3192cb98e3995ad71c1', 'transitive':false]) build(['name':'github.com/nicksnyder/go-i18n/i18n/language', 'version':'991e81cc94f6c54209edb3192cb98e3995ad71c1', 'transitive':false]) build(['name':'github.com/nicksnyder/go-i18n/i18n/translation', 'version':'991e81cc94f6c54209edb3192cb98e3995ad71c1', 'transitive':false]) -build(['name':'github.com/apache/openwhisk-client-go/whisk', 'version':'7862108c109b7f1bbb47d66edb0a35d4a3c080a7', 'transitive':false]) -build(['name':'github.com/apache/openwhisk-client-go/wski18n', 'version':'7862108c109b7f1bbb47d66edb0a35d4a3c080a7', 'transitive':false]) +build(['name':'github.com/apache/openwhisk-client-go/whisk', 'version':'d8ccb1442651beee6a9245913e3ca0cb182888b1', 'transitive':false]) +build(['name':'github.com/apache/openwhisk-client-go/wski18n', 'version':'d8ccb1442651beee6a9245913e3ca0cb182888b1', 'transitive':false]) build(['name':'github.com/pelletier/go-buffruneio', 'version':'df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d', 'transitive':false]) build(['name':'github.com/pelletier/go-toml', 'version':'45932ad32dfdd20826f5671da37a5f3ce9f26a8d', 'transitive':false]) build(['name':'github.com/spf13/afero', 'version':'06b7e5f50606ecd49148a01a6008942d9b669217', 'transitive':false])
[openwhisk-runtime-nodejs] branch master updated (0a47633 -> d307390)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-nodejs.git. from 0a47633 Adding Knative Docs (#120) add d307390 Adding Knative Tests Files (#121) No new revisions were added by this update. Summary of changes: tests/src/test/knative/README.md | 280 + tests/src/test/knative/helloworld/README.md| 74 ++ tests/src/test/knative/helloworld/build.yaml.tmpl | 23 ++ .../helloworld/payload-knative-init-run.http | 25 ++ .../knative/helloworld/payload-openwhisk-init.http | 13 + .../knative/helloworld/payload-openwhisk-run.http | 15 ++ .../src/test/knative/helloworld/service.yaml.tmpl | 12 + .../test/knative/helloworldwithparams/README.md| 74 ++ .../build-without-code.yaml.tmpl | 19 ++ .../knative/helloworldwithparams/build.yaml.tmpl | 23 ++ .../knative-data-init-run.json | 20 ++ .../helloworldwithparams/knative-data-init.json| 8 + .../helloworldwithparams/knative-data-run.json | 14 ++ .../helloworldwithparams/openwhisk-data-init.json | 8 + .../helloworldwithparams/openwhisk-data-run.json | 12 + .../payload-knative-init-run.http | 25 ++ .../helloworldwithparams/payload-knative-init.http | 13 + .../helloworldwithparams/payload-knative-run.http | 19 ++ .../payload-openwhisk-init.http| 13 + .../payload-openwhisk-run.http | 17 ++ .../knative/helloworldwithparams/service.yaml.tmpl | 12 + .../src/test/knative/webactionhelloworld/README.md | 75 ++ .../build-without-code.yaml.tmpl | 20 ++ .../knative/webactionhelloworld/build.yaml.tmpl| 24 ++ .../webactionhelloworld/knative-data-init-run.json | 19 ++ .../webactionhelloworld/knative-data-init.json | 8 + .../webactionhelloworld/knative-data-run.json | 13 + .../webactionhelloworld/openwhisk-data-init.json | 8 + .../webactionhelloworld/openwhisk-data-run.json| 11 + .../payload-knative-init-run.http | 24 ++ .../payload-openwhisk-init.http| 13 + .../webactionhelloworld/payload-openwhisk-run.http | 16 ++ .../knative/webactionhelloworld/service.yaml.tmpl | 12 + tests/src/test/knative/webactionraw/README.md | 76 ++ .../src/test/knative/webactionraw/build.yaml.tmpl | 26 ++ .../test/knative/webactionraw/data-init-run.json | 20 ++ tests/src/test/knative/webactionraw/data-init.json | 8 + tests/src/test/knative/webactionraw/data-run.json | 11 + .../webactionraw/payload-knative-init-run.http | 25 ++ .../webactionraw/payload-openwhisk-init.http | 13 + .../webactionraw/payload-openwhisk-run.http| 16 ++ .../test/knative/webactionraw/service.yaml.tmpl| 12 + 42 files changed, 1169 insertions(+) create mode 100644 tests/src/test/knative/README.md create mode 100644 tests/src/test/knative/helloworld/README.md create mode 100644 tests/src/test/knative/helloworld/build.yaml.tmpl create mode 100644 tests/src/test/knative/helloworld/payload-knative-init-run.http create mode 100644 tests/src/test/knative/helloworld/payload-openwhisk-init.http create mode 100644 tests/src/test/knative/helloworld/payload-openwhisk-run.http create mode 100644 tests/src/test/knative/helloworld/service.yaml.tmpl create mode 100644 tests/src/test/knative/helloworldwithparams/README.md create mode 100644 tests/src/test/knative/helloworldwithparams/build-without-code.yaml.tmpl create mode 100644 tests/src/test/knative/helloworldwithparams/build.yaml.tmpl create mode 100644 tests/src/test/knative/helloworldwithparams/knative-data-init-run.json create mode 100644 tests/src/test/knative/helloworldwithparams/knative-data-init.json create mode 100644 tests/src/test/knative/helloworldwithparams/knative-data-run.json create mode 100644 tests/src/test/knative/helloworldwithparams/openwhisk-data-init.json create mode 100644 tests/src/test/knative/helloworldwithparams/openwhisk-data-run.json create mode 100644 tests/src/test/knative/helloworldwithparams/payload-knative-init-run.http create mode 100644 tests/src/test/knative/helloworldwithparams/payload-knative-init.http create mode 100644 tests/src/test/knative/helloworldwithparams/payload-knative-run.http create mode 100644 tests/src/test/knative/helloworldwithparams/payload-openwhisk-init.http create mode 100644 tests/src/test/knative/helloworldwithparams/payload-openwhisk-run.http create mode 100644 tests/src/test/knative/helloworldwithparams/service.yaml.tmpl create mode 100644 tests/src/test/knative/webactionhelloworld/README.md create mode 100644 tests/src/test/knative/webactionhelloworld/build-without-code.yaml.tmpl create mode 100644 tests/src/test/knative/webactionhelloworld/build.yaml.tmpl create mode 100644 tests/src
[openwhisk-runtime-nodejs] branch master updated: Adding Knative Docs (#120)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-nodejs.git The following commit(s) were added to refs/heads/master by this push: new 0a47633 Adding Knative Docs (#120) 0a47633 is described below commit 0a476330aadd9017c6a0d0c19e38450b82c198f0 Author: Priti Desai AuthorDate: Mon Aug 19 10:30:01 2019 -0700 Adding Knative Docs (#120) * adding knative docs * updating the list of tests --- ...ive Build for OpenWhisk Runtimes 2019-03-14.pdf | Bin 0 -> 2706323 bytes ...ve Build for OpenWhisk Runtimes 2019-03-14.pptx | Bin 0 -> 491839 bytes docs/media/demo-nodejs-helloworld.gif | Bin 0 -> 10489477 bytes docs/users/knative-build.md| 525 + 4 files changed, 525 insertions(+) diff --git a/docs/media/Knative Build for OpenWhisk Runtimes 2019-03-14.pdf b/docs/media/Knative Build for OpenWhisk Runtimes 2019-03-14.pdf new file mode 100644 index 000..b5a26c0 Binary files /dev/null and b/docs/media/Knative Build for OpenWhisk Runtimes 2019-03-14.pdf differ diff --git a/docs/media/Knative Build for OpenWhisk Runtimes 2019-03-14.pptx b/docs/media/Knative Build for OpenWhisk Runtimes 2019-03-14.pptx new file mode 100644 index 000..d67ee80 Binary files /dev/null and b/docs/media/Knative Build for OpenWhisk Runtimes 2019-03-14.pptx differ diff --git a/docs/media/demo-nodejs-helloworld.gif b/docs/media/demo-nodejs-helloworld.gif new file mode 100644 index 000..c84aee5 Binary files /dev/null and b/docs/media/demo-nodejs-helloworld.gif differ diff --git a/docs/users/knative-build.md b/docs/users/knative-build.md new file mode 100644 index 000..b1a2e96 --- /dev/null +++ b/docs/users/knative-build.md @@ -0,0 +1,525 @@ + + +# OpenWhisk NodeJS Runtimes for Knative + +[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) + +This document explains how to Build and Serve Knative compatible OpenWhisk applications on Kubernetes. + +## Pre-requisites + +The general pre-requisites are as follows: +- [x] Kubernetes v1.13.0 +- [x] kubectl +- [x] Knative v0.3.0 + +Specifically, for development and testing on Mac OS, the following components and versions were used: + +- [x] [Docker Desktop for Mac Docker Community Edition 2.0.1.0 2019-01-11](https://docs.docker.com/docker-for-mac/edge-release-notes/) which includes: +- Docker 18.09.1 +- Kubernetes 1.13.0 +- [x] [Kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) (```brew install kubernetes-cli```) +- [x] [Knative 0.3.0](https://github.com/knative/serving/releases/tag/v0.3.0) (which will install and configure istio-1.0.1 compatible resources) + +### Docker Desktop Minimum Configuration + +Under the Docker Desktop menu select "**Preferences**"->"**Advanced**" and set these values to at least these minimums: +- [x] **CPUs: 4** +- [x] **Memory: 8.0 GiB** +- [x] **Swap: 1.0 GiB** + +Under the Docker Desktop **Kubernetes** tab, please assure that Kubernetes is **enabled** and running. + +### Verify Kubernetes Installation + +Use the following command to verify the Kubernetes **Server Version** indicates version 1.13: + +```bash +$ kubectl version + +Client Version: version.Info{Major:"1", Minor:"13", GitVersion:"v1.13.2", GitCommit:"cff46ab41ff0bb44d8584413b598ad8360ec1def", GitTreeState:"clean", BuildDate:"2019-01-13T23:15:13Z", GoVersion:"go1.11.4", Compiler:"gc", Platform:"darwin/amd64"} +Server Version: version.Info{Major:"1", Minor:"13", GitVersion:"v1.13.0", GitCommit:"ddf47ac13c1a9483ea035a79cd7c10005ff21a6d", GitTreeState:"clean", BuildDate:"2018-12-03T20:56:12Z", GoVersion:"go1.11.2", Compiler:"gc", Platform:"linux/amd64"} +``` + +The ```Server Version``` is the version for the Kubernetes service; the ```Client Version``` is for the Kubernetes CLI (i.e., ```kubectl```). + + Verify you have a Kubernetes v1.13.0 node ready +``` +$ kubectl get nodes + +NAME STATUSROLES AGE VERSION +docker-desktop Ready master4d22h v1.13.0 +``` + + Verify all Kubernetes pods are running + +``` +$ kubectl get pods --namespace kube-system +``` + +Sample output + +``` +NAME READY STATUSRESTARTS AGE +coredns-86c58d9df4-ms8qs 1/1 Running 0 4d22h +coredns-86c58d9df4-x29vt 1/1 Running 0 4d22h +etcd-docker-desktop 1/1 Running 1 4d22h +kube-apiserver-docker-desktop1/1 Running 1 4d22h +kube-controller-manager-docker-desktop 1/1 R
[openwhisk-runtime-nodejs] branch master updated: tlp: remove incubator references (#147)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-nodejs.git The following commit(s) were added to refs/heads/master by this push: new e90 tlp: remove incubator references (#147) e90 is described below commit e9076f2cd13de71210598811d5ec90848b26 Author: David Grove AuthorDate: Mon Aug 19 11:04:58 2019 -0400 tlp: remove incubator references (#147) --- .github/ISSUE_TEMPLATE.md | 2 +- .travis.yml | 4 ++-- README.md | 12 ++-- core/nodejs10Action/package.json | 2 +- core/nodejs12Action/package.json | 2 +- core/nodejs6Action/CHANGELOG.md | 6 +++--- core/nodejs8Action/CHANGELOG.md | 6 +++--- core/nodejs8Action/package.json | 2 +- core/nodejsActionBase/platform/knative.js | 2 +- tools/travis/build.sh | 2 +- tools/travis/setup.sh | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 8ff1432..049789d 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -14,7 +14,7 @@ information shown below. If you are reporting an enhancement request, please include information on what you are trying to achieve and why that enhancement would help you. For more information about reporting issues, see -https://github.com/apache/incubator-openwhisk/blob/master/CONTRIBUTING.md#raising-issues +https://github.com/apache/openwhisk/blob/master/CONTRIBUTING.md#raising-issues Use the commands below to provide key information from your environment: You do not have to include this information if this is a feature request. diff --git a/.travis.yml b/.travis.yml index 4b013af..67763c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,12 +39,12 @@ deploy: on: tags: true all_branches: true - repo: apache/incubator-openwhisk-runtime-nodejs + repo: apache/openwhisk-runtime-nodejs - provider: script script: "./tools/travis/publish.sh openwhisk 6 nightly && ./tools/travis/publish.sh openwhisk 8 nightly && ./tools/travis/publish.sh openwhisk 10 nightly && ./tools/travis/publish.sh openwhisk 12 nightly" on: branch: master - repo: apache/incubator-openwhisk-runtime-nodejs + repo: apache/openwhisk-runtime-nodejs env: global: diff --git a/README.md b/README.md index e0f67d4..baa584a 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ # Apache OpenWhisk runtimes for Node.js [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) -[![Build Status](https://travis-ci.org/apache/incubator-openwhisk-runtime-nodejs.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-runtime-nodejs) +[![Build Status](https://travis-ci.org/apache/openwhisk-runtime-nodejs.svg?branch=master)](https://travis-ci.org/apache/openwhisk-runtime-nodejs) This repository contains sources files needed to build the Node.js runtimes for Apache OpenWhisk. The build system will produce a series of docker images for each runtime version. These images are used in the platform to execute Node.js actions. @@ -33,7 +33,7 @@ The following Node.js runtime versions (with kind & image labels) are generated This README documents the build, customisation and testing of these runtime images. -**Do you want to learn more about using Node.js actions to build serverless applications?** Please see the main project documentation [here](https://github.com/apache/incubator-openwhisk/blob/master/docs/actions-nodejs.md) for that information. +**Do you want to learn more about using Node.js actions to build serverless applications?** Please see the main project documentation [here](https://github.com/apache/openwhisk/blob/master/docs/actions-nodejs.md) for that information. ## Usage @@ -82,7 +82,7 @@ If you build a custom version of the images, pushing those an external Docker Hu ### Runtimes Manifest -Available runtimes in Apache OpenWhisk are defined using the runtimes manifest in this file: [runtimes.json](https://github.com/apache/incubator-openwhisk/blob/9dacce433cfdd64aa1e4f5c8eab6db31df8c4eae/ansible/files/runtimes.json#L3-L52) +Available runtimes in Apache OpenWhisk are defined using the runtimes manifest in this file: [runtimes.json](https://github.com/apache/openwhisk/blob/9dacce433cfdd64aa1e4f5c8eab6db31df8c4eae/ansible/files/runtimes.json#L3-L52) Modify the manifest and re-deploy the platform to pick up local images changes. @@ -90,7 +90,7 @@ Modify the manifest and re-deploy the platform to pick up local images changes. Dockerfiles for runtime images are defined in the `core` directory. Each runtime v
[openwhisk-cli] branch master updated: WIP - Remove 'incubat(ing, ion, or)' designation and disclaimer (#454)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-cli.git The following commit(s) were added to refs/heads/master by this push: new 07993fd WIP - Remove 'incubat(ing, ion, or)' designation and disclaimer (#454) 07993fd is described below commit 07993fd22c5618ee153eade186369d7d6084d1b7 Author: Matt Rutkowski AuthorDate: Fri Aug 9 18:54:59 2019 -0500 WIP - Remove 'incubat(ing, ion, or)' designation and disclaimer (#454) * Remove 'incubat(ing, ion, or)' designation and disclaimer * Updating commit hash in build.gradle; not sure how to regen vendor.json * used 'govendor update +vendor' to update vendor.json... i think * update commit hash for 'client-go' in build.gradle * update commit hash for 'client-go' in build.gradle --- .gitignore| 2 +- .travis.yml | 14 ++-- CONTRIBUTING.md | 14 ++-- DISCLAIMER.txt| 1 - README.md | 14 ++-- build.gradle | 6 +- commands/action.go| 4 +- commands/activation.go| 4 +- commands/api.go | 4 +- commands/commands.go | 4 +- commands/namespace.go | 4 +- commands/package.go | 4 +- commands/project.go | 8 +- commands/property.go | 4 +- commands/qualified_name.go| 4 +- commands/rule.go | 4 +- commands/sdk.go | 4 +- commands/shared.go| 4 +- commands/trigger.go | 4 +- commands/trigger_test.go | 2 +- commands/util.go | 4 +- commands/wsk.go | 2 +- main.go | 6 +- tests/build.gradle| 2 +- tests/src/integration/command_test.go | 2 +- tests/src/integration/common/utils.go | 2 +- tests/src/integration/common/wsk.go | 2 +- tests/src/integration/integration_test.go | 2 +- tools/travis/test_openwhisk.sh| 14 ++-- vendor/vendor.json| 132 +- 30 files changed, 145 insertions(+), 132 deletions(-) diff --git a/.gitignore b/.gitignore index bbc885e..1128fb1 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ Godeps/_workspace build /release/ /vendor/*/ -incubator-openwhisk-cli.iml +openwhisk-cli.iml wski18n/i18n_resources.go bin/ tests/build/ diff --git a/.travis.yml b/.travis.yml index 7468377..cbeb9e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,13 +55,13 @@ before_script: - GO_FILES=$(find . -iname '*.go' -type f | grep -v /vendor/) - test -z "$(gofmt -s -l $(echo $GO_FILES))" - cd $TRAVIS_BUILD_DIR/.. - - git clone https://github.com/apache/incubator-openwhisk-utilities.git - - git clone https://github.com/apache/incubator-openwhisk.git - - cd incubator-openwhisk + - git clone https://github.com/apache/openwhisk-utilities.git + - git clone https://github.com/apache/openwhisk.git + - cd openwhisk - ./tools/travis/setup.sh script: - - cd $TRAVIS_BUILD_DIR/../incubator-openwhisk + - cd $TRAVIS_BUILD_DIR/../openwhisk - ./gradlew install - cd $TRAVIS_BUILD_DIR - export BUILD_VERSION="latest" @@ -92,9 +92,9 @@ before_deploy: git config --global user.name "Travis CI"; export GIT_TAG="latest"; git tag -d $GIT_TAG; - git push -q https://$api_...@github.com/apache/incubator-openwhisk-cli :refs/tags/$GIT_TAG; + git push -q https://$api_...@github.com/apache/openwhisk-cli :refs/tags/$GIT_TAG; GIT_COMMITTER_DATE="$(git show --format=%aD | head -1)" git tag $GIT_TAG -a -m "Generated tag from Travis CI build $TRAVIS_BUILD_NUMBER"; - git push -f -q https://$api_...@github.com/apache/incubator-openwhisk-cli $GIT_TAG; + git push -f -q https://$api_...@github.com/apache/openwhisk-cli $GIT_TAG; fi - echo "The GIT_TAG of this Travis build is $GIT_TAG." @@ -111,6 +111,6 @@ deploy: target_commitish: $TRAVIS_COMMIT tag_name: $GIT_TAG on: -repo: apache/incubator-openwhisk-cli +repo: apache/openwhisk-cli tags: $TAG condition: "$DEPLOY_BUILD_READY = true" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6f47075..a072322 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,7 +29,7 @@ created a directory named $GOPATH/src/github.com/apache/ and download the source ``` $ cd $GOPATH/src/github.com/apache/ -$ git clone https://github.com/apache/incubator-openwhisk-cli.git +$ git cl
[openwhisk-wskdeploy] branch master updated: Remove 'incubat(ing, ion, or)' designation and disclaimer from all files (#1065)
This is an automated email from the ASF dual-hosted git repository. mrutkowski 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 cbe7c52 Remove 'incubat(ing, ion, or)' designation and disclaimer from all files (#1065) cbe7c52 is described below commit cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2 Author: Matt Rutkowski AuthorDate: Fri Aug 9 11:04:47 2019 -0500 Remove 'incubat(ing, ion, or)' designation and disclaimer from all files (#1065) * Remove 'incubat(ing, ion, or)' designation and disclaimer * update i18n resource file * Update GoDeps to refernce the commit hash post repo. rename * Put back incubator-openwhisk-test references --- .gitignore | 1 - .travis.yml| 8 ++--- CONTRIBUTING.md| 2 +- DISCLAIMER.txt | 1 - Dockerfile | 12 +++ Godeps/Godeps.json | 10 +++--- README.md | 42 ++ build.gradle | 6 ++-- build.sh | 2 +- cmd/export.go | 14 cmd/report.go | 4 +-- cmd/root.go| 16 - cmd/root_test.go | 4 +-- cmd/sync.go| 4 +-- cmd/undeploy.go| 2 +- cmd/utils.go | 4 +-- cmd/version.go | 6 ++-- conductor/conductor.go | 2 +- conductor/conductor_test.go| 2 +- dependencies/dependencies.go | 2 +- deployers/deploymentreader.go | 12 +++ deployers/deploymentreader_test.go | 6 ++-- deployers/manifestreader.go| 12 +++ deployers/manifestreader_test.go | 12 +++ deployers/projectreader.go | 14 deployers/servicedeployer.go | 14 deployers/whiskclient.go | 12 +++ deployers/whiskclient_test.go | 8 ++--- docs/creating_tagged_releases.md | 4 +-- docs/export.md | 8 ++--- docs/programming_guide.md | 2 +- docs/sync_projects_between_client_and_server.md| 8 ++--- docs/wskdeploy_action_helloworld.md| 2 +- docs/wskdeploy_apigateway_helloworld.md| 2 +- docs/wskdeploy_apigateway_http.md | 2 +- docs/wskdeploy_apigateway_http_sequence.md | 2 +- docs/wskdeploy_apigateway_sequence.md | 2 +- docs/wskdeploy_debugging.md| 4 +-- docs/wskdeploy_package_minimal.md | 6 ++-- docs/wskdeploy_triggerrule_basic.md| 2 +- docs/wskdeploy_triggerrule_trigger_bindings.md | 2 +- main.go| 4 +-- parsers/deploy_parser.go | 4 +-- parsers/manifest_parser.go | 20 +-- parsers/manifest_parser_test.go| 12 +++ parsers/parameters.go | 6 ++-- parsers/yamlparser.go | 6 ++-- runtimes/runtimes.go | 12 +++ specification/html/images/images.md| 4 +-- specification/html/spec_actions.md | 2 +- specification/html/spec_apis.md| 4 +-- specification/html/spec_rule.md| 2 +- specification/html/spec_trigger.md | 2 +- tests/README.md| 28 +++ tests/apps/openwhisk-githubslackbot/README.md | 10 +++--- tests/apps/openwhisk-githubslackbot/manifest.yaml | 2 +- tests/apps/owbp-cloudant-trigger/manifest-bp.json | 2 +- .../owbp-cloudant-trigger_test.go | 4 +-- ...manifest_data_compose_actions_for_function.yaml | 2 +- ...mpose_actions_for_function_with_remote_dir.yaml | 2 +- tests/dat/manifest_validate_dependencies.yaml | 3 -- .../integration/alarmtrigger/alarmtrigger_test.go | 6 ++-- .../src/integration/apigateway/apigateway_test.go | 4 +-- tests/src/integration/cloudant/README.md | 8 ++--- tests/src/integration/cloudant/cloudant_test.go| 4 +-- tests/src/integration/common/wskdeploy.go | 14 tests/src/integration/conductor/conductor_test.go | 4
[openwhisk-client-go] branch master updated: Remove 'incubat(ing, ion, or)' designation and disclaimer (#126)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-client-go.git The following commit(s) were added to refs/heads/master by this push: new d8ccb14 Remove 'incubat(ing, ion, or)' designation and disclaimer (#126) d8ccb14 is described below commit d8ccb1442651beee6a9245913e3ca0cb182888b1 Author: Matt Rutkowski AuthorDate: Thu Aug 8 13:15:16 2019 -0500 Remove 'incubat(ing, ion, or)' designation and disclaimer (#126) --- README.md | 14 +++--- tools/travis/build.sh | 2 +- tools/travis/setup.sh | 2 +- tools/travis/test_openwhisk.sh | 8 vendor/vendor.json | 2 +- whisk/action.go| 2 +- whisk/activation.go| 2 +- whisk/api.go | 2 +- whisk/client.go| 2 +- whisk/info.go | 2 +- whisk/namespace.go | 2 +- whisk/package.go | 2 +- whisk/rule.go | 2 +- whisk/sdk.go | 2 +- whisk/trigger.go | 2 +- whisk/util.go | 2 +- whisk/wskprops.go | 2 +- whisk/wskprops_test.go | 2 +- 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index abdbdfa..5ae70a7 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ # Openwhisk Client Go [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) -[![Build Status](https://travis-ci.org/apache/incubator-openwhisk-client-go.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-client-go) +[![Build Status](https://travis-ci.org/apache/openwhisk-client-go.svg?branch=master)](https://travis-ci.org/apache/openwhisk-client-go) This project `openwhisk-client-go` is a Go client library to access Openwhisk API. @@ -36,7 +36,7 @@ Make sure you select the package that fits your local environment, and [set the ### Installation After you download the source code either from the Github or the release page of OpenWhisk, you should have a directory named -_incubator-openwhisk-client-go_ to host all the source code. Please copy this root directory _incubator-openwhisk-client-go_ +_openwhisk-client-go_ to host all the source code. Please copy this root directory _openwhisk-client-go_ into the directory $GOPATH/src/github.com/apache. @@ -45,12 +45,12 @@ into the directory $GOPATH/src/github.com/apache. Open a terminal, and run the following commands to run the unit tests: ``` -$ cd $GOPATH/src/github.com/apache/incubator-openwhisk-client-go +$ cd $GOPATH/src/github.com/apache/openwhisk-client-go $ govendor sync $ go test -v ./... -tags=unit ``` -You should see all the unit tests passed. If not, please [log an issue](https://github.com/apache/incubator-openwhisk-client-go/issues) for us. +You should see all the unit tests passed. If not, please [log an issue](https://github.com/apache/openwhisk-client-go/issues) for us. ### Configuration @@ -66,13 +66,13 @@ The parameter APIVERSION is the version of OpenWhisk API to be used to access th The parameter NAMESPACE is the OpenWhisk namespace used to specify the OpenWhisk resources about to be accessed. The parameter AUTH is the authentication key used to authenticate the incoming requests to the OpenWhisk services. -For more information regarding the REST API of OpenWhisk, please refer to [OpenWhisk REST API](https://github.com/apache/incubator-openwhisk/blob/master/docs/rest_api.md). +For more information regarding the REST API of OpenWhisk, please refer to [OpenWhisk REST API](https://github.com/apache/openwhisk/blob/master/docs/rest_api.md). ### Usage ```go -import "github.com/apache/incubator-openwhisk-client-go/whisk" +import "github.com/apache/openwhisk-client-go/whisk" ``` Construct a new whisk client, then use various services to access different parts of the whisk api. For example to get the `hello` action: @@ -122,7 +122,7 @@ import ( "net/http" "net/url" - "github.com/apache/incubator-openwhisk-client-go/whisk" + "github.com/apache/openwhisk-client-go/whisk" ) func main() { diff --git a/tools/travis/build.sh b/tools/travis/build.sh index 5ca2ad3..f643834 100755 --- a/tools/travis/build.sh +++ b/tools/travis/build.sh @@ -21,7 +21,7 @@ set -e # Build script for Travis-CI. SCRIPTDIR=$(cd $(dirname "$0") && pwd) ROOTDIR="$SCRIPTDIR/../.." -UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities" +UTILDIR="$ROOTDIR/../openwhisk-utilities" # run scancode using the ASF Release configuration cd $UTILDIR diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh index d539738..264a47c 100755 --- a/tools/travis/setup.sh +++ b/tools/travis/se
[openwhisk-apigateway] branch master updated: Remove 'incubat(ing, ion, or)' designation and disclaimer (#352)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-apigateway.git The following commit(s) were added to refs/heads/master by this push: new 5025170 Remove 'incubat(ing, ion, or)' designation and disclaimer (#352) 5025170 is described below commit 50251702f49689e04aec3bd2031fd6d78cf08b89 Author: Matt Rutkowski AuthorDate: Wed Aug 7 14:34:42 2019 -0500 Remove 'incubat(ing, ion, or)' designation and disclaimer (#352) --- README.md | 2 +- tools/travis/scan.sh | 4 ++-- tools/travis/setup.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index ae8fbf6..3b6ff6c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ OpenWhisk API Gateway = -[![Build Status](https://travis-ci.org/apache/incubator-openwhisk-apigateway.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-apigateway) +[![Build Status](https://travis-ci.org/apache/openwhisk-apigateway.svg?branch=master)](https://travis-ci.org/apache/openwhisk-apigateway) [![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) A performant API Gateway based on Openresty and NGINX. diff --git a/tools/travis/scan.sh b/tools/travis/scan.sh index ad16bc2..3e6de2e 100755 --- a/tools/travis/scan.sh +++ b/tools/travis/scan.sh @@ -22,11 +22,11 @@ set -ex SCRIPTDIR="$(cd "$(dirname "$0")" && pwd)" ROOTDIR="$SCRIPTDIR/../.." HOMEDIR="$ROOTDIR/.." -UTILDIR="$HOMEDIR/incubator-openwhisk-utilities" +UTILDIR="$HOMEDIR/openwhisk-utilities" # clone OpenWhisk utilities repo. in order to run scanCode cd $HOMEDIR -git clone https://github.com/apache/incubator-openwhisk-utilities.git +git clone https://github.com/apache/openwhisk-utilities.git # run scancode util. against project source using the ASF strict configuration # exclude few bundled files from other open source projects that are MIT licensed diff --git a/tools/travis/setup.sh b/tools/travis/setup.sh index 45e866d..8d6e599 100755 --- a/tools/travis/setup.sh +++ b/tools/travis/setup.sh @@ -36,6 +36,6 @@ sudo apt-get -y install nodejs npm sudo npm install -g jshint cd $HOMEDIR # clone main openwhisk repo. for testing purposes -git clone --depth=1 https://github.com/apache/incubator-openwhisk.git openwhisk +git clone --depth=1 https://github.com/apache/openwhisk.git openwhisk cd openwhisk ./tools/travis/setup.sh
[openwhisk-website] branch master updated: remove incubator from mailing list links (#402)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/openwhisk-website.git The following commit(s) were added to refs/heads/master by this push: new 060803d remove incubator from mailing list links (#402) 060803d is described below commit 060803db7a2db391b19340d4faf6aa403648ede1 Author: David Grove AuthorDate: Tue Aug 6 10:21:21 2019 -0400 remove incubator from mailing list links (#402) --- _layouts/community.html | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_layouts/community.html b/_layouts/community.html index fe18149..a6296c8 100644 --- a/_layouts/community.html +++ b/_layouts/community.html @@ -66,9 +66,9 @@ layout: default To subscribe, unsubscribe or post our developer list, send an email message to one of the following addresses: - Subscribe: mailto:dev-subscr...@openwhisk.incubator.apache.org;>dev-subscr...@openwhisk.incubator.apache.org - Unsubscribe: mailto:dev-unsubscr...@openwhisk.incubator.apache.org;>dev-unsubscr...@openwhisk.incubator.apache.org - Post (new topic): mailto:d...@openwhisk.incubator.apache.org;>d...@openwhisk.incubator.apache.org + Subscribe: mailto:dev-subscr...@openwhisk.apache.org;>dev-subscr...@openwhisk.apache.org + Unsubscribe: mailto:dev-unsubscr...@openwhisk.apache.org;>dev-unsubscr...@openwhisk.apache.org + Post (new topic): mailto:d...@openwhisk.apache.org;>d...@openwhisk.apache.org To comment on a thread, simply reply to the message with the same subject text. @@ -127,7 +127,7 @@ layout: default Events Apache OpenWhisk events - Please reach out to community at mailto:d...@openwhisk.incubator.apache.org;>d...@openwhisk.incubator.apache.org to promote any OpenWhisk event. + Please reach out to community at mailto:d...@openwhisk.apache.org;>d...@openwhisk.apache.org to promote any OpenWhisk event. To view a list of past events please refer to the Events Archive page.
[incubator-openwhisk-client-go] branch master updated: Remove Incubat(ing, ion, or) from docs (#125)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-client-go.git The following commit(s) were added to refs/heads/master by this push: new a5bc161 Remove Incubat(ing, ion, or) from docs (#125) a5bc161 is described below commit a5bc16141268c6ff4727d01735c3abf30468b36d Author: Matt Rutkowski AuthorDate: Tue Jul 30 14:52:52 2019 -0500 Remove Incubat(ing, ion, or) from docs (#125) * Remove Incubat(ing, ion, or) from docs * explicitely set the docker image tag to nightly --- CONTRIBUTING.md| 2 +- DISCLAIMER.txt | 1 - README.md | 7 ++- tools/travis/test_openwhisk.sh | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ab2f597..10fc92a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,7 +53,7 @@ Provide as much context as possible so we can try to recreate the issue. ### Discussion Please use the project's developer email list to engage our community: -[d...@openwhisk.incubator.apache.org](d...@openwhisk.incubator.apache.org) +[d...@openwhisk.apache.org](d...@openwhisk.apache.org) In addition, we provide a "dev" Slack team channel for conversations at: https://openwhisk-team.slack.com/messages/dev/ diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt deleted file mode 100644 index fdcbcd1..000 --- a/DISCLAIMER.txt +++ /dev/null @@ -1 +0,0 @@ -Apache OpenWhisk Client Go is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that [...] diff --git a/README.md b/README.md index 530efdf..abdbdfa 100644 --- a/README.md +++ b/README.md @@ -158,12 +158,9 @@ $ go build The command above will build an executable named client in the directory alongside your source code. Execute it to see the the result: - +``` $ ./openwhisk_client_go +``` If the openWhisk service is available and your configuration is correct, you should receive the status and the actions with the above example. - - -# Disclaimer -Apache OpenWhisk Client Go is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that [...] diff --git a/tools/travis/test_openwhisk.sh b/tools/travis/test_openwhisk.sh index 043dd27..952590f 100755 --- a/tools/travis/test_openwhisk.sh +++ b/tools/travis/test_openwhisk.sh @@ -31,7 +31,7 @@ WHISKDIR="$HOMEDIR/incubator-openwhisk" cd $WHISKDIR ./tools/travis/setup.sh -ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=openwhisk" +ANSIBLE_CMD="ansible-playbook -i environments/local -e docker_image_prefix=openwhisk -e docker_image_tag=nightly" cd $WHISKDIR/ansible $ANSIBLE_CMD setup.yml
[incubator-openwhisk-apigateway] branch master updated: Remove Incubat(ing, ion, or) from docs (#349)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-apigateway.git The following commit(s) were added to refs/heads/master by this push: new 203d355 Remove Incubat(ing, ion, or) from docs (#349) 203d355 is described below commit 203d355e4a64ce2a1e06b4647c99d813131b9314 Author: Matt Rutkowski AuthorDate: Tue Jul 30 13:21:54 2019 -0500 Remove Incubat(ing, ion, or) from docs (#349) --- CONTRIBUTING.md | 2 +- DISCLAIMER.txt | 1 - README.md | 4 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e009e84..93c3110 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -55,7 +55,7 @@ Provide as much context as possible so we can try to recreate the issue. ### Discussion Please use the project's developer email list to engage our community: -[d...@openwhisk.incubator.apache.org](d...@openwhisk.incubator.apache.org) +[d...@openwhisk.apache.org](d...@openwhisk.apache.org) In addition, we provide a "dev" Slack team channel for conversations at: https://openwhisk-team.slack.com/messages/dev/ diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt deleted file mode 100644 index 5e9b1bc..000 --- a/DISCLAIMER.txt +++ /dev/null @@ -1 +0,0 @@ -Apache OpenWhisk API Gateway is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate th [...] diff --git a/README.md b/README.md index fef4d7a..ae8fbf6 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,3 @@ Then make changes to any configuration file ( i.e. `api-gateway.conf` ), save it ``` make test-run ``` - -## Disclaimer - -Apache OpenWhisk API Gateway is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate th [...]
[incubator-openwhisk-utilities] branch master updated: Remove license exclusions for Composer repo. (#68)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-utilities.git The following commit(s) were added to refs/heads/master by this push: new 4eb54be Remove license exclusions for Composer repo. (#68) 4eb54be is described below commit 4eb54befdfd6b5bdd1c862397acc51c60986 Author: Matt Rutkowski AuthorDate: Tue Jul 30 13:12:14 2019 -0500 Remove license exclusions for Composer repo. (#68) * Remove license exclusions for Composer repo. * Remove license exclusions for Composer repo. --- scancode/ASF-Release.cfg | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scancode/ASF-Release.cfg b/scancode/ASF-Release.cfg index 0ccfdb5..e4edf72 100644 --- a/scancode/ASF-Release.cfg +++ b/scancode/ASF-Release.cfg @@ -89,12 +89,8 @@ wski18n/i18n_resources.go # incubator-openwhisk-runtime-nodejs node_modules -# incubator-openwhisk-composer -bin/compose.js -bin/deploy.js - -# Exclude scancode tests that test for bad license headers -# compat.py, gitwildmatch.py, pathspec.py, pattern.py and util.py are mozilla licensed files +# Exclude scancode tests that test for bad license headers AND +# Exclude compat.py, gitwildmatch.py, pathspec.py, pattern.py and util.py are mozilla licensed files scancode/tests/exclude scancode/lib/compat.py scancode/lib/gitwildmatch.py
[incubator-openwhisk-runtime-java] branch master updated: Remove Incubat(ing, ion, or) from docs (#89)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-java.git The following commit(s) were added to refs/heads/master by this push: new 64f89c5 Remove Incubat(ing, ion, or) from docs (#89) 64f89c5 is described below commit 64f89c5cff6a62de716446a442f7c02d32610fec Author: Matt Rutkowski AuthorDate: Mon Jul 29 11:15:41 2019 -0500 Remove Incubat(ing, ion, or) from docs (#89) --- CONTRIBUTING.md | 2 +- DISCLAIMER.txt | 1 - README.md | 6 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3c0595b..d8f8faa 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -57,7 +57,7 @@ A good enhancement request comes with an explanation of what you are trying to d ### Discussion Please use the project's developer email list to engage our community: -[d...@openwhisk.incubator.apache.org](d...@openwhisk.incubator.apache.org) +[d...@openwhisk.apache.org](d...@openwhisk.apache.org) In addition, we provide a "dev" Slack team channel for conversations at: https://openwhisk-team.slack.com/messages/dev/ diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt deleted file mode 100644 index 5a91f12..000 --- a/DISCLAIMER.txt +++ /dev/null @@ -1 +0,0 @@ -Apache OpenWhisk Runtime Java is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate t [...] diff --git a/README.md b/README.md index d08395b..b5323c5 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ docker login ``` Deploy OpenWhisk using ansible environment that contains the kind `java:8` -Assuming you have OpenWhisk already deploy localy and `OPENWHISK_HOME` pointing to root directory of OpenWhisk core repository. +Assuming you have OpenWhisk already deploy locally and `OPENWHISK_HOME` pointing to root directory of OpenWhisk core repository. Set `ROOTDIR` to the root directory of this repository. @@ -163,7 +163,3 @@ The `$user_prefix` is usually your dockerhub user id. # License [Apache 2.0](LICENSE.txt) - -# Disclaimer - -Apache OpenWhisk Runtime Java is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate t [...]
[incubator-openwhisk-utilities] branch master updated: remove general path exclusions in favor of granular file-level (#67)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-utilities.git The following commit(s) were added to refs/heads/master by this push: new f65c802 remove general path exclusions in favor of granular file-level (#67) f65c802 is described below commit f65c8025c71b7c37afa7f5c713eed4fd144ddd27 Author: Matt Rutkowski AuthorDate: Fri Jul 26 09:56:08 2019 -0500 remove general path exclusions in favor of granular file-level (#67) * Update scancode to include all Dockerfile variants * Update scancode to include all Dockerfile variants * Update scancode to include all Dockerfile variants * remove general path exclusions in favor of granular file-level --- .travis.yml| 18 - scancode/ASF-Release.cfg | 45 +- scancode/test.sh | 18 - scancode/tests/exclude/mixed/good-ibm-copyright.go | 23 --- .../tests/exclude/mixed/good-ibm-copyright.scala | 21 -- scancode/tests/include/good_hello.js | 18 - scancode/utils/clone_all.sh| 18 - scancode/utils/release-repos.txt | 7 scancode/utils/repo_clone.sh | 18 - scancode/utils/scan_all.sh | 18 - scancode/utils/update_all.sh | 18 - 11 files changed, 145 insertions(+), 77 deletions(-) diff --git a/.travis.yml b/.travis.yml index 22f59ef..02e2fbb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,19 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements; and to You under the Apache License, Version 2.0. +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # https://docs.travis-ci.com/user/languages/python/ language: python diff --git a/scancode/ASF-Release.cfg b/scancode/ASF-Release.cfg index 8a5f59a..0ccfdb5 100644 --- a/scancode/ASF-Release.cfg +++ b/scancode/ASF-Release.cfg @@ -73,27 +73,34 @@ NOTICE.txt .gogradle vendor -# Exclude from incubator-openwhisk -# Jenkins/test generated reports -# Test data. -# Generated binary artifacts -tests/build/reports -tests/dat/actions -docs/images -bin - -# incubator-openwhisk-apigateway test dependency exclusions -lua_install -tests/lua_modules - -# incubator-openwhisk-client-go, incubator-openwhisk-wskdeploy autogenerated Go files -# NOTE: we SHOULD make this more granular, there are many .go files that can have -# ASF license headers -incubator-openwhisk-wskdeploy/specification/images -wski18n +# incubator-openwhisk: exclude empty test (empty.js), and symbolic links (wskadmin, wskdev) +bin/wskadmin +bin/wskdev +tests/dat/actions/empty.js + +# incubator-openwhisk-apigateway: test dependency exclusions +tests/fakengx.lua +tests/fakeredis.lua + +# incubator-openwhisk-client-go, incubator-openwhisk-wskdeploy GoLang autogenerated i18n files +specification/images +wski18n/i18n_resources.go + +# incubator-openwhisk-runtime-nodejs +node_modules + +# incubator-openwhisk-composer +bin/compose.js +bin/deploy.js # Exclude scancode tests that test for bad license headers -incubator-openwhisk-utilities/scancode/tests/exclude +# compat.py, gitwildmatch.py, pathspec.py, pattern.py and util.py are mozilla licensed files +scancode/tests/exclude +scancode/lib/compat.py +scancode/lib/gitwildmatch.py +scancode/lib/pathspec.py +scancode/lib/pattern.py +scancode/lib/util.py [Options] # Not all code files allow licenses to appear starting at the first character diff --git a/scancode/test.sh b/scancode/test.sh index f7c991f..67ef529 100755 --- a/scancode/test.sh +++ b/scancode/test.sh @@ -1,6 +1,20 @@ #!/usr/bin/env bash -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements; and to You under the Apache License, Version 2.0. +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this
[incubator-openwhisk-package-kafka] branch master updated: remove use of short header in all cases (#347)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-kafka.git The following commit(s) were added to refs/heads/master by this push: new a1f7699 remove use of short header in all cases (#347) a1f7699 is described below commit a1f7699a7ab1f29812d1f2f0d35b1594362731bf Author: Matt Rutkowski AuthorDate: Thu Jul 25 16:06:03 2019 -0500 remove use of short header in all cases (#347) --- gradle/wrapper/gradle-wrapper.properties | 18 -- installCatalog.sh| 18 -- installKafka.sh | 18 -- tools/travis/build.sh| 18 -- tools/travis/deploy.sh | 18 -- tools/travis/setup.sh| 18 -- 6 files changed, 96 insertions(+), 12 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d7cc33f..b99c31f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,19 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements; and to You under the Apache License, Version 2.0. +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists diff --git a/installCatalog.sh b/installCatalog.sh index 18ae06b..18f31bf 100755 --- a/installCatalog.sh +++ b/installCatalog.sh @@ -1,7 +1,21 @@ #!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements; and to You under the Apache License, Version 2.0. +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # use the command line interface to install standard actions deployed # automatically diff --git a/installKafka.sh b/installKafka.sh index 285723f..595f2b4 100755 --- a/installKafka.sh +++ b/installKafka.sh @@ -1,7 +1,21 @@ #!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements; and to You under the Apache License, Version 2.0. +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # use the command line interface to install standard actions deployed # automatically diff --git a/tools/travis/build.sh b/tools/travis/build.sh index c389b99..60fc3fd 100755 --- a/tools/travis/build.sh +++ b/tools/travis/build.sh @@ -1,7 +1,21 @@ #!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license
[incubator-openwhisk-package-alarms] branch master updated: remove use of short header in all cases (#193)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-alarms.git The following commit(s) were added to refs/heads/master by this push: new fc2987e remove use of short header in all cases (#193) fc2987e is described below commit fc2987e11baf96573b1c20aaa4eea5642df3850d Author: Matt Rutkowski AuthorDate: Thu Jul 25 15:46:56 2019 -0500 remove use of short header in all cases (#193) --- gradle/wrapper/gradle-wrapper.properties | 18 -- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 58010f0..14c55cb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,19 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements; and to You under the Apache License, Version 2.0. +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists
[incubator-openwhisk-package-cloudant] branch master updated: remove use of short header in all cases (#210)
This is an automated email from the ASF dual-hosted git repository. mrutkowski pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-cloudant.git The following commit(s) were added to refs/heads/master by this push: new dafcad1 remove use of short header in all cases (#210) dafcad1 is described below commit dafcad1bf0895a11ae1f7200117fae5279f883f3 Author: Matt Rutkowski AuthorDate: Thu Jul 25 15:46:44 2019 -0500 remove use of short header in all cases (#210) --- gradle/wrapper/gradle-wrapper.properties | 18 -- installCatalog.sh| 18 -- tools/travis/build.sh| 18 -- tools/travis/deploy.sh | 18 -- tools/travis/setup.sh| 18 -- 5 files changed, 80 insertions(+), 10 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 58010f0..14c55cb 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,19 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements; and to You under the Apache License, Version 2.0. +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists diff --git a/installCatalog.sh b/installCatalog.sh index e9513e7..a6dfe0c 100755 --- a/installCatalog.sh +++ b/installCatalog.sh @@ -1,7 +1,21 @@ #!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements; and to You under the Apache License, Version 2.0. +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# # # use the command line interface to install standard actions deployed diff --git a/tools/travis/build.sh b/tools/travis/build.sh index e1dabe1..67a2d83 100755 --- a/tools/travis/build.sh +++ b/tools/travis/build.sh @@ -1,7 +1,21 @@ #!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements; and to You under the Apache License, Version 2.0. +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# set -e diff --git a/tools/travis/deploy.sh b/tools/travis/deploy.sh index 39b771a..0ecbfbc 100755 --- a/tools/travis/deploy.sh +++ b/tools/travis/deploy.sh @@ -1,7 +1,21 @@ #!/bin/bash -# Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements; and to You under the Apache License, Version 2.0. +# +# Licensed to the Apache Software Foundation (ASF) under one or