This is an automated email from the ASF dual-hosted git repository. csantanapr pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-runtime-dotnet.git
commit 41d2e3bdadeaa1c9b91088954e9068666f635e2d Author: Shawn Black <[email protected]> AuthorDate: Thu Oct 11 13:35:47 2018 -0500 Add .NET Core support for OpenWhisk --- CONTRIBUTING.md | 72 +++++++ DISCLAIMER.txt | 1 + LICENSE.txt | 202 +++++++++++++++++++ NOTICE.txt | 5 + README.md | 180 +++++++++++++++++ build.gradle | 30 +++ core/dotnet2.1/CHANGELOG.md | 25 +++ core/dotnet2.1/Dockerfile | 36 ++++ core/dotnet2.1/build.gradle | 20 ++ .../Apache.OpenWhisk.Runtime.Common.csproj | 35 ++++ .../HttpResponseExtension.cs | 43 ++++ .../proxy/Apache.OpenWhisk.Runtime.Common/Init.cs | 178 +++++++++++++++++ .../proxy/Apache.OpenWhisk.Runtime.Common/Run.cs | 109 +++++++++++ .../Apache.OpenWhisk.Runtime.Common/Startup.cs | 69 +++++++ .../Apache.OpenWhisk.Runtime.Dotnet.Minimal.csproj | 40 ++++ .../Program.cs | 44 +++++ core/dotnet2.1/proxy/build.gradle | 28 +++ .../proxy/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54329 bytes .../proxy/gradle/wrapper/gradle-wrapper.properties | 8 + core/dotnet2.1/proxy/gradlew | 172 ++++++++++++++++ core/dotnet2.1/proxy/gradlew.bat | 84 ++++++++ core/dotnet2.1/proxy/openwhisk-runtime-dotnet.sln | 39 ++++ gradle/README.md | 64 ++++++ gradle/docker.gradle | 116 +++++++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54329 bytes gradle/wrapper/gradle-wrapper.properties | 8 + gradlew | 172 ++++++++++++++++ gradlew.bat | 84 ++++++++ settings.gradle | 38 ++++ tests/build.gradle | 47 +++++ .../Apache.OpenWhisk.Tests.Dotnet/AltEcho.cs | 32 +++ .../Apache.OpenWhisk.Tests.Dotnet.csproj | 27 +++ tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Echo.cs | 30 +++ .../Apache.OpenWhisk.Tests.Dotnet/Environment.cs | 36 ++++ .../dotnet/Apache.OpenWhisk.Tests.Dotnet/Error.cs | 31 +++ .../Apache.OpenWhisk.Tests.Dotnet/Exception.cs | 29 +++ .../NonEmptyConstructor.cs | 33 ++++ .../dotnet/Apache.OpenWhisk.Tests.Dotnet/Nuller.cs | 29 +++ .../Apache.OpenWhisk.Tests.Dotnet/Unicode.cs | 35 ++++ tests/dotnet/build.gradle | 52 +++++ tests/dotnet/openwhisk-tests-dotnet.sln | 33 ++++ tests/src/test/resources/application.conf | 8 + .../DotNetActionContainerTests.scala | 217 +++++++++++++++++++++ 43 files changed, 2541 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..3c0595b --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,72 @@ +<!-- +# +# 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. +# +--> + +[](http://www.apache.org/licenses/LICENSE-2.0) + +# Contributing to Apache OpenWhisk + +Anyone can contribute to the OpenWhisk project and we welcome your contributions. + +There are multiple ways to contribute: report bugs, improve the docs, and +contribute code, but you must follow these prerequisites and guidelines: + + - [Contributor License Agreement](#contributor-license-agreement) + - [Raising issues](#raising-issues) + - [Coding Standards](#coding-standards) + +### Contributor License Agreement + +All contributors must sign and submit an Apache CLA (Contributor License Agreement). + +Instructions on how to do this can be found here: +[http://www.apache.org/licenses/#clas](http://www.apache.org/licenses/#clas) + +Once submitted, you will receive a confirmation email from the Apache Software Foundation (ASF) and be added to +the following list: http://people.apache.org/unlistedclas.html. + +Project committers will use this list to verify pull requests (PRs) come from contributors that have signed a CLA. + +We look forward to your contributions! + +## Raising issues + +Please raise any bug reports or enhancement requests on the respective project repository's GitHub issue tracker. Be sure to search the +list to see if your issue has already been raised. + +A good bug report is one that make it easy for us to understand what you were trying to do and what went wrong. +Provide as much context as possible so we can try to recreate the issue. + +A good enhancement request comes with an explanation of what you are trying to do and how that enhancement would help you. + +### Discussion + +Please use the project's developer email list to engage our community: +[[email protected]]([email protected]) + +In addition, we provide a "dev" Slack team channel for conversations at: +https://openwhisk-team.slack.com/messages/dev/ + +### Coding standards + +Please ensure you follow the coding standards used throughout the existing +code base. Some basic rules include: + + - all files must have the Apache license in the header. + - all PRs must have passing builds for all operating systems. + - the code is correctly formatted as defined in the [Scalariform plugin properties](tools/eclipse/scala.properties). If you use IntelliJ for development this [page](https://plugins.jetbrains.com/plugin/7480-scalariform) describes the setup and configuration of the plugin. diff --git a/DISCLAIMER.txt b/DISCLAIMER.txt new file mode 100644 index 0000000..b104986 --- /dev/null +++ b/DISCLAIMER.txt @@ -0,0 +1 @@ +Apache OpenWhisk Runtime Dotnet 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 [...] diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d645695 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 0000000..184e0a4 --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,5 @@ +Apache OpenWhisk Runtime Dotnet +Copyright 2016-2018 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 139597f..2d7503e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,182 @@ +<!-- +# +# 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. +# +--> +# Apache OpenWhisk runtimes for .NET Core +[](https://travis-ci.org/apache/incubator-openwhisk-runtime-dotnet) + +## Changelogs +- [.NET Core 2.1 CHANGELOG.md](core/dotnet2.1/CHANGELOG.md) + + +## Quick .NET Core Action +A .NET Core action is a .NET Core class library with a method called `Main` that has the exact signature as follows: + +```csharp +public Newtonsoft.Json.Linq.JObject Main(Newtonsoft.Json.Linq.JObject); +``` + +In order to compile, test and archive .NET Core projects, you must have the [.NET Core SDK](https://www.microsoft.com/net/download) installed locally and the environment variable `DOTNET_HOME` set to the location where the `dotnet` executable can be found. + +For example, create a C# project called `Apache.OpenWhisk.Example.Dotnet`: + +```bash +dotnet new classlib -n Apache.OpenWhisk.Example.Dotnet -lang C# +cd Apache.OpenWhisk.Example.Dotnet +``` + +Install the [Newtonsoft.Json](https://www.newtonsoft.com/json) NuGet package as follows: + +```bash +dotnet add package Newtonsoft.Json -v 11.0.2 +``` + +Now create a file called `Hello.cs` with the following content: + +```csharp +using System; +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Example.Dotnet +{ + public class Hello + { + public JObject Main(JObject args) + { + string name = "stranger"; + if (args.ContainsKey("name")) { + name = args["name"].ToString(); + } + JObject message = new JObject(); + message.Add("greeting", new JValue($"Hello, {name}!")); + return (message); + } + } +} +``` + +Publish the project as follows: + +```bash +dotnet publish -c Release -o out +``` + +Zip the published files as follows: + +```bash +cd out +zip -r -0 helloDotNet.bin * +``` + +You need to specify the name of the function handler using `--main` argument. +The value for `main` needs to be in the following format: +`{Assembly}::{Class Full Name}::{Method}`, e.q., +`Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main` + +### Create the .NET Core Action +To use on a deployment of OpenWhisk that contains the runtime as a kind: +```bash +wsk action update helloDotNet helloDotNet.bin --main Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main --kind dotnet:2.1 +``` + +### Invoke the .NET Core Action +Action invocation is the same for .NET Core actions as it is for Swift and JavaScript actions: + +```bash +wsk action invoke --result helloDotNet --param name World +``` + +```json + { + "greeting": "Hello World!" + } +``` + +## Local development +```bash +./gradlew core:dotnet2.1:distDocker +``` +This will produce the image `whisk/action-dotnet-v2.1` + +Build and Push image +```bash +docker login +./gradlew core:action-dotnet-v2.1:distDocker -PdockerImagePrefix=$prefix-user -PdockerRegistry=docker.io +``` + +Deploy OpenWhisk using ansible environment that contains the kind `dotnet:2.1` +Assuming you have OpenWhisk already deploy localy and `OPENWHISK_HOME` pointing to root directory of OpenWhisk core repository. + +Set `ROOTDIR` to the root directory of this repository. + +Redeploy OpenWhisk +```bash +cd $OPENWHISK_HOME/ansible +ANSIBLE_CMD="ansible-playbook -i ${ROOTDIR}/ansible/environments/local" +$ANSIBLE_CMD setup.yml +$ANSIBLE_CMD couchdb.yml +$ANSIBLE_CMD initdb.yml +$ANSIBLE_CMD wipe.yml +$ANSIBLE_CMD openwhisk.yml +``` + +Or you can use `wskdev` and create a soft link to the target ansible environment, for example: +``` +ln -s ${ROOTDIR}/ansible/environments/local ${OPENWHISK_HOME}/ansible/environments/local-dotnet +wskdev fresh -t local-dotnet +``` + +### Testing +Install dependencies from the root directory on $OPENWHISK_HOME repository +```bash +pushd $OPENWHISK_HOME +./gradlew install +podd $OPENWHISK_HOME +``` + +Using gradle to run all tests +```bash +./gradlew :tests:test +``` +Using gradle to run some tests +```bash +./gradlew :tests:test --tests *ActionContainerTests* +``` +Using IntelliJ: +- Import project as gradle project. +- Make sure working directory is root of the project/repo + +#### Using container image to test +To use as docker action push to your own dockerhub account +```bash +docker tag whisk/action-dotnet-v2.1 $user_prefix/action-dotnet-v2.1 +docker push $user_prefix/action-dotnet-v2.1 +``` +Then create the action using your the image from dockerhub +```bash +wsk action update helloDotNet helloDotNet.bin --main Apache.OpenWhisk.Example.Dotnet::Apache.OpenWhisk.Example.Dotnet.Hello::Main --docker $user_prefix/action-dotnet-v2.1 +``` +The `$user_prefix` is usually your dockerhub user id. + +# License +[Apache 2.0](LICENSE.txt) + +# Disclaimer + +Apache OpenWhisk Runtime Dotnet 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 [...] diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..4ebd4b8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,30 @@ +/* + * 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. + */ + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath "cz.alenkacz:gradle-scalafmt:${gradle.scalafmt.version}" + } +} + +subprojects { + apply plugin: 'scalafmt' + scalafmt.configFilePath = gradle.scalafmt.config +} diff --git a/core/dotnet2.1/CHANGELOG.md b/core/dotnet2.1/CHANGELOG.md new file mode 100644 index 0000000..9a89851 --- /dev/null +++ b/core/dotnet2.1/CHANGELOG.md @@ -0,0 +1,25 @@ +<!-- +# +# 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. +# +--> + +# .NET Core 2.1 OpenWhisk Runtime Container + + +## 1.0.0 +Changes: +- Initial release diff --git a/core/dotnet2.1/Dockerfile b/core/dotnet2.1/Dockerfile new file mode 100644 index 0000000..2026600 --- /dev/null +++ b/core/dotnet2.1/Dockerfile @@ -0,0 +1,36 @@ +# +# 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. +# + +FROM microsoft/dotnet:2.1-sdk-alpine AS build + +WORKDIR /app +COPY proxy/Apache.OpenWhisk.Runtime.Common/*.csproj ./Apache.OpenWhisk.Runtime.Common/ +COPY proxy/Apache.OpenWhisk.Runtime.Dotnet.Minimal/*.csproj ./Apache.OpenWhisk.Runtime.Dotnet.Minimal/ +COPY proxy/openwhisk-runtime-dotnet.sln ./openwhisk-runtime-dotnet.sln +RUN dotnet restore + +COPY proxy/Apache.OpenWhisk.Runtime.Common/. ./Apache.OpenWhisk.Runtime.Common/ +COPY proxy/Apache.OpenWhisk.Runtime.Dotnet.Minimal/. ./Apache.OpenWhisk.Runtime.Dotnet.Minimal/ +WORKDIR /app/Apache.OpenWhisk.Runtime.Dotnet.Minimal +RUN dotnet publish -c Release -r alpine.3.7-x64 -o out + +FROM microsoft/dotnet:2.1-runtime-alpine AS runtime +WORKDIR /app +COPY --from=build /app/Apache.OpenWhisk.Runtime.Dotnet.Minimal/out ./ +ENV ASPNETCORE_URLS http://+:8080 +EXPOSE 8080/tcp +ENTRYPOINT ["dotnet", "Apache.OpenWhisk.Runtime.Dotnet.Minimal.dll"] diff --git a/core/dotnet2.1/build.gradle b/core/dotnet2.1/build.gradle new file mode 100644 index 0000000..80ed6e1 --- /dev/null +++ b/core/dotnet2.1/build.gradle @@ -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. + */ + +ext.dockerImageName = 'action-dotnet-v2.1' + +apply from: '../../gradle/docker.gradle' diff --git a/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Apache.OpenWhisk.Runtime.Common.csproj b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Apache.OpenWhisk.Runtime.Common.csproj new file mode 100644 index 0000000..9a36c86 --- /dev/null +++ b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Apache.OpenWhisk.Runtime.Common.csproj @@ -0,0 +1,35 @@ +<!-- + * 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. +--> +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFramework>netcoreapp2.1</TargetFramework> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.AspNetCore"> + <Version>2.1.3</Version> + </PackageReference> + <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel"> + <Version>2.1.3</Version> + </PackageReference> + <PackageReference Include="Newtonsoft.Json"> + <Version>11.0.2</Version> + </PackageReference> + </ItemGroup> + +</Project> diff --git a/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/HttpResponseExtension.cs b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/HttpResponseExtension.cs new file mode 100644 index 0000000..4f63bd0 --- /dev/null +++ b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/HttpResponseExtension.cs @@ -0,0 +1,43 @@ +/* + * 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. + */ + +using System.Text; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Newtonsoft.Json; +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Runtime.Common +{ + public static class HttpResponseExtension + { + public static async Task WriteResponse(this HttpResponse response, int code, string content) + { + byte[] bytes = Encoding.UTF8.GetBytes(content); + response.ContentLength = bytes.Length; + response.StatusCode = code; + await response.WriteAsync(content); + } + + public static async Task WriteError(this HttpResponse response, string errorMessage) + { + JObject message = new JObject {{"error", new JValue(errorMessage)}}; + await WriteResponse(response, 502, JsonConvert.SerializeObject(message)); + } + + } +} diff --git a/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Init.cs b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Init.cs new file mode 100644 index 0000000..f5d9489 --- /dev/null +++ b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Init.cs @@ -0,0 +1,178 @@ +/* + * 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. + */ + +using System; +using System.IO; +using System.Reflection; +using System.Threading; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Runtime.Common +{ + public class Init + { + private readonly SemaphoreSlim _initSemaphoreSlim = new SemaphoreSlim(1, 1); + + public bool Initialized { get; private set; } + private Type Type { get; set; } + private MethodInfo Method { get; set; } + private ConstructorInfo Constructor { get; set; } + + public Init() + { + Initialized = false; + Type = null; + Method = null; + Constructor = null; + } + + public async Task<Run> HandleRequest(HttpContext httpContext) + { + await _initSemaphoreSlim.WaitAsync(); + try + { + if (Initialized) + { + await httpContext.Response.WriteError("Cannot initialize the action more than once."); + Console.Error.WriteLine("Cannot initialize the action more than once."); + return (new Run(Type, Method, Constructor)); + } + + string body = await new StreamReader(httpContext.Request.Body).ReadToEndAsync(); + JObject inputObject = JObject.Parse(body); + if (!inputObject.ContainsKey("value")) + { + await httpContext.Response.WriteError("Missing main/no code to execute."); + return (null); + } + + JToken message = inputObject["value"]; + + if (message["main"] == null || message["binary"] == null || message["code"] == null) + { + await httpContext.Response.WriteError("Missing main/no code to execute."); + return (null); + } + + string main = message["main"].ToString(); + + bool binary = message["binary"].ToObject<bool>(); + + if (!binary) + { + await httpContext.Response.WriteError("code must be binary (zip file)."); + return (null); + } + + string[] mainParts = main.Split("::"); + if (mainParts.Length != 3) + { + await httpContext.Response.WriteError("main required format is \"Assembly::Type::Function\"."); + return (null); + } + + string base64Zip = message["code"].ToString(); + string tempPath = Path.Combine(Environment.CurrentDirectory, Guid.NewGuid().ToString()); + string tempFile = Path.GetTempFileName(); + await File.WriteAllBytesAsync(tempFile, Convert.FromBase64String(base64Zip)); + try + { + System.IO.Compression.ZipFile.ExtractToDirectory(tempFile, tempPath); + } + catch (Exception) + { + await httpContext.Response.WriteError("Unable to decompress package."); + return (null); + } + finally + { + File.Delete(tempFile); + } + + Environment.CurrentDirectory = tempPath; + + string assemblyFile = $"{mainParts[0]}.dll"; + + string assemblyPath = Path.Combine(tempPath, assemblyFile); + + if (!File.Exists(assemblyPath)) + { + await httpContext.Response.WriteError($"Unable to locate requested assembly (\"{assemblyFile}\")."); + return (null); + } + + try + { + Assembly assembly = Assembly.LoadFrom(assemblyPath); + Type = assembly.GetType(mainParts[1]); + if (Type == null) + { + await httpContext.Response.WriteError($"Unable to locate requested type (\"{mainParts[1]}\")."); + return (null); + } + Method = Type.GetMethod(mainParts[2]); + Constructor = Type.GetConstructor(Type.EmptyTypes); + } + catch (Exception ex) + { + Console.Error.WriteLine(ex.ToString()); + await httpContext.Response.WriteError(ex.Message +#if DEBUG + + ", " + ex.StackTrace +#endif + ); + return (null); + } + + if (Method == null) + { + await httpContext.Response.WriteError($"Unable to locate requested method (\"{mainParts[2]}\")."); + return (null); + } + + if (Constructor == null) + { + await httpContext.Response.WriteError($"Unable to locate appropriate constructor for (\"{mainParts[1]}\")."); + return (null); + } + + Initialized = true; + + await httpContext.Response.WriteResponse(200, "OK"); + + return (new Run(Type, Method, Constructor)); + } + catch (Exception ex) + { + Console.Error.WriteLine(ex.StackTrace); + await httpContext.Response.WriteError(ex.Message +#if DEBUG + + ", " + ex.StackTrace +#endif + ); + Startup.WriteLogMarkers(); + return (null); + } + finally + { + _initSemaphoreSlim.Release(); + } + } + } +} diff --git a/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Run.cs b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Run.cs new file mode 100644 index 0000000..1ee35bb --- /dev/null +++ b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Run.cs @@ -0,0 +1,109 @@ +/* + * 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. + */ + +using System; +using System.IO; +using System.Reflection; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Http; +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Runtime.Common +{ + public class Run + { + private readonly Type _type; + private readonly MethodInfo _method; + private readonly ConstructorInfo _constructor; + + public Run(Type type, MethodInfo method, ConstructorInfo constructor) + { + _type = type; + _method = method; + _constructor = constructor; + } + + public async Task HandleRequest(HttpContext httpContext) + { + if (_type == null || _method == null || _constructor == null) + { + await httpContext.Response.WriteError("Cannot invoke an uninitialized action."); + return; + } + + try + { + string body = await new StreamReader(httpContext.Request.Body).ReadToEndAsync(); + + JObject inputObject = string.IsNullOrEmpty(body) ? null : JObject.Parse(body); + + JObject valObject = null; + + if (inputObject != null) + { + valObject = inputObject["value"] as JObject; + foreach (JToken token in inputObject.Children()) + { + try + { + if (token.Path.Equals("value", StringComparison.InvariantCultureIgnoreCase)) + continue; + string envKey = $"__OW_{token.Path.ToUpperInvariant()}"; + string envVal = token.First.ToString(); + Environment.SetEnvironmentVariable(envKey, envVal); + //Console.WriteLine($"Set environment variable \"{envKey}\" to \"{envVal}\"."); + } + catch (Exception) + { + await Console.Error.WriteLineAsync( + $"Unable to set environment variable for the \"{token.Path}\" token."); + } + } + } + + object owObject = _constructor.Invoke(new object[] { }); + + try + { + JObject output = (JObject) _method.Invoke(owObject, new object[] {valObject}); + + if (output == null) + { + await httpContext.Response.WriteError("The action returned null"); + Console.Error.WriteLine("The action returned null"); + return; + } + + await httpContext.Response.WriteResponse(200, output.ToString()); + } + catch (Exception ex) + { + Console.Error.WriteLine(ex.StackTrace); + await httpContext.Response.WriteError(ex.Message +#if DEBUG + + ", " + ex.StackTrace +#endif + ); + } + } + finally + { + Startup.WriteLogMarkers(); + } + } + } +} diff --git a/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Startup.cs b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Startup.cs new file mode 100644 index 0000000..f11760c --- /dev/null +++ b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Common/Startup.cs @@ -0,0 +1,69 @@ +/* + * 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. + */ + +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace Apache.OpenWhisk.Runtime.Common +{ + public class Startup + { + public static void WriteLogMarkers() + { + Console.WriteLine("XXX_THE_END_OF_A_WHISK_ACTIVATION_XXX"); + Console.Error.WriteLine("XXX_THE_END_OF_A_WHISK_ACTIVATION_XXX"); + } + + public void Configure(IApplicationBuilder app) + { + PathString initPath = new PathString("/init"); + PathString runPath = new PathString("/run"); + Init init = new Init(); + Run run = null; + app.Run(async (httpContext) => + { + if (httpContext.Request.Path.Equals(initPath)) + { + run = await init.HandleRequest(httpContext); + return; + } + + if (httpContext.Request.Path.Equals(runPath)) + { + if (!init.Initialized) + { + await httpContext.Response.WriteError("Cannot invoke an uninitialized action."); + return; + } + + if (run == null) + { + await httpContext.Response.WriteError("Cannot invoke an uninitialized action."); + return; + } + + await run.HandleRequest(httpContext); + } + } + ); + } + } +} diff --git a/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Dotnet.Minimal/Apache.OpenWhisk.Runtime.Dotnet.Minimal.csproj b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Dotnet.Minimal/Apache.OpenWhisk.Runtime.Dotnet.Minimal.csproj new file mode 100644 index 0000000..561c649 --- /dev/null +++ b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Dotnet.Minimal/Apache.OpenWhisk.Runtime.Dotnet.Minimal.csproj @@ -0,0 +1,40 @@ +<!-- + * 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. +--> +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <OutputType>Exe</OutputType> + <TargetFramework>netcoreapp2.1</TargetFramework> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Microsoft.AspNetCore"> + <Version>2.1.3</Version> + </PackageReference> + <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel"> + <Version>2.1.3</Version> + </PackageReference> + <PackageReference Include="Newtonsoft.Json"> + <Version>11.0.2</Version> + </PackageReference> + </ItemGroup> + + <ItemGroup> + <ProjectReference Include="..\Apache.OpenWhisk.Runtime.Common\Apache.OpenWhisk.Runtime.Common.csproj" /> + </ItemGroup> + +</Project> diff --git a/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Dotnet.Minimal/Program.cs b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Dotnet.Minimal/Program.cs new file mode 100644 index 0000000..0eca9fa --- /dev/null +++ b/core/dotnet2.1/proxy/Apache.OpenWhisk.Runtime.Dotnet.Minimal/Program.cs @@ -0,0 +1,44 @@ +/* + * 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. + */ + +using System; +using Apache.OpenWhisk.Runtime.Common; +using Microsoft.AspNetCore; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Logging; + +namespace Apache.OpenWhisk.Runtime.Dotnet.Minimal +{ + class Program + { + static void Main(string[] args) + { + CreateWebHostBuilder(args).Build().Run(); + } + + public static IWebHostBuilder CreateWebHostBuilder(string[] args) => + WebHost.CreateDefaultBuilder(args) + .ConfigureLogging((hostingContext, logging) => + { + logging.ClearProviders(); + }) + .SuppressStatusMessages(true) + .UseStartup<Startup>(); + + } +} + diff --git a/core/dotnet2.1/proxy/build.gradle b/core/dotnet2.1/proxy/build.gradle new file mode 100644 index 0000000..b40ee14 --- /dev/null +++ b/core/dotnet2.1/proxy/build.gradle @@ -0,0 +1,28 @@ +/* + * 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. + */ + +plugins { + id "net.karlmartens.dotnet" version "0.2.18" +} + +repositories { + mavenCentral() +} + +dotnet { + configuration 'Release' +} diff --git a/core/dotnet2.1/proxy/gradle/wrapper/gradle-wrapper.jar b/core/dotnet2.1/proxy/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/core/dotnet2.1/proxy/gradle/wrapper/gradle-wrapper.jar differ diff --git a/core/dotnet2.1/proxy/gradle/wrapper/gradle-wrapper.properties b/core/dotnet2.1/proxy/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..15c07a0 --- /dev/null +++ b/core/dotnet2.1/proxy/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements; and to You under the Apache License, Version 2.0. + +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/core/dotnet2.1/proxy/gradlew b/core/dotnet2.1/proxy/gradlew new file mode 100644 index 0000000..cccdd3d --- /dev/null +++ b/core/dotnet2.1/proxy/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +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="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +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 + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +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 + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/core/dotnet2.1/proxy/gradlew.bat b/core/dotnet2.1/proxy/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/core/dotnet2.1/proxy/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/core/dotnet2.1/proxy/openwhisk-runtime-dotnet.sln b/core/dotnet2.1/proxy/openwhisk-runtime-dotnet.sln new file mode 100644 index 0000000..25e60cc --- /dev/null +++ b/core/dotnet2.1/proxy/openwhisk-runtime-dotnet.sln @@ -0,0 +1,39 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 + +# +# 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. +# + +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.OpenWhisk.Runtime.Dotnet.Minimal", "Apache.OpenWhisk.Runtime.Dotnet.Minimal\Apache.OpenWhisk.Runtime.Dotnet.Minimal.csproj", "{F76F51C9-EB3B-4D4C-89C0-A71E0BEF88DC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.OpenWhisk.Runtime.Common", "Apache.OpenWhisk.Runtime.Common\Apache.OpenWhisk.Runtime.Common.csproj", "{26ADD70B-3101-4943-982C-16D380D4B044}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {F76F51C9-EB3B-4D4C-89C0-A71E0BEF88DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F76F51C9-EB3B-4D4C-89C0-A71E0BEF88DC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F76F51C9-EB3B-4D4C-89C0-A71E0BEF88DC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F76F51C9-EB3B-4D4C-89C0-A71E0BEF88DC}.Release|Any CPU.Build.0 = Release|Any CPU + {26ADD70B-3101-4943-982C-16D380D4B044}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {26ADD70B-3101-4943-982C-16D380D4B044}.Debug|Any CPU.Build.0 = Debug|Any CPU + {26ADD70B-3101-4943-982C-16D380D4B044}.Release|Any CPU.ActiveCfg = Release|Any CPU + {26ADD70B-3101-4943-982C-16D380D4B044}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/gradle/README.md b/gradle/README.md new file mode 100644 index 0000000..14842f1 --- /dev/null +++ b/gradle/README.md @@ -0,0 +1,64 @@ +<!-- +# +# 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. +# +--> + +# Gradle + +Gradle is used to build OpenWhisk. It does not need to be pre-installed as it installs itself using the [Gradle Wrapper](https://docs.gradle.org/current/userguide/gradle_wrapper.html). To use it without installing, simply invoke the `gradlew` command at the root of the repository. You can also install `gradle` via [`apt`](http://linuxg.net/how-to-install-gradle-2-1-on-ubuntu-14-10-ubuntu-14-04-ubuntu-12-04-and-derivatives/) on Ubuntu or [`brew`](http://www.brewformulas.org/Gradle) on Mac [...] + +## Usage + +In general, project level properties are set via `-P{propertyName}={propertyValue}`. A task is called via `gradle {taskName}` and a subproject task is called via `gradle :path:to:subproject:{taskName}`. To run tasks in parallel, use the `--parallel` flag (**Note:** It's an incubating feature and might break stuff). + +### Build + +To build all Docker images use `gradle distDocker` at the top level project, to build a specific component use `gradle :core:controller:distDocker`. + +Project level options that can be used on `distDocker`: + +- `dockerImageName` (*required*): The name of the image to build (e.g. whisk/controller) +- `dockerHost` (*optional*): The docker host to run commands on, default behaviour is docker's own `DOCKER_HOST` environment variable +- `dockerRegistry` (*optional*): The registry to push to +- `dockerImageTag` (*optional*, default 'latest'): The tag for the image +- `dockerTimeout` (*optional*, default 240): Timeout for docker operations in seconds +- `dockerRetries` (*optional*, default 3): How many times to retry docker operations +- `dockerBinary` (*optional*, default `docker`): The binary to execute docker commands + +### Test + +To run tests one uses the `test` task. OpenWhisk consolidates tests into a single `tests` project. Hence the command to run all tests is `gradle :tests:test`. + +It is possible to run specific tests using [Gradle testfilters](https://docs.gradle.org/current/userguide/java_plugin.html#test_filtering). For example `gradle :tests:test --tests "your.package.name.TestClass.evenMethodName"`. Wildcard `*` may be used anywhere. + +## Build your own `build.gradle` +In Gradle, most of the tasks we use are default tasks provided by plugins in Gradle. The [`scala` Plugin](https://docs.gradle.org/current/userguide/scala_plugin.html) for example includes tasks, that are needed to build Scala projects. Moreover, Gradle is aware of *Applications*. The [`application` Plugin](https://docs.gradle.org/current/userguide/application_plugin.html) provides tasks that are required to distribute a self-contained application. When `application` and `scala` are used [...] + +In OpenWhisk, we want to distribute our application via Docker images. Hence we wrote a "plugin" that creates the task `distDocker`. That task will build an image from the `Dockerfile` that is located next to the `build.gradle` it is called from, for example Controller's `Dockerfile` and `build.gradle` are both located at `core/controller`. + +If you want to create a new `build.gradle` for your component, simply put the `Dockerfile` right next to it and include `docker.gradle` by using + +``` +ext.dockerImageName = 'openwwhisk/{IMAGENAME}' +apply from: 'path/to/docker.gradle' +``` + +If your component needs to be build before you can build the image, make `distDocker` depend on any task needed to run before it, for example: + +``` +distDocker.dependsOn ':common:scala:distDocker', 'distTar' +``` diff --git a/gradle/docker.gradle b/gradle/docker.gradle new file mode 100644 index 0000000..6ad6850 --- /dev/null +++ b/gradle/docker.gradle @@ -0,0 +1,116 @@ +/* + * 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. + */ + +import groovy.time.* + +/** + * Utility to build docker images based in gradle projects + * + * This extends gradle's 'application' plugin logic with a 'distDocker' task which builds + * a docker image from the Dockerfile of the project that applies this file. The image + * is automatically tagged and pushed if a tag and/or a registry is given. + * + * Parameters that can be set on project level: + * - dockerImageName (required): The name of the image to build (e.g. controller) + * - dockerRegistry (optional): The registry to push to + * - dockerImageTag (optional, default 'latest'): The tag for the image + * - dockerImagePrefix (optional, default 'whisk'): The prefix for the image, + * 'controller' becomes 'whisk/controller' per default + * - dockerTimeout (optional, default 840): Timeout for docker operations in seconds + * - dockerRetries (optional, default 3): How many times to retry docker operations + * - dockerBinary (optional, default 'docker'): The binary to execute docker commands + * - dockerBuildArgs (options, default ''): Project specific custom docker build arguments + * - dockerHost (optional): The docker host to run commands on, default behaviour is + * docker's own DOCKER_HOST environment variable + */ + +ext { + dockerRegistry = project.hasProperty('dockerRegistry') ? dockerRegistry + '/' : '' + dockerImageTag = project.hasProperty('dockerImageTag') ? dockerImageTag : 'latest' + dockerImagePrefix = project.hasProperty('dockerImagePrefix') ? dockerImagePrefix : 'whisk' + dockerTimeout = project.hasProperty('dockerTimeout') ? dockerTimeout.toInteger() : 840 + dockerRetries = project.hasProperty('dockerRetries') ? dockerRetries.toInteger() : 3 + dockerBinary = project.hasProperty('dockerBinary') ? [dockerBinary] : ['docker'] + dockerBuildArg = ['build'] +} +ext.dockerTaggedImageName = dockerRegistry + dockerImagePrefix + '/' + dockerImageName + ':' + dockerImageTag + +if(project.hasProperty('dockerHost')) { + dockerBinary += ['--host', project.dockerHost] +} + +if(project.hasProperty('dockerBuildArgs')) { + dockerBuildArgs.each { arg -> + dockerBuildArg += ['--build-arg', arg] + } +} + +task distDocker { + doLast { + def start = new Date() + def cmd = dockerBinary + dockerBuildArg + ['-t', dockerImageName, project.buildscript.sourceFile.getParentFile().getAbsolutePath()] + retry(cmd, dockerRetries, dockerTimeout) + println("Building '${dockerImageName}' took ${TimeCategory.minus(new Date(), start)}") + } +} +task tagImage { + doLast { + def versionString = (dockerBinary + ['-v']).execute().text + def matched = (versionString =~ /(\d+)\.(\d+)\.(\d+)/) + + def major = matched[0][1] as int + def minor = matched[0][2] as int + + def dockerCmd = ['tag'] + if(major == 1 && minor < 12) { + dockerCmd += ['-f'] + } + retry(dockerBinary + dockerCmd + [dockerImageName, dockerTaggedImageName], dockerRetries, dockerTimeout) + } +} + +task pushImage { + doLast { + def cmd = dockerBinary + ['push', dockerTaggedImageName] + retry(cmd, dockerRetries, dockerTimeout) + } +} +pushImage.dependsOn tagImage +pushImage.onlyIf { dockerRegistry != '' } +distDocker.finalizedBy pushImage + +def retry(cmd, retries, timeout) { + println("${new Date()}: Executing '${cmd.join(" ")}'") + def proc = cmd.execute() + proc.consumeProcessOutput(System.out, System.err) + proc.waitForOrKill(timeout * 1000) + if(proc.exitValue() != 0) { + def message = "${new Date()}: Command '${cmd.join(" ")}' failed with exitCode ${proc.exitValue()}" + if(proc.exitValue() == 143) { // 143 means the process was killed (SIGTERM signal) + message = "${new Date()}: Command '${cmd.join(" ")}' was killed after ${timeout} seconds" + } + + if(retries > 1) { + println("${message}, ${retries-1} retries left, retrying...") + retry(cmd, retries-1, timeout) + } + else { + println("${message}, no more retries left, aborting...") + throw new GradleException(message) + } + } +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f6b961f Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..15c07a0 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,8 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements; and to You under the Apache License, Version 2.0. + +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..cccdd3d --- /dev/null +++ b/gradlew @@ -0,0 +1,172 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +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="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +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 + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +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 + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..f955316 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..7bce0d7 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,38 @@ +/* + * 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. + */ + +include ':tests' +include ':tests:dotnet' + +include ':core:dotnet2.1' +include ':core:dotnet2.1:proxy' + +rootProject.name = 'runtime-dotnet' + +gradle.ext.openwhisk = [ + version: '1.0.0-SNAPSHOT' +] + +gradle.ext.scala = [ + version: '2.11.11', + compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import'] +] + +gradle.ext.scalafmt = [ + version: '1.5.0', + config: new File(rootProject.projectDir, '.scalafmt.conf') +] diff --git a/tests/build.gradle b/tests/build.gradle new file mode 100644 index 0000000..bbaf809 --- /dev/null +++ b/tests/build.gradle @@ -0,0 +1,47 @@ +/* + * 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. + */ +apply plugin: 'scala' +apply plugin: 'eclipse' +compileTestScala.options.encoding = 'UTF-8' + +repositories { + mavenCentral() + mavenLocal() +} + +tasks.withType(Test) { + testLogging { + events "passed", "skipped", "failed" + showStandardStreams = true + exceptionFormat = 'full' + } + outputs.upToDateWhen { false } // force tests to run every time +} + +dependencies { + compile "org.scala-lang:scala-library:${gradle.scala.version}" + compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:tests" + compile "org.apache.openwhisk:openwhisk-tests:${gradle.openwhisk.version}:test-sources" +} + +tasks.withType(ScalaCompile) { + scalaCompileOptions.additionalParameters = gradle.scala.compileFlags +} + +compileTestScala { + dependsOn ':tests:dotnet:prepare' +} \ No newline at end of file diff --git a/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/AltEcho.cs b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/AltEcho.cs new file mode 100644 index 0000000..a4db327 --- /dev/null +++ b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/AltEcho.cs @@ -0,0 +1,32 @@ +/* + * 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. + */ + +using System; +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Tests.Dotnet +{ + public class AltEcho + { + public JObject Main(JObject args) + { + Console.WriteLine("hello stdout"); + Console.Error.WriteLine("hello stderr"); + return (args); + } + } +} diff --git a/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Apache.OpenWhisk.Tests.Dotnet.csproj b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Apache.OpenWhisk.Tests.Dotnet.csproj new file mode 100644 index 0000000..e6bda71 --- /dev/null +++ b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Apache.OpenWhisk.Tests.Dotnet.csproj @@ -0,0 +1,27 @@ +<!-- + * 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. +--> +<Project Sdk="Microsoft.NET.Sdk"> + + <PropertyGroup> + <TargetFramework>netstandard2.0</TargetFramework> + </PropertyGroup> + + <ItemGroup> + <PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> + </ItemGroup> + +</Project> diff --git a/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Echo.cs b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Echo.cs new file mode 100644 index 0000000..ba39177 --- /dev/null +++ b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Echo.cs @@ -0,0 +1,30 @@ +/* + * 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. + */ + +using System; +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Tests.Dotnet +{ + public class Echo + { + public JObject Main(JObject args) + { + return (args); + } + } +} diff --git a/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Environment.cs b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Environment.cs new file mode 100644 index 0000000..d3a1988 --- /dev/null +++ b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Environment.cs @@ -0,0 +1,36 @@ +/* + * 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. + */ + +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Tests.Dotnet +{ + public class Environment + { + public JObject Main(JObject args) + { + JObject message = new JObject(); + message.Add("api_host", new JValue(System.Environment.GetEnvironmentVariable("__OW_API_HOST"))); + message.Add("api_key", new JValue(System.Environment.GetEnvironmentVariable("__OW_API_KEY"))); + message.Add("namespace", new JValue(System.Environment.GetEnvironmentVariable("__OW_NAMESPACE"))); + message.Add("action_name", new JValue(System.Environment.GetEnvironmentVariable("__OW_ACTION_NAME"))); + message.Add("activation_id", new JValue(System.Environment.GetEnvironmentVariable("__OW_ACTIVATION_ID"))); + message.Add("deadline", new JValue(System.Environment.GetEnvironmentVariable("__OW_DEADLINE"))); + return (message); + } + } +} diff --git a/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Error.cs b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Error.cs new file mode 100644 index 0000000..f98068f --- /dev/null +++ b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Error.cs @@ -0,0 +1,31 @@ +/* + * 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. + */ + +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Tests.Dotnet +{ + public class Error + { + public JObject Main(JObject args) + { + JObject message = new JObject(); + message.Add("error", new JValue("This action is unhappy.")); + return (message); + } + } +} diff --git a/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Exception.cs b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Exception.cs new file mode 100644 index 0000000..8d42530 --- /dev/null +++ b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Exception.cs @@ -0,0 +1,29 @@ +/* + * 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. + */ + +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Tests.Dotnet +{ + public class Exception + { + public JObject Main(JObject args) + { + throw (new System.Exception("noooooooo")); + } + } +} diff --git a/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/NonEmptyConstructor.cs b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/NonEmptyConstructor.cs new file mode 100644 index 0000000..f7ecc66 --- /dev/null +++ b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/NonEmptyConstructor.cs @@ -0,0 +1,33 @@ +/* + * 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. + */ + +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Tests.Dotnet +{ + public class NonEmptyConstructor + { + public NonEmptyConstructor(string value) + { + System.Console.WriteLine(value); + } + public JObject Main(JObject args) + { + return (args); + } + } +} diff --git a/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Nuller.cs b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Nuller.cs new file mode 100644 index 0000000..6769f67 --- /dev/null +++ b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Nuller.cs @@ -0,0 +1,29 @@ +/* + * 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. + */ + +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Tests.Dotnet +{ + public class Nuller + { + public JObject Main(JObject args) + { + return (null); + } + } +} diff --git a/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Unicode.cs b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Unicode.cs new file mode 100644 index 0000000..377025b --- /dev/null +++ b/tests/dotnet/Apache.OpenWhisk.Tests.Dotnet/Unicode.cs @@ -0,0 +1,35 @@ +/* + * 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. + */ + +using System; +using Newtonsoft.Json.Linq; + +namespace Apache.OpenWhisk.Tests.Dotnet +{ + public class Unicode + { + public JObject Main(JObject args) + { + string delimiter = args["delimiter"].ToString(); + JObject message = new JObject(); + string output = $"{delimiter} ☃ {delimiter}"; + message.Add("winter", new JValue(output)); + Console.WriteLine(output); + return (message); + } + } +} diff --git a/tests/dotnet/build.gradle b/tests/dotnet/build.gradle new file mode 100644 index 0000000..6ee5c55 --- /dev/null +++ b/tests/dotnet/build.gradle @@ -0,0 +1,52 @@ +/* + * 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. + */ + +plugins { + id "net.karlmartens.dotnet" version "0.2.18" +} + +repositories { + mavenCentral() +} + +dotnet { + configuration 'Release' +} + +task prepare_distro(dependsOn: distribution) { + doLast { + copy { + from tarTree(resources.gzip(file('build/dist/netstandard2.0.tar.gz'))) + into file('build/dist/out') + } + + delete file('build/dist/netstandard2.0.tar.gz') + } +} + +task prepare_zip(type: Zip, dependsOn: prepare_distro) { + from file('build/dist/out') + include '*' + include '**/**' + archiveName 'dotnettests.zip' + destinationDir(file('../src/test/resources')) +} + +task prepare(type: Delete, dependsOn: prepare_zip) { + delete getProject().getBuildDir().toPath().toFile() + followSymlinks = true +} \ No newline at end of file diff --git a/tests/dotnet/openwhisk-tests-dotnet.sln b/tests/dotnet/openwhisk-tests-dotnet.sln new file mode 100644 index 0000000..a11b7e0 --- /dev/null +++ b/tests/dotnet/openwhisk-tests-dotnet.sln @@ -0,0 +1,33 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 + +# +# 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. +# + +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Apache.OpenWhisk.Tests.Dotnet", "Apache.OpenWhisk.Tests.Dotnet\Apache.OpenWhisk.Tests.Dotnet.csproj", "{84C21ADE-CF95-4027-B478-DB5BA078178A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {84C21ADE-CF95-4027-B478-DB5BA078178A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {84C21ADE-CF95-4027-B478-DB5BA078178A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {84C21ADE-CF95-4027-B478-DB5BA078178A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {84C21ADE-CF95-4027-B478-DB5BA078178A}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/tests/src/test/resources/application.conf b/tests/src/test/resources/application.conf new file mode 100644 index 0000000..759f063 --- /dev/null +++ b/tests/src/test/resources/application.conf @@ -0,0 +1,8 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements; and to You under the Apache License, Version 2.0. + +whisk.spi { + SimpleSpi = whisk.spi.SimpleSpiImpl + MissingSpi = whisk.spi.MissingImpl + MissingModule = missing.module +} diff --git a/tests/src/test/scala/actionContainers/DotNetActionContainerTests.scala b/tests/src/test/scala/actionContainers/DotNetActionContainerTests.scala new file mode 100644 index 0000000..d4c04d1 --- /dev/null +++ b/tests/src/test/scala/actionContainers/DotNetActionContainerTests.scala @@ -0,0 +1,217 @@ +/* + * 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. + */ + +package actionContainers + +import org.junit.runner.RunWith +import org.scalatest.junit.JUnitRunner +import common.WskActorSystem +import spray.json._ +import actionContainers.ActionContainer.withContainer +import java.nio.file.Paths + +@RunWith(classOf[JUnitRunner]) +class DotNetActionContainerTests extends BasicActionRunnerTests with WskActorSystem { + val functionb64 = ResourceHelpers.readAsBase64(Paths.get(getClass.getResource("/dotnettests.zip").getPath)) + + // Helpers specific to java actions + override def withActionContainer(env: Map[String, String] = Map.empty)( + code: ActionContainer => Unit): (String, String) = withContainer("action-dotnet-v2.1", env)(code) + + behavior of "dotnet action" + + override val testNoSourceOrExec = { + TestConfig("") + } + + override val testNotReturningJson = { + // skip this test since and add own below (see Nuller) + TestConfig("", skipTest = true) + } + + override val testEnv = { + TestConfig( + functionb64, + main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Environment::Main" + ) + } + + override val testEcho = { + TestConfig( + functionb64, + main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.AltEcho::Main" + ) + } + + val testEchoNoWrite = { + TestConfig( + functionb64, + main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Echo::Main" + ) + } + + override val testUnicode = { + TestConfig( + functionb64, + main = "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Unicode::Main" + ) + } + + override val testInitCannotBeCalledMoreThanOnce = testEchoNoWrite + + override val testEntryPointOtherThanMain = testEchoNoWrite + + override val testLargeInput = testEchoNoWrite + + it should "fail to initialize with bad archive" in { + val (out, err) = withActionContainer() { c => + val brokenArchive = ("NOTAVALIDZIPFILE") + + val (initCode, initRes) = c.init(initPayload(brokenArchive, "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Invalid::Main")) + initCode should not be (200) + + initRes shouldBe defined + + initRes should { + be(Some(JsObject("error" -> JsString("Unable to decompress package.")))) + } + } + } + + it should "return some error on action error" in { + val (out, err) = withActionContainer() { c => + val (initCode, _) = c.init(initPayload(functionb64, "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Exception::Main")) + initCode should be(200) + + val (runCode, runRes) = c.run(runPayload(JsObject.empty)) + runCode should not be (200) + + runRes shouldBe defined + runRes.get.fields.get("error") shouldBe defined + } + + checkStreams(out, err, { + case (o, e) => + (o + e).toLowerCase should include("exception") + }) + } + + it should "support application errors" in { + val (out, err) = withActionContainer() { c => + val (initCode, _) = c.init(initPayload(functionb64, "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Error::Main")) + initCode should be(200) + + val (runCode, runRes) = c.run(runPayload(JsObject.empty)) + runCode should be(200) + + runRes shouldBe defined + runRes.get.fields.get("error") shouldBe defined + } + + checkStreams(out, err, { + case (o, e) => + o shouldBe empty + e shouldBe empty + }) + } + + it should "fails on invalid assembly reference" in { + val (out, err) = withActionContainer() { c => + val (initCode, initRes) = c.init(initPayload(functionb64, "Apache.OpenWhisk.Tests.Dotnet.DoesntExist::Apache.OpenWhisk.Tests.Dotnet.Echo::Main")) + initCode should be(502) + + initRes shouldBe defined + + initRes should { + be(Some(JsObject("error" -> JsString("Unable to locate requested assembly (\"Apache.OpenWhisk.Tests.Dotnet.DoesntExist.dll\").")))) + } + } + } + + it should "fails on invalid type reference" in { + val (out, err) = withActionContainer() { c => + val (initCode, initRes) = c.init(initPayload(functionb64, "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.FakeType::Main")) + initCode should be(502) + + initRes should { + be(Some(JsObject("error" -> JsString("Unable to locate requested type (\"Apache.OpenWhisk.Tests.Dotnet.FakeType\").")))) + } + } + } + + it should "fails on invalid method reference" in { + val (out, err) = withActionContainer() { c => + val (initCode, initRes) = c.init(initPayload(functionb64, "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Echo::FakeMethod")) + initCode should be(502) + + initRes should { + be(Some(JsObject("error" -> JsString("Unable to locate requested method (\"FakeMethod\").")))) + } + } + } + + it should "fails on type with no empty constructor" in { + val (out, err) = withActionContainer() { c => + val (initCode, initRes) = c.init(initPayload(functionb64, "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.NonEmptyConstructor::Main")) + initCode should be(502) + + initRes should { + be(Some(JsObject("error" -> JsString("Unable to locate appropriate constructor for (\"Apache.OpenWhisk.Tests.Dotnet.NonEmptyConstructor\").")))) + } + } + } + + it should "validate main string format 1" in { + val (out, err) = withActionContainer() { c => + val (initCode, initRes) = c.init(initPayload(functionb64, "Apache.OpenWhisk.Tests.Dotnet")) + initCode should not be (200) + + initRes should { + be(Some(JsObject("error" -> JsString("main required format is \"Assembly::Type::Function\".")))) + } + } + } + + it should "validate main string format 2" in { + val (out, err) = withActionContainer() { c => + val (initCode, initRes) = c.init(initPayload(functionb64, "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Echo")) + initCode should not be (200) + + initRes should { + be(Some(JsObject("error" -> JsString("main required format is \"Assembly::Type::Function\".")))) + } + } + } + + it should "enforce that the user returns an object" in { + val (out, err) = withActionContainer() { c => + val (initCode, _) = c.init(initPayload(functionb64, "Apache.OpenWhisk.Tests.Dotnet::Apache.OpenWhisk.Tests.Dotnet.Nuller::Main")) + initCode should be(200) + + val (runCode, runRes) = c.run(runPayload(JsObject.empty)) + runCode should not be (200) + + runRes shouldBe defined + runRes.get.fields.get("error") shouldBe defined + } + + checkStreams(out, err, { + case (o, e) => + (o + e).toLowerCase should include("the action returned null") + }) + } +}
