diff --git a/CHANGELOG.md b/CHANGELOG.md index 887ac58..2cb3194 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ # Change Log + All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) @@ -6,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/). ## Unreleased +## [3.0.1] - 2019-09-11 + +### Changed + +* Depends on Xenon 3.0.4 +* Depends on Xenon cloud adaptors 3.0.2 + ## [3.0.0] - 2019-06-14 ### Added diff --git a/CITATION.cff b/CITATION.cff index 60f7d0e..7650804 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -77,4 +77,4 @@ references: title: Xenon type: software title: "Xenon gRPC server" -version: "3.0.0" +version: "3.0.1" diff --git a/README.md b/README.md index a9531a9..8f645bd 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,11 @@ The server tries to mimic the Xenon library API as much as possible, differences On [releases page](https://github.com/xenon-middleware/xenon-grpc/releases) download a tarball (or zipfile). The tarball can be installed with: + ```bash tar -xf xenon-grpc-shadow*.tar ``` + Add `xenon-grpc*/bin` to your PATH environment variable for easy usage. # Usage @@ -36,6 +38,7 @@ To get help run ``` Or call the jar directly with + ```bash java -jar xenon-grpc-*/lib/xenon-grpc-*-all.jar ``` @@ -62,7 +65,8 @@ echo {} | java -jar polyglot.jar call --endpoint=localhost:50051 --full_method=x ## Python client Compile proto into python stubs -``` + +```sh pip install grpcio grpcio-tools xenon-grpc --proto > xenon.proto python -m grpc_tools.protoc -I. --python_out=. --grpc_python_out=. xenon.proto @@ -76,18 +80,19 @@ Create self-signed certificate and use for server and client on same machine. Make sure `Common Name` field is filled with hostname of machine. See http://httpd.apache.org/docs/2.4/ssl/ssl_faq.html#selfcert - ```bash openssl req -new -x509 -nodes -out server.crt -keyout server.key ./build/install/xenon-grpc/bin/xenon-grpc --server-cert-chain server.crt --server-private-key server.key --client-cert-chain server.crt ``` Test with polyglot + ```bash echo {} | java -jar polyglot.jar call --endpoint=:50051 --full_method=xenon.FileSystemService/getAdaptorNames --use_tls=true --tls_client_cert_path=$PWD/server.crt --tls_client_key_path=$PWD/server.key --tls_ca_cert_path=$PWD/server.crt ``` In a ipython shell with generated stubs in working directory: + ```python import grpc import xenon_pb2 @@ -107,7 +112,7 @@ print(response) ## New release -``` +```sh ./gradlew build ``` diff --git a/build.gradle b/build.gradle index e5ce558..47226d5 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ plugins { } description = 'Perform files and jobs operations with Xenon library from grpc service' -version = '3.0.0' +version = '3.0.1' applicationName = 'xenon-grpc' group = 'nl.esciencecenter.xenon.grpc' mainClassName = 'nl.esciencecenter.xenon.grpc.XenonServerWrapper' @@ -30,8 +30,8 @@ repositories { jcenter() } -ext.xenonLibVersion = '3.0.0' -ext.xenonCloudLibVersion = '3.0.1' +ext.xenonLibVersion = '3.0.4' +ext.xenonCloudLibVersion = '3.0.2' dependencies { implementation "io.grpc:grpc-netty:${grpcVersion}"