From commits-return-7919-archive-asf-public=cust-asf.ponee.io@openwhisk.apache.org Fri Aug 9 16:04:57 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1EFFB18063F for ; Fri, 9 Aug 2019 18:04:56 +0200 (CEST) Received: (qmail 47213 invoked by uid 500); 9 Aug 2019 16:04:55 -0000 Mailing-List: contact commits-help@openwhisk.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openwhisk.apache.org Delivered-To: mailing list commits@openwhisk.apache.org Received: (qmail 47204 invoked by uid 99); 9 Aug 2019 16:04:55 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Aug 2019 16:04:55 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 4486085F0A; Fri, 9 Aug 2019 16:04:55 +0000 (UTC) Date: Fri, 09 Aug 2019 16:04:55 +0000 To: "commits@openwhisk.apache.org" Subject: [openwhisk-wskdeploy] branch master updated: Remove 'incubat(ing, ion, or)' designation and disclaimer from all files (#1065) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <156536669507.941.16422024663605848780@gitbox.apache.org> From: mrutkowski@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: openwhisk-wskdeploy X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 059ed1a85e5550fae06a0afdd451cf04158f1996 X-Git-Newrev: cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2 X-Git-Rev: cbe7c52d99c1ead5172946d3aeb33adb5d5c40b2 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 +-- .../defaultpackage/defaultpackage_test.go | 4 +-- .../src/integration/dependency/dependency_test.go | 4 +-- tests/src/integration/docker/docker_test.go | 4 +-- tests/src/integration/export/export_test.go | 18 +++++----- tests/src/integration/flagstests/flags_test.go | 18 +++++----- tests/src/integration/helloworld/README.md | 2 +- .../src/integration/helloworld/helloworld_test.go | 6 ++-- tests/src/integration/jaraction/jaraction_test.go | 4 +-- .../managed-deployment/managed-deployment_test.go | 4 +-- .../integration/message-hub/message-hub_test.go | 6 ++-- .../src/integration/runtimetests/runtimes_test.go | 4 +-- .../integration/triggerrule/triggerrule_test.go | 6 ++-- .../validate-action-annotations_test.go | 4 +-- .../validate-bind-inputs-anno_test.go | 4 +-- .../validate-file-extensions_test.go | 4 +-- .../validate-packages-in-manifest_test.go | 6 ++-- .../validate-application-and-project_test.go | 4 +-- .../validatePackagesInDeployment_test.go | 6 ++-- .../validateSequencesCreation_test.go | 2 +- tests/src/integration/webaction/webaction_test.go | 4 +-- .../integration/websequence/websequence_test.go | 4 +-- tests/src/integration/zipaction/zipaction_test.go | 6 ++-- .../zipactionwithexclude_test.go | 4 +-- .../zipactionwithinclude_test.go | 6 ++-- tests/usecases/github/README.md | 12 +++---- tests/usecases/github/deployment.yaml | 2 +- tests/usecases/slack/README.md | 12 +++---- tools/travis/cloneutils.sh | 2 +- tools/travis/scancode.sh | 2 +- tools/travis/script.sh | 4 +-- utils/file.go | 2 +- utils/managedannotations.go | 2 +- utils/misc.go | 2 +- utils/misc_test.go | 2 +- utils/validation.go | 6 ++-- utils/zip.go | 4 +-- webaction/webaction.go | 4 +-- wskenv/environment.go | 4 +-- wski18n/i18n_resources.go | 20 +++++------ wskprint/console.go | 4 +-- 107 files changed, 330 insertions(+), 339 deletions(-) diff --git a/.gitignore b/.gitignore index 9fd9de2..50384bf 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,6 @@ _testmain.go #binaries openwhisk-wskdeploy -incubator-openwhisk-wskdeploy wskdeploy # Go IDE diff --git a/.travis.yml b/.travis.yml index 9167d2c..3ee1845 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,9 +74,9 @@ before_deploy: git config --global user.email "builds@travis-ci.com"; git config --global user.name "Travis CI"; git tag -d $GIT_TAG; - git push -q https://$API_KEY@github.com/apache/incubator-openwhisk-wskdeploy :refs/tags/$GIT_TAG; + git push -q https://$API_KEY@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_KEY@github.com/apache/incubator-openwhisk-wskdeploy $GIT_TAG; + git push -f -q https://$API_KEY@github.com/apache/openwhisk-wskdeploy $GIT_TAG; fi - echo "TRAVIS_EVENT_TYPE is " - echo $TRAVIS_EVENT_TYPE @@ -96,14 +96,14 @@ deploy: target_commitish: $TRAVIS_COMMIT tag_name: $GIT_TAG on: - repo: apache/incubator-openwhisk-wskdeploy + repo: apache/openwhisk-wskdeploy tags: $TAG condition: "$DEPLOY_BUILD_READY = true" - provider: script skip_cleanup: true script: "./tools/travis/docker/publish.sh openwhisk wskdeploy ${TRAVIS_TAG}" on: - repo: apache/incubator-openwhisk-wskdeploy + repo: apache/openwhisk-wskdeploy tags: true condition: "$DEPLOY_BUILD_READY = true" env: 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: -[dev@openwhisk.incubator.apache.org](dev@openwhisk.incubator.apache.org) +[dev@openwhisk.apache.org](dev@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 dcf0237..0000000 --- a/DISCLAIMER.txt +++ /dev/null @@ -1 +0,0 @@ -Apache OpenWhisk Whisk Deploy(wskdeploy) 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 [...] diff --git a/Dockerfile b/Dockerfile index 66ab8b2..34fe6e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,19 +27,19 @@ ENV GOPATH=/ RUN echo "Installing the godep tool" RUN go get github.com/tools/godep -ADD . /src/github.com/apache/incubator-openwhisk-wskdeploy +ADD . /src/github.com/apache/openwhisk-wskdeploy # Load all of the dependencies from the previously generated/saved godep generated godeps.json file RUN echo "Restoring Go dependencies" -RUN cd /src/github.com/apache/incubator-openwhisk-wskdeploy && /bin/godep restore -v +RUN cd /src/github.com/apache/openwhisk-wskdeploy && /bin/godep restore -v # All of the Go CLI binaries will be placed under a build folder -RUN rm -rf /src/github.com/apache/incubator-openwhisk-wskdeploy/build -RUN mkdir /src/github.com/apache/incubator-openwhisk-wskdeploy/build +RUN rm -rf /src/github.com/apache/openwhisk-wskdeploy/build +RUN mkdir /src/github.com/apache/openwhisk-wskdeploy/build ARG WSKDEPLOY_OS ARG WSKDEPLOY_ARCH # Build the Go wsk CLI binaries and compress resultant binaries -RUN chmod +x /src/github.com/apache/incubator-openwhisk-wskdeploy/build.sh -RUN cd /src/github.com/apache/incubator-openwhisk-wskdeploy/ && ./build.sh +RUN chmod +x /src/github.com/apache/openwhisk-wskdeploy/build.sh +RUN cd /src/github.com/apache/openwhisk-wskdeploy/ && ./build.sh diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 01a3e63..debe7a2 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -1,5 +1,5 @@ { - "ImportPath": "github.com/apache/incubator-openwhisk-wskdeploy", + "ImportPath": "github.com/apache/openwhisk-wskdeploy", "GoVersion": "go1.9", "GodepVersion": "v62", "Deps": [ @@ -104,12 +104,12 @@ "Rev": "991e81cc94f6c54209edb3192cb98e3995ad71c1" }, { - "ImportPath": "github.com/apache/incubator-openwhisk-client-go/whisk", - "Rev": "7862108c109b7f1bbb47d66edb0a35d4a3c080a7" + "ImportPath": "github.com/apache/openwhisk-client-go/whisk", + "Rev": "d8ccb1442651beee6a9245913e3ca0cb182888b1" }, { - "ImportPath": "github.com/apache/incubator-openwhisk-client-go/wski18n", - "Rev": "7862108c109b7f1bbb47d66edb0a35d4a3c080a7" + "ImportPath": "github.com/apache/openwhisk-client-go/wski18n", + "Rev": "d8ccb1442651beee6a9245913e3ca0cb182888b1" }, { "ImportPath": "github.com/pelletier/go-buffruneio", diff --git a/README.md b/README.md index 728ff56..6c391d2 100644 --- a/README.md +++ b/README.md @@ -20,13 +20,13 @@ # 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/incubator-openwhisk-wskdeploy.svg?branch=master)](https://travis-ci.org/apache/incubator-openwhisk-wskdeploy) +[![Build Status](https://travis-ci.org/apache/openwhisk-wskdeploy.svg?branch=master)](https://travis-ci.org/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/incubator-openwhisk/blob/master/docs/packages.md), [Actions](https://github.com/apache/incubator-openwhisk/blob/master/docs/actions.md), [Triggers, and Rules](https://github.com/apache/incubator-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 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 export --projectname managed_project_name` allows to "export" a specified managed project into a local file system. Namely, a `managed_project_name.yml` Manifest file will be created automatically. This Manifest file can be used with `wskdeploy` to redeploy the managed project at a different OpenWhisk instance. If the managed project contains dependencies on other managed projects, then these projects will be exported automatically into their respective manifests. -You can use this in addition to the OpenWhisk CLI. In fact, this utility uses the [OpenWhisk "Go" Client](https://github.com/apache/incubator-openwhisk-client-go) to create its HTTP REST calls for deploying and undeploying your packages. +You can use this in addition to the OpenWhisk CLI. In fact, this utility uses the [OpenWhisk "Go" Client](https://github.com/apache/openwhisk-client-go) to create its HTTP REST calls for deploying and undeploying your packages. ## Here are some quick links for: @@ -56,7 +56,7 @@ Once your environment is setup, download `wskdeploy` and its dependencies: ```sh $ cd $GOPATH -$ go get github.com/apache/incubator-openwhisk-wskdeploy # see known issues below if you get an error +$ go get github.com/apache/openwhisk-wskdeploy # see known issues below if you get an error $ go get github.com/tools/godep # get the dependency manager ``` @@ -64,7 +64,7 @@ $ go get github.com/tools/godep # get the dependency manager Use the Go utility to build the ```wskdeploy``` binary as follows: ```sh -$ cd src/github.com/apache/incubator-openwhisk-wskdeploy/ +$ cd src/github.com/apache/openwhisk-wskdeploy/ $ godep restore $ go build -o wskdeploy ``` @@ -125,7 +125,7 @@ $ go run main.go -m tests/usecases/triggerrule/manifest.yml -d tests/usecases/tr ## Downloading released binaries Binaries of `wskdeploy` are available for download on the project's GitHub release page: -- [https://github.com/apache/incubator-openwhisk-wskdeploy/releases](https://github.com/apache/incubator-openwhisk-wskdeploy/releases). +- [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). @@ -135,12 +135,12 @@ _If you are a Developer or Contributor, **we recommend building from the latest ## Contributing to the project -Start by creating a fork of `incubator-openwhisk-wskdeploy` and then change the git `origin` to point to your forked repository, as follows: +Start by creating a fork of `openwhisk-wskdeploy` and then change the git `origin` to point to your forked repository, as follows: ```sh -$ cd $GOPATH/src/github.com/apache/incubator-openwhisk-wskdeploy +$ cd $GOPATH/src/github.com/apache/openwhisk-wskdeploy $ git remote rename origin upstream -$ git remote add origin https://github.com//incubator-openwhisk-wskdeploy +$ git remote add origin https://github.com//openwhisk-wskdeploy $ git fetch --all $ git branch --set-upstream-to origin/master # track master from origin now ``` @@ -156,13 +156,13 @@ The Whisk deploy project is setup for development purposes and uses "go deps" fo Specifically, for development please use ```go build```: ``` -$ git clone git@github.com:/incubator-openwhisk-wskdeploy -$ cd incubator-openwhisk-wskdeploy +$ git clone git@github.com:/openwhisk-wskdeploy +$ cd openwhisk-wskdeploy $ go build ``` for end-users, please use versioned releases of binaries. -- [https://github.com/apache/incubator-openwhisk-wskdeploy/releases](https://github.com/apache/incubator-openwhisk-wskdeploy/releases) +- [https://github.com/apache/openwhisk-wskdeploy/releases](https://github.com/apache/openwhisk-wskdeploy/releases) ### How to Cross Compile Binary with Gradle/Docker @@ -174,7 +174,7 @@ After compiling, a suitable wskdeploy binary that works for your OS platform wil 2. Make sure you have Java 1.7 or above installed. -3. Clone the wskdeploy repo with command ```git clone https://github.com/apache/incubator-openwhisk-wskdeploy.git``` +3. Clone the wskdeploy repo with command ```git clone https://github.com/apache/openwhisk-wskdeploy.git``` 4. If you use Windows OS, type ```gradlew.bat -version ```. For Unix/Linux/Mac, please type ```./gradlew -version```. @@ -197,7 +197,7 @@ Then, you will find the binaries and their compressed packages generated under t ### Building for Internationalization Please follow this process for building any changes to translatable strings: -- [How to generate the file i18n_resources.go for internationalization](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/wski18n/README.md) +- [How to generate the file i18n_resources.go for internationalization](https://github.com/apache/openwhisk-wskdeploy/blob/master/wski18n/README.md) @@ -210,19 +210,19 @@ Please follow this process for building any changes to translatable strings: The "go get" command uses HTTPS with GitHub and when you attempt to "commit" code you might be prompted with your GitHub credentials. If you wish to use your SSH credentials, you may need to issue the following command to set the appropriate URL for your "origin" fork: ``` -git remote set-url origin git@github.com:/incubator-openwhisk-wskdeploy.git +git remote set-url origin git@github.com:/openwhisk-wskdeploy.git ``` you can manually change the remote (origin) url within your .git/config file: ``` [remote "origin"] - url = git@github.com:/incubator-openwhisk-wskdeploy + url = git@github.com:/openwhisk-wskdeploy ``` while there, you can verify that your upstream repository is set correctly: ``` [remote "upstream"] - url = git@github.com:apache/incubator-openwhisk-wskdeploy + url = git@github.com:apache/openwhisk-wskdeploy ``` #### Git clone RPC failed: HTTP 301 @@ -231,7 +231,7 @@ This sometimes occurs using "go get" the wskdeploy code (which indirectly invoke Note: Using "go get" for development is unsupported; instead, please use "go deps" for dependency management. -You might get this error when downloading `incubator-openwhisk-wskdeploy`: +You might get this error when downloading `openwhisk-wskdeploy`: Cloning into ''$GOAPTH/src/gopkg.in/yaml.v2'... error: RPC failed; HTTP 301 curl 22 The requested URL returned error: 301 @@ -246,8 +246,4 @@ $ git config --global http.https://gopkg.in.followRedirects true ## Creating Tagged Releases Committers can find instructions on how to create tagged releases here: -- [creating_tagged_releases.md](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/docs/creating_tagged_releases.md) - -# Disclaimer - -Apache OpenWhisk Whisk Deploy(wskdeploy) 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 [...] +- [creating_tagged_releases.md](https://github.com/apache/openwhisk-wskdeploy/tree/master/docs/creating_tagged_releases.md) diff --git a/build.gradle b/build.gradle index adc71ca..0a60d48 100644 --- a/build.gradle +++ b/build.gradle @@ -33,7 +33,7 @@ plugins { apply plugin: "org.nosphere.apache.rat" golang { - packagePath = 'github.com/apache/incubator-openwhisk-wskdeploy' as String + packagePath = 'github.com/apache/openwhisk-wskdeploy' as String buildTags = (rootProject.findProperty('goTags')?:'').split(',') } @@ -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/incubator-openwhisk-client-go/whisk', 'version':'7862108c109b7f1bbb47d66edb0a35d4a3c080a7', 'transitive':false]) - build(['name':'github.com/apache/incubator-openwhisk-client-go/wski18n', 'version':'7862108c109b7f1bbb47d66edb0a35d4a3c080a7', '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/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]) diff --git a/build.sh b/build.sh index 2b535a2..fb9a3e1 100644 --- a/build.sh +++ b/build.sh @@ -45,7 +45,7 @@ build_wskdeploy () { export GOARCH=$arch - cd /src/github.com/apache/incubator-openwhisk-wskdeploy + cd /src/github.com/apache/openwhisk-wskdeploy go build -ldflags "-X main.Version=`date -u '+%Y-%m-%dT%H:%M:%S'`" -v -o build/$os/$arch/$bin main.go; }; diff --git a/cmd/export.go b/cmd/export.go index a91d77d..4020075 100644 --- a/cmd/export.go +++ b/cmd/export.go @@ -24,13 +24,13 @@ import ( "path/filepath" "strings" - "github.com/apache/incubator-openwhisk-client-go/whisk" - "github.com/apache/incubator-openwhisk-wskdeploy/deployers" - "github.com/apache/incubator-openwhisk-wskdeploy/parsers" - "github.com/apache/incubator-openwhisk-wskdeploy/runtimes" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" - "github.com/apache/incubator-openwhisk-wskdeploy/wskprint" + "github.com/apache/openwhisk-client-go/whisk" + "github.com/apache/openwhisk-wskdeploy/deployers" + "github.com/apache/openwhisk-wskdeploy/parsers" + "github.com/apache/openwhisk-wskdeploy/runtimes" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/wskprint" "github.com/spf13/cobra" ) diff --git a/cmd/report.go b/cmd/report.go index 52289a2..9757f19 100644 --- a/cmd/report.go +++ b/cmd/report.go @@ -18,8 +18,8 @@ package cmd import ( - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wski18n" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index d468bc4..57c8966 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -23,14 +23,14 @@ import ( "path/filepath" "strings" - "github.com/apache/incubator-openwhisk-client-go/whisk" - "github.com/apache/incubator-openwhisk-wskdeploy/dependencies" - "github.com/apache/incubator-openwhisk-wskdeploy/deployers" - "github.com/apache/incubator-openwhisk-wskdeploy/runtimes" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wskderrors" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" - "github.com/apache/incubator-openwhisk-wskdeploy/wskprint" + "github.com/apache/openwhisk-client-go/whisk" + "github.com/apache/openwhisk-wskdeploy/dependencies" + "github.com/apache/openwhisk-wskdeploy/deployers" + "github.com/apache/openwhisk-wskdeploy/runtimes" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wskderrors" + "github.com/apache/openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/wskprint" "github.com/spf13/cobra" ) diff --git a/cmd/root_test.go b/cmd/root_test.go index 72f6396..7e4a72b 100644 --- a/cmd/root_test.go +++ b/cmd/root_test.go @@ -21,7 +21,7 @@ package cmd import ( "bytes" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/utils" "github.com/spf13/cobra" "github.com/stretchr/testify/assert" "os" @@ -86,7 +86,7 @@ func initializeParameters() { expected_auth_flags.Auth = "fake_auth" expected_auth_flags.ApiVersion = "fake_api_version" - expected_input.CfgFile = os.Getenv("GOPATH") + "/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/dat/wskprops" + expected_input.CfgFile = os.Getenv("GOPATH") + "/src/github.com/apache/openwhisk-wskdeploy/tests/dat/wskprops" expected_input.Verbose = true expected_input.Preview = false expected_input.ProjectPath = "fake_project_path" diff --git a/cmd/sync.go b/cmd/sync.go index f95458e..20c7ed8 100644 --- a/cmd/sync.go +++ b/cmd/sync.go @@ -18,8 +18,8 @@ package cmd import ( - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wski18n" "github.com/spf13/cobra" ) diff --git a/cmd/undeploy.go b/cmd/undeploy.go index 569fc74..2444508 100644 --- a/cmd/undeploy.go +++ b/cmd/undeploy.go @@ -18,7 +18,7 @@ package cmd import ( - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/wski18n" "github.com/spf13/cobra" ) diff --git a/cmd/utils.go b/cmd/utils.go index 21431fc..877d151 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -23,8 +23,8 @@ import ( "io/ioutil" "strings" - "github.com/apache/incubator-openwhisk-wskdeploy/wskderrors" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/wskderrors" + "github.com/apache/openwhisk-wskdeploy/wski18n" ) const ( diff --git a/cmd/version.go b/cmd/version.go index f8775ac..214be50 100755 --- a/cmd/version.go +++ b/cmd/version.go @@ -19,9 +19,9 @@ package cmd import ( "fmt" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" - "github.com/apache/incubator-openwhisk-wskdeploy/wskprint" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/wskprint" "github.com/spf13/cobra" ) diff --git a/conductor/conductor.go b/conductor/conductor.go index 8f833d1..b96aabf 100644 --- a/conductor/conductor.go +++ b/conductor/conductor.go @@ -17,7 +17,7 @@ package conductor -import "github.com/apache/incubator-openwhisk-client-go/whisk" +import "github.com/apache/openwhisk-client-go/whisk" const CONDUCTOR_ANNOTATION = "conductor" diff --git a/conductor/conductor_test.go b/conductor/conductor_test.go index 0a007fb..66e5931 100644 --- a/conductor/conductor_test.go +++ b/conductor/conductor_test.go @@ -22,7 +22,7 @@ package conductor import ( "testing" - "github.com/apache/incubator-openwhisk-client-go/whisk" + "github.com/apache/openwhisk-client-go/whisk" "github.com/stretchr/testify/assert" ) diff --git a/dependencies/dependencies.go b/dependencies/dependencies.go index 062b2d6..2a492bf 100644 --- a/dependencies/dependencies.go +++ b/dependencies/dependencies.go @@ -20,7 +20,7 @@ package dependencies import ( "strings" - "github.com/apache/incubator-openwhisk-client-go/whisk" + "github.com/apache/openwhisk-client-go/whisk" ) const ( diff --git a/deployers/deploymentreader.go b/deployers/deploymentreader.go index 0c02e40..0e5a184 100644 --- a/deployers/deploymentreader.go +++ b/deployers/deploymentreader.go @@ -18,12 +18,12 @@ package deployers import ( - "github.com/apache/incubator-openwhisk-client-go/whisk" - "github.com/apache/incubator-openwhisk-wskdeploy/parsers" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wskenv" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" - "github.com/apache/incubator-openwhisk-wskdeploy/wskprint" + "github.com/apache/openwhisk-client-go/whisk" + "github.com/apache/openwhisk-wskdeploy/parsers" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wskenv" + "github.com/apache/openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/wskprint" ) type DeploymentReader struct { diff --git a/deployers/deploymentreader_test.go b/deployers/deploymentreader_test.go index 27bfb56..b2c1f2a 100644 --- a/deployers/deploymentreader_test.go +++ b/deployers/deploymentreader_test.go @@ -21,9 +21,9 @@ package deployers import ( "fmt" - "github.com/apache/incubator-openwhisk-client-go/whisk" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wskprint" + "github.com/apache/openwhisk-client-go/whisk" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wskprint" "github.com/stretchr/testify/assert" "reflect" "testing" diff --git a/deployers/manifestreader.go b/deployers/manifestreader.go index efe9a92..4fa3308 100644 --- a/deployers/manifestreader.go +++ b/deployers/manifestreader.go @@ -21,12 +21,12 @@ import ( "strings" "fmt" - "github.com/apache/incubator-openwhisk-client-go/whisk" - "github.com/apache/incubator-openwhisk-wskdeploy/dependencies" - "github.com/apache/incubator-openwhisk-wskdeploy/parsers" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wskderrors" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-client-go/whisk" + "github.com/apache/openwhisk-wskdeploy/dependencies" + "github.com/apache/openwhisk-wskdeploy/parsers" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wskderrors" + "github.com/apache/openwhisk-wskdeploy/wski18n" ) var clientConfig *whisk.Config diff --git a/deployers/manifestreader_test.go b/deployers/manifestreader_test.go index e90f874..978243e 100644 --- a/deployers/manifestreader_test.go +++ b/deployers/manifestreader_test.go @@ -23,12 +23,12 @@ import ( "fmt" "testing" - "github.com/apache/incubator-openwhisk-client-go/whisk" - "github.com/apache/incubator-openwhisk-wskdeploy/dependencies" - "github.com/apache/incubator-openwhisk-wskdeploy/parsers" - "github.com/apache/incubator-openwhisk-wskdeploy/runtimes" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wskprint" + "github.com/apache/openwhisk-client-go/whisk" + "github.com/apache/openwhisk-wskdeploy/dependencies" + "github.com/apache/openwhisk-wskdeploy/parsers" + "github.com/apache/openwhisk-wskdeploy/runtimes" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wskprint" "github.com/stretchr/testify/assert" ) diff --git a/deployers/projectreader.go b/deployers/projectreader.go index ad7fa1a..bb0f063 100644 --- a/deployers/projectreader.go +++ b/deployers/projectreader.go @@ -21,13 +21,13 @@ import ( "net/http" "strings" - "github.com/apache/incubator-openwhisk-client-go/whisk" - "github.com/apache/incubator-openwhisk-wskdeploy/parsers" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wskderrors" - "github.com/apache/incubator-openwhisk-wskdeploy/wskenv" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" - "github.com/apache/incubator-openwhisk-wskdeploy/wskprint" + "github.com/apache/openwhisk-client-go/whisk" + "github.com/apache/openwhisk-wskdeploy/parsers" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wskderrors" + "github.com/apache/openwhisk-wskdeploy/wskenv" + "github.com/apache/openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/wskprint" ) func (deployer *ServiceDeployer) UpdatePackageInputs() error { diff --git a/deployers/servicedeployer.go b/deployers/servicedeployer.go index c7b848c..ef40e07 100644 --- a/deployers/servicedeployer.go +++ b/deployers/servicedeployer.go @@ -28,13 +28,13 @@ import ( "sync" "time" - "github.com/apache/incubator-openwhisk-client-go/whisk" - "github.com/apache/incubator-openwhisk-wskdeploy/dependencies" - "github.com/apache/incubator-openwhisk-wskdeploy/parsers" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wskderrors" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" - "github.com/apache/incubator-openwhisk-wskdeploy/wskprint" + "github.com/apache/openwhisk-client-go/whisk" + "github.com/apache/openwhisk-wskdeploy/dependencies" + "github.com/apache/openwhisk-wskdeploy/parsers" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wskderrors" + "github.com/apache/openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/wskprint" ) const ( diff --git a/deployers/whiskclient.go b/deployers/whiskclient.go index 93da0ef..74cff36 100644 --- a/deployers/whiskclient.go +++ b/deployers/whiskclient.go @@ -24,12 +24,12 @@ import ( "strings" "time" - "github.com/apache/incubator-openwhisk-client-go/whisk" - "github.com/apache/incubator-openwhisk-wskdeploy/parsers" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wskderrors" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" - "github.com/apache/incubator-openwhisk-wskdeploy/wskprint" + "github.com/apache/openwhisk-client-go/whisk" + "github.com/apache/openwhisk-wskdeploy/parsers" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wskderrors" + "github.com/apache/openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/wskprint" ) // Possible sources for config info (e.g., API Host, Auth Key, Namespace) diff --git a/deployers/whiskclient_test.go b/deployers/whiskclient_test.go index 4e7477f..3c636c5 100644 --- a/deployers/whiskclient_test.go +++ b/deployers/whiskclient_test.go @@ -20,10 +20,10 @@ package deployers import ( - "github.com/apache/incubator-openwhisk-client-go/whisk" - "github.com/apache/incubator-openwhisk-wskdeploy/utils" - "github.com/apache/incubator-openwhisk-wskdeploy/wski18n" - "github.com/apache/incubator-openwhisk-wskdeploy/wskprint" + "github.com/apache/openwhisk-client-go/whisk" + "github.com/apache/openwhisk-wskdeploy/utils" + "github.com/apache/openwhisk-wskdeploy/wski18n" + "github.com/apache/openwhisk-wskdeploy/wskprint" "github.com/stretchr/testify/assert" "testing" ) diff --git a/docs/creating_tagged_releases.md b/docs/creating_tagged_releases.md index 02d8649..82675ac 100644 --- a/docs/creating_tagged_releases.md +++ b/docs/creating_tagged_releases.md @@ -48,12 +48,12 @@ You can download the binaries, and delete them from the releases page in GitHub [Homebrew](https://brew.sh) is used to install `wskdeploy` locally. Once we release a new version of `wskdeploy` we should update its version in homebrew. -Get the new release SHA256 checksum by downloading the Source Code (tar.gz) from the [releases page](https://github.com/apache/incubator-openwhisk-wskdeploy/releases) and running `shasum -a 256 X.Y.Z.tar.gz` on the tarball. +Get the new release SHA256 checksum by downloading the Source Code (tar.gz) from the [releases page](https://github.com/apache/openwhisk-wskdeploy/releases) and running `shasum -a 256 X.Y.Z.tar.gz` on the tarball. Update brew formula with the automation command `brew bump-formula-pr`: ```bash $ brew bump-formula-pr \ - --url='https://github.com/apache/incubator-openwhisk-wskdeploy/archive/X.Y.Z.tar.gz' \ + --url='https://github.com/apache/openwhisk-wskdeploy/archive/X.Y.Z.tar.gz' \ --sha256='PASTE THE SHA256 CHECKSUM HERE' \ --version='X.Y.Z' \ wskdeploy diff --git a/docs/export.md b/docs/export.md index aaeb3af..dd17c6e 100644 --- a/docs/export.md +++ b/docs/export.md @@ -68,7 +68,7 @@ ok: got package lib1_package { "key": "whisk-managed", "value": { - "file": "/root/go_projects/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml", + "file": "/root/go_projects/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml", "projectDeps": [], "projectHash": "80eec5f8e3ee874e22bdacb76aa4cc69aad459c1", "projectName": "lib1" @@ -84,7 +84,7 @@ ok: got package lib1_package { "key": "whisk-managed", "value": { - "file": "/root/go_projects/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml", + "file": "/root/go_projects/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml", "projectDeps": [], "projectHash": "80eec5f8e3ee874e22bdacb76aa4cc69aad459c1", "projectName": "lib1" @@ -103,7 +103,7 @@ ok: got package lib1_package { "key": "whisk-managed", "value": { - "file": "/root/go_projects/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml", + "file": "/root/go_projects/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml", "projectDeps": [], "projectHash": "80eec5f8e3ee874e22bdacb76aa4cc69aad459c1", "projectName": "lib1" @@ -122,7 +122,7 @@ ok: got package lib1_package { "key": "whisk-managed", "value": { - "file": "/root/go_projects/src/github.com/apache/incubator-openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml", + "file": "/root/go_projects/src/github.com/apache/openwhisk-wskdeploy/tests/src/integration/export/manifest_lib1.yaml", "projectDeps": [], "projectHash": "80eec5f8e3ee874e22bdacb76aa4cc69aad459c1", "projectName": "lib1" diff --git a/docs/programming_guide.md b/docs/programming_guide.md index 35bf0ee..d5d6031 100644 --- a/docs/programming_guide.md +++ b/docs/programming_guide.md @@ -20,7 +20,7 @@ # ```wskdeploy``` utility by example _A step-by-step guide for deploying Apache OpenWhisk applications using Package Manifest files._ -This guide will walk you through how to describe OpenWhisk applications and packages using the [OpenWhisk Packaging Specification](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/specification#openwhisk-packaging-specification) and deploy them through the Whisk Deploy (```wskdeploy```) utility. Please use the specification as the ultimate reference for all Manifest file grammar and syntax. +This guide will walk you through how to describe OpenWhisk applications and packages using the [OpenWhisk Packaging Specification](https://github.com/apache/openwhisk-wskdeploy/tree/master/specification#openwhisk-packaging-specification) and deploy them through the Whisk Deploy (```wskdeploy```) utility. Please use the specification as the ultimate reference for all Manifest file grammar and syntax. ## Getting started diff --git a/docs/sync_projects_between_client_and_server.md b/docs/sync_projects_between_client_and_server.md index e02e483..d5fe584 100644 --- a/docs/sync_projects_between_client_and_server.md +++ b/docs/sync_projects_between_client_and_server.md @@ -230,7 +230,7 @@ ok: got package Extension1 { "key": "/guest/helloworlds", "value": { - "file": ".../src/github.com/apache/incubator-openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml", + "file": ".../src/github.com/apache/openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml", "projectDeps": [], "projectHash": "0ae33344f7885df01aefd053e94a4eb3675ef72d", "projectName": "HelloWorlds" @@ -255,7 +255,7 @@ bx wsk package get helloworlds { "key": "whisk-managed", "value": { - "file": ".../src/github.com/apache/incubator-openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml", + "file": ".../src/github.com/apache/openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml", "projectDeps": [], "projectHash": "0ae33344f7885df01aefd053e94a4eb3675ef72d", "projectName": "HelloWorlds" @@ -302,7 +302,7 @@ ok: got package Extension2 { "key": "/guest/helloworlds", "value": { - "file": ".../src/github.com/apache/incubator-openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml", + "file": ".../src/github.com/apache/openwhisk-wskdeploy/Packages/helloworlds-master/packages/helloworlds/manifest.yaml", "projectDeps": [], "projectHash": "0ae33344f7885df01aefd053e94a4eb3675ef72d", "projectName": "HelloWorlds" @@ -311,7 +311,7 @@ ok: got package Extension2 { "key": "/guest/hellowhisk", "value": { - "file": "../src/github.com/apache/incubator-openwhisk-wskdeploy/Packages/custom-hellowhisk-master/packages/hellowhisk/manifest.yaml", + "file": "../src/github.com/apache/openwhisk-wskdeploy/Packages/custom-hellowhisk-master/packages/hellowhisk/manifest.yaml", "projectDeps": [], "projectHash": "8970b2e820631322ae630e9366b2342ab3b67a57", "projectName": "HelloWhisk" diff --git a/docs/wskdeploy_action_helloworld.md b/docs/wskdeploy_action_helloworld.md index 4ddaba9..6117917 100644 --- a/docs/wskdeploy_action_helloworld.md +++ b/docs/wskdeploy_action_helloworld.md @@ -50,7 +50,7 @@ function main(params) { ### Deploying -You can actually deploy the "hello world" manifest from the incubator-openwhisk-wskdeploy project directory if you have downloaded it from GitHub: +You can actually deploy the "hello world" manifest from the openwhisk-wskdeploy project directory if you have downloaded it from GitHub: ```sh $ wskdeploy -m docs/examples/manifest_hello_world.yaml diff --git a/docs/wskdeploy_apigateway_helloworld.md b/docs/wskdeploy_apigateway_helloworld.md index 29dbab3..4bcefe9 100644 --- a/docs/wskdeploy_apigateway_helloworld.md +++ b/docs/wskdeploy_apigateway_helloworld.md @@ -54,7 +54,7 @@ The `apis` block contains a number of groups of API endpoint. Each endpoint is t ### Deploying -You can actually deploy the "hello world API gateway" manifest from the incubator-openwhisk-wskdeploy project directory if you have downloaded it from GitHub: +You can actually deploy the "hello world API gateway" manifest from the openwhisk-wskdeploy project directory if you have downloaded it from GitHub: ```sh $ wskdeploy -m docs/examples/manifest_hello_world_apigateway.yaml diff --git a/docs/wskdeploy_apigateway_http.md b/docs/wskdeploy_apigateway_http.md index 63f7e7c..1a7c3e0 100644 --- a/docs/wskdeploy_apigateway_http.md +++ b/docs/wskdeploy_apigateway_http.md @@ -119,7 +119,7 @@ function main(params) { ### Deploying -You can actually deploy the "API Gateway HTTP" manifest from the incubator-openwhisk-wskdeploy project directory if you have downloaded it from GitHub: +You can actually deploy the "API Gateway HTTP" manifest from the *openwhisk-wskdeploy* project directory if you have downloaded it from GitHub: ```sh $ wskdeploy -m docs/examples/manifest_hello_world_apigateway_http.yaml diff --git a/docs/wskdeploy_apigateway_http_sequence.md b/docs/wskdeploy_apigateway_http_sequence.md index 26bb689..ae8ea1c 100644 --- a/docs/wskdeploy_apigateway_http_sequence.md +++ b/docs/wskdeploy_apigateway_http_sequence.md @@ -99,7 +99,7 @@ The last action in the chain simply wraps the result from the previous action in ### Deploying -You can actually deploy the "API Gateway HTTP" manifest from the incubator-openwhisk-wskdeploy project directory if you have downloaded it from GitHub: +You can actually deploy the "API Gateway HTTP" manifest from the openwhisk-wskdeploy project directory if you have downloaded it from GitHub: ```sh $ wskdeploy -m docs/examples/manifest_hello_world_apigateway_http_sequence.yaml diff --git a/docs/wskdeploy_apigateway_sequence.md b/docs/wskdeploy_apigateway_sequence.md index b8a935e..67f6a1b 100644 --- a/docs/wskdeploy_apigateway_sequence.md +++ b/docs/wskdeploy_apigateway_sequence.md @@ -58,7 +58,7 @@ There are two key changes to this file: ### Deploying -You can actually deploy the "API Gateway sequence" manifest from the incubator-openwhisk-wskdeploy project directory if you have downloaded it from GitHub: +You can actually deploy the "API Gateway sequence" manifest from the openwhisk-wskdeploy project directory if you have downloaded it from GitHub: ```sh $ wskdeploy -m docs/examples/manifest_hello_world_apigateway_sequence.yaml diff --git a/docs/wskdeploy_debugging.md b/docs/wskdeploy_debugging.md index db9b3cd..655d7d1 100644 --- a/docs/wskdeploy_debugging.md +++ b/docs/wskdeploy_debugging.md @@ -57,7 +57,7 @@ Wskpdeloy uses named errors that describe the type of any error found along with For example, if you have an error in your Manifest's YAML, you may see an error such as: ``` -[50]: Invalid input of Yaml file =====> incubator-openwhisk-wskdeploy/parsers/manifest_parser.go +[50]: Invalid input of Yaml file =====> openwhisk-wskdeploy/parsers/manifest_parser.go [98]: Failed to parse the yaml file manifest_bad_yaml.yaml =====> yaml: line 13: could not find expected ':' ``` @@ -66,4 +66,4 @@ The named error **NewInputYamlFormatError** provides direct indication of both w All current named errors supported by the utility can be found in the latest ```wskdeployerror.go``` source file: -[wskdeployerror.go](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/wskderrors/wskdeployerror.go) +[wskdeployerror.go](https://github.com/apache/openwhisk-wskdeploy/blob/master/wskderrors/wskdeployerror.go) diff --git a/docs/wskdeploy_package_minimal.md b/docs/wskdeploy_package_minimal.md index 1428210..242a974 100644 --- a/docs/wskdeploy_package_minimal.md +++ b/docs/wskdeploy_package_minimal.md @@ -19,7 +19,7 @@ # Packages -The wskdeploy utility works primarily with the OpenWhisk **Package** resource as described in the [OpenWhisk Packaging Specification](https://github.com/apache/incubator-openwhisk-wskdeploy/tree/master/specification#openwhisk-packaging-specification). +The wskdeploy utility works primarily with the OpenWhisk **Package** resource as described in the [OpenWhisk Packaging Specification](https://github.com/apache/openwhisk-wskdeploy/tree/master/specification#openwhisk-packaging-specification). ## Creating a minimal OpenWhisk Package @@ -90,11 +90,11 @@ packages #### Source code The source code for the manifest and JavaScript files can be found here: -- [manifest_package_minimal.yaml](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/docs/examples/manifest_package_minimal.yaml) +- [manifest_package_minimal.yaml](https://github.com/apache/openwhisk-wskdeploy/blob/master/docs/examples/manifest_package_minimal.yaml) ### Specification For convenience, the Packages grammar can be found here: -- **[Packages](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/specification/html/spec_packages.md#packages)** +- **[Packages](https://github.com/apache/openwhisk-wskdeploy/blob/master/specification/html/spec_packages.md#packages)** --- diff --git a/docs/wskdeploy_triggerrule_basic.md b/docs/wskdeploy_triggerrule_basic.md index db79fba..8281c86 100644 --- a/docs/wskdeploy_triggerrule_basic.md +++ b/docs/wskdeploy_triggerrule_basic.md @@ -122,7 +122,7 @@ which verifies that the parameter bindings of the values (i.e, _"Sam"_ (name), _ ### Specification For convenience, the Actions and Parameters grammar can be found here: -- **[Triggers and Rules](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/specification/html/spec_trigger_rule.md#triggers-and-rules)** +- **[Triggers and Rules](https://github.com/apache/openwhisk-wskdeploy/blob/master/specification/html/spec_trigger_rule.md#triggers-and-rules)** ---