From 1585d68678fcf8ea10ac0c37d2c9069fb5cfc793 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Fri, 20 Mar 2020 16:30:53 +0100 Subject: [PATCH 1/4] Split getting-started and configuration in docs --- docs/.gitignore | 1 - docs/configuration.md | 278 ++++++++++++++++++++++++++++++++++++++++ docs/getting-started.md | 272 ++++++--------------------------------- 3 files changed, 316 insertions(+), 235 deletions(-) delete mode 100644 docs/.gitignore create mode 100644 docs/configuration.md diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index 364fdec1a..000000000 --- a/docs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -public/ diff --git a/docs/configuration.md b/docs/configuration.md new file mode 100644 index 000000000..d4a2709f5 --- /dev/null +++ b/docs/configuration.md @@ -0,0 +1,278 @@ +--- +title: "Configuration" +date: 2020-02-27T20:35:00+01:00 +weight: 20 +geekdocRepo: https://github.com/owncloud/ocis +geekdocEditPath: edit/master/docs +geekdocFilePath: configuration.md +--- + +{{< toc >}} + +## Configuration + +oCIS Single Binary is not responsible for configuring extensions. Instead, each extension could either be configured by environment variables, cli flags or config files. + +### Configuration using config files + +Out of the box extensions will attempt to read configuration details from: + +```console +/etc/ocis +$HOME/.ocis +./config +``` + +For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `ocis.json | yaml | toml ...`*. + +### Envrionment variables + +If you prefer to configure the service with environment variables you can see the available variables below. + +#### Global + +OCIS_CONFIG_FILE +: Path to config file + +OCIS_LOG_LEVEL +: Set logging level, defaults to `info` + +OCIS_LOG_COLOR +: Enable colored logging, defaults to `true` + +OCIS_LOG_PRETTY +: Enable pretty logging, defaults to `true` + +#### Server + +OCIS_TRACING_ENABLED +: Enable sending traces + +OCIS_TRACING_TYPE +: Tracing backend type, + +OCIS_TRACING_ENDPOINT +:Endpoint for the agent + +OCIS_TRACING_COLLECTOR +: Endpoint for the collector + +OCIS_TRACING_SERVICE +: Service name for tracing" + +OCIS_DEBUG_ADDR +: Address to bind debug server, defaults to `0.0.0.0:9010` + +OCIS_DEBUG_TOKEN +: Token to grant metrics access, empty default value + +OCIS_DEBUG_PPROF +: Enable pprof debugging, defaults to `false` + +OCIS_DEBUG_ZPAGES +: Enable zpages debugging, defaults to `false` + +OCIS_HTTP_ADDR +: Address to bind http server, defaults to `0.0.0.0:9000` + +OCIS_HTTP_ROOT +: Root path for http endpoint, defaults to `/` + +OCIS_GRPC_ADDR +: Address to bind grpc server, defaults to `0.0.0.0:9001` + +OCIS_SERVICES_ENABLED +: List of enabled services, defaults to `phoenix,konnectd,graph,ocs,webdav,hello` + +#### Health + +OCIS_DEBUG_ADDR +: Address to debug endpoint, defaults to `0.0.0.0:9010` + +### Commandline flags + +If you prefer to configure the service with commandline flags you can see the available variables below. + +#### Global + +--config-file +: Path to config file + +--log-level +: Set logging level, defaults to `info` + +--log-color +: Enable colored logging, defaults to `true` + +--log-pretty +: Enable pretty logging, defaults to `true` + +#### Server + +--tracing-enabled +: Enable sending traces + +--tracing-type +: Tracing backend type, + +--tracing-endpoint +:Endpoint for the agent + +--tracing-collector +: Endpoint for the collector + +--tracing-service +: Service name for tracing" + +--debug-addr +: Address to bind debug server, defaults to `0.0.0.0:9010` + +--debug-token +: Token to grant metrics access, empty default value + +--debug-pprof +: Enable pprof debugging, defaults to `false` + +--debug-zpages +: Enable zpages debugging, defaults to `false` + +--http-addr +: Address to bind http server, defaults to `0.0.0.0:9000` + +--http-root +: Root path for http endpoint, defaults to `/` + +--grpc-addr +: Address to bind grpc server, defaults to `0.0.0.0:9001` + +--services-enabled +: List of enabled services, defaults to `hello,phoenix,graph,graph-explorer,ocs,webdav,reva-frontend,reva-gateway,reva-users,reva-auth-basic,reva-auth-bearer,reva-sharing,reva-storage-root,reva-storage-home,reva-storage-home-data,reva-storage-oc,reva-storage-oc-data,devldap` + +#### Health + +--debug-addr +: Address to debug endpoint, defaults to `0.0.0.0:9010` + +### Configuration file + +So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. + +## Usage + +The program provides a few sub-commands on execution. The available configuration methods have already been mentioned above. Generally you can always see a formated help output if you execute the binary via `ocis --help`. + +### Server + +The server command is used to start the http and debug server on two addresses within a single process. The http server is serving the general webservice while the debug server is used for health check, readiness check and to server the metrics mentioned below. For further help please execute: + +{{< highlight txt >}} +ocis server --help +{{< / highlight >}} + +### Health + +The health command is used to execute a health check, if the exit code equals zero the service should be up and running, if the exist code is greater than zero the service is not in a healthy state. Generally this command is used within our Docker containers, it could also be used within Kubernetes. + +{{< highlight txt >}} +ocis health --help +{{< / highlight >}} + +## Metrics + +This service provides some [Prometheus](https://prometheus.io/) metrics through the debug endpoint, you can optionally secure the metrics endpoint by some random token, which got to be configured through one of the flag `--debug-token` or the environment variable `OCIS_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:8001/metrics`. + +go_gc_duration_seconds +: A summary of the GC invocation durations + +go_gc_duration_seconds_sum +: A summary of the GC invocation durations + +go_gc_duration_seconds_count +: A summary of the GC invocation durations + +go_goroutines +: Number of goroutines that currently exist + +go_info +: Information about the Go environment + +go_memstats_alloc_bytes +: Number of bytes allocated and still in use + +go_memstats_alloc_bytes_total +: Total number of bytes allocated, even if freed + +go_memstats_buck_hash_sys_bytes +: Number of bytes used by the profiling bucket hash table + +go_memstats_frees_total +: Total number of frees + +go_memstats_gc_cpu_fraction +: The fraction of this program's available CPU time used by the GC since the program started + +go_memstats_gc_sys_bytes +: Number of bytes used for garbage collection system metadata + +go_memstats_heap_alloc_bytes +: Number of heap bytes allocated and still in use + +go_memstats_heap_idle_bytes +: Number of heap bytes waiting to be used + +go_memstats_heap_inuse_bytes +: Number of heap bytes that are in use + +go_memstats_heap_objects +: Number of allocated objects + +go_memstats_heap_released_bytes +: Number of heap bytes released to OS + +go_memstats_heap_sys_bytes +: Number of heap bytes obtained from system + +go_memstats_last_gc_time_seconds +: Number of seconds since 1970 of last garbage collection + +go_memstats_lookups_total +: Total number of pointer lookups + +go_memstats_mallocs_total +: Total number of mallocs + +go_memstats_mcache_inuse_bytes +: Number of bytes in use by mcache structures + +go_memstats_mcache_sys_bytes +: Number of bytes used for mcache structures obtained from system + +go_memstats_mspan_inuse_bytes +: Number of bytes in use by mspan structures + +go_memstats_mspan_sys_bytes +: Number of bytes used for mspan structures obtained from system + +go_memstats_next_gc_bytes +: Number of heap bytes when next garbage collection will take place + +go_memstats_other_sys_bytes +: Number of bytes used for other system allocations + +go_memstats_stack_inuse_bytes +: Number of bytes in use by the stack allocator + +go_memstats_stack_sys_bytes +: Number of bytes obtained from system for stack allocator + +go_memstats_sys_bytes +: Number of bytes obtained from system + +go_threads +: Number of OS threads created + +promhttp_metric_handler_requests_in_flight +: Current number of scrapes being served + +promhttp_metric_handler_requests_total +: Total number of scrapes by HTTP status code diff --git a/docs/getting-started.md b/docs/getting-started.md index 0647364c5..46f942bb4 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -1,7 +1,7 @@ --- title: "Getting Started" date: 2020-02-27T20:35:00+01:00 -weight: 20 +weight: 15 geekdocRepo: https://github.com/owncloud/ocis geekdocEditPath: edit/master/docs geekdocFilePath: getting-started.md @@ -15,24 +15,55 @@ So far we are offering two different variants for the installation. You can choo ### Docker -TBD +Docker images for ocis are hosted on https://hub.docker.com/r/owncloud/ocis. + +The `latest` tag always reflects the current master branch. + +```console +docker pull owncloud/ocis +``` + +#### Dependencies + +- Running ocis currently needs a working Redis caching server +- The default storage location in the container is `/var/tmp/reva/data`. You may want to create a volume to persist the files in the primary storage + +#### Docker compose + +You can use our docker-compose [playground example](https://github.com/owncloud-docker/compose-playground/tree/master/ocis) to run ocis with dependencies with a single command in a docker network. + +```console +git clone git@github.com:owncloud-docker/compose-playground.git +cd compose-playground/ocis +docker-compose -f ocis.yml -f ../cache/redis-ocis.yml up +``` ### Binaries -TBD +The pre-built binaries for different platforms are downloadable at https://download.owncloud.com/ocis/ocis/ . Specific releases are organized in separate folders. They are in sync which every release tag on GitHub. The binaries from the current master branch can be found in https://download.owncloud.com/ocis/ocis/testing/ -## Quickstart +```console +curl https://download.owncloud.com/ocis/ocis/1.0.0-beta1/ocis-1.0.0-beta1-darwin-amd64 --output ocis +chmod +x ocis +./ocis server +``` + +#### Dependencies + +- Running ocis currently needs a working Redis caching server +- The default promary storage location is `/var/tmp/reva/data`. You can change that value by configuration. + +## Quickstart for Developers Following https://github.com/owncloud/ocis#development ```console git clone https://github.com/owncloud/ocis.git cd ocis -make build -mkdir /var/tmp/reva/root/{home,oc} +make generate build ``` -Open http://localhost:9100 and login using one of the demo accounts: +Open https://localhost:9200 and login using one of the demo accounts: ```console einstein:relativity @@ -76,230 +107,3 @@ com.owncloud.api.hello To the list of available services. -## Configuration - -oCIS Single Binary is not responsible for configuring extensions. Instead, each extension could either be configured by environment variables, cli flags or config files. - -### Configuration using config files - -Out of the box extensions will attempt to read configuration details from: - -```console -/etc/ocis -$HOME/.ocis -./config -``` - -For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `ocis.json | yaml | toml ...`*. - -> Important note: As per the time of this writing, Viper does not play nice with urfave/cli flags, this results in values defined on config files taking precedence over cli flags. This behavior is different with environment variables, these will ALWAYS override any value, as they are the most explicit. - -### Envrionment variables - -If you prefer to configure the service with environment variables you can see the available variables below. - -#### Global - -OCIS_LOG_LEVEL -: Set logging level, defaults to `info` - -OCIS_LOG_COLOR -: Enable colored logging, defaults to `true` - -OCIS_LOG_PRETTY -: Enable pretty logging, defaults to `true` - -#### Server - -OCIS_DEBUG_ADDR -: Address to bind debug server, defaults to `0.0.0.0:9010` - -OCIS_DEBUG_TOKEN -: Token to grant metrics access, empty default value - -OCIS_DEBUG_PPROF -: Enable pprof debugging, defaults to `false` - -OCIS_HTTP_ADDR -: Address to bind http server, defaults to `0.0.0.0:9000` - -OCIS_HTTP_ROOT -: Root path for http endpoint, defaults to `/` - -OCIS_GRPC_ADDR -: Address to bind grpc server, defaults to `0.0.0.0:9001` - -OCIS_SERVICES_ENABLED -: List of enabled services, defaults to `phoenix,konnectd,graph,ocs,webdav,hello` - -#### Health - -OCIS_DEBUG_ADDR -: Address to debug endpoint, defaults to `0.0.0.0:9010` - -### Commandline flags - -If you prefer to configure the service with commandline flags you can see the available variables below. - -#### Global - ---log-level -: Set logging level, defaults to `info` - ---log-color -: Enable colored logging, defaults to `true` - ---log-pretty -: Enable pretty logging, defaults to `true` - -#### Server - ---debug-addr -: Address to bind debug server, defaults to `0.0.0.0:9010` - ---debug-token -: Token to grant metrics access, empty default value - ---debug-pprof -: Enable pprof debugging, defaults to `false` - ---http-addr -: Address to bind http server, defaults to `0.0.0.0:9000` - ---http-root -: Root path for http endpoint, defaults to `/` - ---grpc-addr -: Address to bind grpc server, defaults to `0.0.0.0:9001` - ---services-enabled -: List of enabled services, defaults to `hello,phoenix,graph,graph-explorer,ocs,webdav,reva-frontend,reva-gateway,reva-users,reva-auth-basic,reva-auth-bearer,reva-sharing,reva-storage-root,reva-storage-home,reva-storage-home-data,reva-storage-oc,reva-storage-oc-data,devldap` - -#### Health - ---debug-addr -: Address to debug endpoint, defaults to `0.0.0.0:9010` - -### Configuration file - -So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/ocis.yml`, `${HOME}/.ocis/ocis.yml` or `$(pwd)/config/ocis.yml`. - -## Usage - -The program provides a few sub-commands on execution. The available configuration methods have already been mentioned above. Generally you can always see a formated help output if you execute the binary via `ocis --help`. - -### Server - -The server command is used to start the http and debug server on two addresses within a single process. The http server is serving the general webservice while the debug server is used for health check, readiness check and to server the metrics mentioned below. For further help please execute: - -{{< highlight txt >}} -ocis server --help -{{< / highlight >}} - -### Health - -The health command is used to execute a health check, if the exit code equals zero the service should be up and running, if the exist code is greater than zero the service is not in a healthy state. Generally this command is used within our Docker containers, it could also be used within Kubernetes. - -{{< highlight txt >}} -ocis health --help -{{< / highlight >}} - -## Metrics - -This service provides some [Prometheus](https://prometheus.io/) metrics through the debug endpoint, you can optionally secure the metrics endpoint by some random token, which got to be configured through one of the flag `--debug-token` or the environment variable `OCIS_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:8001/metrics`. - -go_gc_duration_seconds -: A summary of the GC invocation durations - -go_gc_duration_seconds_sum -: A summary of the GC invocation durations - -go_gc_duration_seconds_count -: A summary of the GC invocation durations - -go_goroutines -: Number of goroutines that currently exist - -go_info -: Information about the Go environment - -go_memstats_alloc_bytes -: Number of bytes allocated and still in use - -go_memstats_alloc_bytes_total -: Total number of bytes allocated, even if freed - -go_memstats_buck_hash_sys_bytes -: Number of bytes used by the profiling bucket hash table - -go_memstats_frees_total -: Total number of frees - -go_memstats_gc_cpu_fraction -: The fraction of this program's available CPU time used by the GC since the program started - -go_memstats_gc_sys_bytes -: Number of bytes used for garbage collection system metadata - -go_memstats_heap_alloc_bytes -: Number of heap bytes allocated and still in use - -go_memstats_heap_idle_bytes -: Number of heap bytes waiting to be used - -go_memstats_heap_inuse_bytes -: Number of heap bytes that are in use - -go_memstats_heap_objects -: Number of allocated objects - -go_memstats_heap_released_bytes -: Number of heap bytes released to OS - -go_memstats_heap_sys_bytes -: Number of heap bytes obtained from system - -go_memstats_last_gc_time_seconds -: Number of seconds since 1970 of last garbage collection - -go_memstats_lookups_total -: Total number of pointer lookups - -go_memstats_mallocs_total -: Total number of mallocs - -go_memstats_mcache_inuse_bytes -: Number of bytes in use by mcache structures - -go_memstats_mcache_sys_bytes -: Number of bytes used for mcache structures obtained from system - -go_memstats_mspan_inuse_bytes -: Number of bytes in use by mspan structures - -go_memstats_mspan_sys_bytes -: Number of bytes used for mspan structures obtained from system - -go_memstats_next_gc_bytes -: Number of heap bytes when next garbage collection will take place - -go_memstats_other_sys_bytes -: Number of bytes used for other system allocations - -go_memstats_stack_inuse_bytes -: Number of bytes in use by the stack allocator - -go_memstats_stack_sys_bytes -: Number of bytes obtained from system for stack allocator - -go_memstats_sys_bytes -: Number of bytes obtained from system - -go_threads -: Number of OS threads created - -promhttp_metric_handler_requests_in_flight -: Current number of scrapes being served - -promhttp_metric_handler_requests_total -: Total number of scrapes by HTTP status code From f15e6185fe75770f2d55754346b64032d48e4f95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 20 Mar 2020 16:37:55 +0100 Subject: [PATCH 2/4] config file is service specific --- docs/configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/configuration.md b/docs/configuration.md index d4a2709f5..6cc7a97e5 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -23,7 +23,7 @@ $HOME/.ocis ./config ``` -For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `ocis.json | yaml | toml ...`*. +For this configuration to be picked up, have a look at your extension `root` command and look for which default config name it has assigned. *i.e: ocis-proxy reads `proxy.json | yaml | toml ...`*. ### Envrionment variables From 25b13269d62fe901026c6cd592a756aea6ef9bdd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Sun, 22 Mar 2020 09:59:51 +0100 Subject: [PATCH 3/4] update reva to v0.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- changelog/unreleased/updated-extensions.md | 5 ++--- go.mod | 2 +- go.sum | 18 ++++++++++-------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/changelog/unreleased/updated-extensions.md b/changelog/unreleased/updated-extensions.md index e0f2855b4..9b31cb7e1 100644 --- a/changelog/unreleased/updated-extensions.md +++ b/changelog/unreleased/updated-extensions.md @@ -5,8 +5,7 @@ We've updated various extensions to a tagged release: - ocis-glauth v0.4.0 - ocis-phoenix v0.3.0 (phoenix v0.6.0) - ocis-pkg v2.1.0 -- ocis-proxy -v0.1.0 - -We also updated ocis-reva to a PR commit that brings the latest reva to ocis. Work on the PR is ongoing because some acceptance tests fail. +- ocis-proxy v0.1.0 +- ocis-reva v0.1.0 https://github.com/owncloud/ocis/pull/151 diff --git a/go.mod b/go.mod index 1454b7ccd..c7e56d6d9 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/owncloud/ocis-phoenix v0.3.0 github.com/owncloud/ocis-pkg/v2 v2.1.0 github.com/owncloud/ocis-proxy v0.1.0 - github.com/owncloud/ocis-reva v0.0.0-20200318210849-075c6608b85f + github.com/owncloud/ocis-reva v0.1.0 github.com/owncloud/ocis-thumbnails v0.0.0-20200318131505-e0ab0b37a5a4 github.com/owncloud/ocis-webdav v0.0.0-20200319135906-711d1be75a2b go.opencensus.io v0.22.3 diff --git a/go.sum b/go.sum index 01b416cc3..bb7fe9772 100644 --- a/go.sum +++ b/go.sum @@ -83,8 +83,8 @@ github.com/ascarter/requestid v0.0.0-20170313220838-5b76ab3d4aee/go.mod h1:u7Wtt github.com/aws/aws-sdk-go v1.23.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.28.2 h1:j5IXG9CdyLfcVfICqo1PXVv+rua+QQHbkXuvuU/JF+8= github.com/aws/aws-sdk-go v1.28.2/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= -github.com/aws/aws-sdk-go v1.29.26 h1:T8LJNOVt0HZgJQySeE+1Pr3ClcX+rb7ddq/ZAjnHzDc= -github.com/aws/aws-sdk-go v1.29.26/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= +github.com/aws/aws-sdk-go v1.29.28 h1:4eKUDBN+v1yxpGDxxPY+FG2Abc6yJB6vvkEDRJ9jIW0= +github.com/aws/aws-sdk-go v1.29.28/go.mod h1:1KvfttTE3SPKMpo8g2c6jL3ZKfXtFvKscTgahTma5Xg= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= github.com/beevik/ntp v0.2.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg= github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= @@ -164,12 +164,12 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:ma github.com/creack/pty v1.1.7 h1:6pwm8kMQKCmgUg0ZHTm5+/YvRK0s3THD/28+T6/kk4A= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/cs3org/go-cs3apis v0.0.0-20191128165347-19746c015c83/go.mod h1:IsVGyZrOLUQD48JIhlM/xb3Vz6He5o2+W0ZTfUGY+IU= -github.com/cs3org/go-cs3apis v0.0.0-20200115100126-824a5f718250 h1:N/WWs9OegcgFlsUo7/iahxq+e3luhZKu0B8wLrWBsTQ= -github.com/cs3org/go-cs3apis v0.0.0-20200115100126-824a5f718250/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= +github.com/cs3org/go-cs3apis v0.0.0-20200306065539-29abc33f5be0 h1:jTKILSBtDm0GEw3FtXPxc5wxGpaw2pxzREg1GBV9LIQ= +github.com/cs3org/go-cs3apis v0.0.0-20200306065539-29abc33f5be0/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5 h1:PkGon9KVtcApu462KRAmFV3iKHOk0S0CRoEzoar4eyE= github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv4eIhKvRK736fQuOyS1HuHnUcz0Dq6NK1A= -github.com/cs3org/reva v0.0.2-0.20200318111623-a2f97d4aa741 h1:7GjGW/GFVMr1eQLRV1f2hi2wLGVQzA3m1ZGqW/blLiE= -github.com/cs3org/reva v0.0.2-0.20200318111623-a2f97d4aa741/go.mod h1:Vx5IitCX4vrPmLAwQGWAEb3O4AMxsSbOlzRngEqOrus= +github.com/cs3org/reva v0.1.1-0.20200320145721-40c4334849c3 h1:7BfCqdqybadKHM54yat8xvmjVdZhbRpHsEkv5705ASU= +github.com/cs3org/reva v0.1.1-0.20200320145721-40c4334849c3/go.mod h1:Gbm21YRiquCdR34ATmcp6HF0IGSr/EyhSIm/jHh0ZCc= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -491,6 +491,8 @@ github.com/mitchellh/hashstructure v1.0.0 h1:ZkRJX1CyOoTkar7p/mLS5TZU4nJ1Rn/F8u9 github.com/mitchellh/hashstructure v1.0.0/go.mod h1:QjSHrPWS+BGUVBYkbTZWEnOh3G1DutKwClXU/ABz6AQ= github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.2.1 h1:pSevhhKCEjOuZHQWDBYAHxcimg60m1fGFj6atY7zAdE= +github.com/mitchellh/mapstructure v1.2.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/reflectwalk v1.0.0 h1:9D+8oIskB4VJBN5SFlmc27fSlIBZaov1Wpk/IfikLNY= github.com/mitchellh/reflectwalk v1.0.0/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -600,8 +602,8 @@ github.com/owncloud/ocis-pkg/v2 v2.1.0 h1:DVKIb4jG8heUvHz2BIhLW44PnwT6A/FvqeFO80 github.com/owncloud/ocis-pkg/v2 v2.1.0/go.mod h1:MXv7QzsYsu4YWuyJxhq1kLLmJa/r5gbqHe1FXulMHaw= github.com/owncloud/ocis-proxy v0.1.0 h1:i37TizGuaNI+AOK0YfsNggC+c5ubXx6IAwCvmczKTps= github.com/owncloud/ocis-proxy v0.1.0/go.mod h1:nwSlXX2QQy+Z8ut77ZuSSxbKoe39jIqFNLs0lMwnyoE= -github.com/owncloud/ocis-reva v0.0.0-20200318210849-075c6608b85f h1:rkzdB/TRww6WcHhYhsbG9XyJeebdjZLx125rT+RfXbM= -github.com/owncloud/ocis-reva v0.0.0-20200318210849-075c6608b85f/go.mod h1:Bx9Akm4mFs5h8fAbzsViCe+oqQ3sImjBNO/FFGFcsWw= +github.com/owncloud/ocis-reva v0.1.0 h1:et21rAqLMCUI6BpuZ0YRekM0qwm9NTI6XouDlvTV3QA= +github.com/owncloud/ocis-reva v0.1.0/go.mod h1:cV9QOm+fdr1hHg8h49JCragWTQ4yRTDt3e0ZncuwDBM= github.com/owncloud/ocis-thumbnails v0.0.0-20200318131505-e0ab0b37a5a4 h1:A0Swro39iP0VPUaLiY6JRzShfria6b2Nq/VjF9ZNbuY= github.com/owncloud/ocis-thumbnails v0.0.0-20200318131505-e0ab0b37a5a4/go.mod h1:VmCoxwitTs6oRxIaGz6xridLPwA6ReRMej22jBhkRIM= github.com/owncloud/ocis-webdav v0.0.0-20200319135906-711d1be75a2b h1:UQY6JOAl7uZAZqP1apoIv8sxTU67pxcH7j4Bj3SB64k= From 2cefbad21a39daca85c1b59beb2f4d36ab4379de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 23 Mar 2020 09:49:54 +0000 Subject: [PATCH 4/4] Automated changelog update [skip ci] --- CHANGELOG.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df20b2919..79114e795 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,10 +36,8 @@ * Enhancement - Update extensions: [#151](https://github.com/owncloud/ocis/pull/151) We've updated various extensions to a tagged release: - ocis-konnectd v0.2.0 - ocis-glauth - v0.4.0 - ocis-phoenix v0.3.0 (phoenix v0.6.0) - ocis-pkg v2.1.0 - ocis-proxy -v0.1.0 - - We also updated ocis-reva to a PR commit that brings the latest reva to ocis. Work on the PR is - ongoing because some acceptance tests fail. + v0.4.0 - ocis-phoenix v0.3.0 (phoenix v0.6.0) - ocis-pkg v2.1.0 - ocis-proxy v0.1.0 - + ocis-reva v0.1.0 https://github.com/owncloud/ocis/pull/151