From 13dbfc6e6cde8d7df3267d2438085a454c971f54 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 4 Feb 2021 11:38:26 +0100 Subject: [PATCH 01/10] update deps --- ocis-graph/go.sum | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ocis-graph/go.sum b/ocis-graph/go.sum index 0e002db3fc..4e33b7270a 100644 --- a/ocis-graph/go.sum +++ b/ocis-graph/go.sum @@ -122,6 +122,7 @@ github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.0 h1:yTUvW7Vhb89inJ+8irsUqiWjh8iT6sQPZiQzI6ReGkA= github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= @@ -168,6 +169,7 @@ github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpu/goacmedns v0.0.1/go.mod h1:sesf/pNnCYwUevQEQfEwY0Y3DydlQWSGZbaMElOWxok= +github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d h1:U+s90UTSYgptZMwQh2aRr3LuazLJIa+Pg3Kc1ylSYVY= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= @@ -431,6 +433,7 @@ github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.1 h1:DqDEcV5aeaTmdFBePNpYsp3FlcVH/2ISVVM9Qf8PSls= github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A= github.com/golang/gddo v0.0.0-20180828051604-96d2a289f41e/go.mod h1:xEhNfoBDX1hzLm2Nf80qUvZ2sVwoMZ8d6IE2SrsQfh4= @@ -586,6 +589,7 @@ github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/justinas/alice v1.2.0 h1:+MHSA/vccVCF4Uq37S42jwlkvI2Xzl7zTPCN5BnZNVo= @@ -877,6 +881,7 @@ github.com/rs/zerolog v1.17.2/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF github.com/rs/zerolog v1.19.0 h1:hYz4ZVdUgjXTBUmrkrw55j1nHx68LfOKIQk5IYtyScg= github.com/rs/zerolog v1.19.0/go.mod h1:IzD0RJ65iWH0w97OQQebJEvTZYvsCUm9WVLWBQrJRjo= github.com/rubenv/sql-migrate v0.0.0-20190212093014-1007f53448d7/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY= +github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -909,9 +914,11 @@ github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMB github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20180222194500-ef6db91d284a/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4 h1:0HKaf1o97UwFjHH9o5XsHUOF+tqmdA7KEzXLpiyaw0E= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -931,6 +938,7 @@ github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3 github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -1255,6 +1263,7 @@ golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 h1:xQwXv67TxFo9nC1GJFyab5eq/5B590r6RlnL/G8Sz7w= golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1420,6 +1429,7 @@ gopkg.in/h2non/gock.v1 v1.0.14/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdOD gopkg.in/h2non/gock.v1 v1.0.15/go.mod h1:sX4zAkdYX1TRGJ2JY156cFspQn4yRWn6p9EMdODlynE= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.44.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mail.v2 v2.0.0-20180731213649-a0242b2233b4/go.mod h1:htwXN1Qh09vZJ1NVKxQqHPBaCBbzKhp5GzuJEA4VJWw= gopkg.in/ns1/ns1-go.v2 v2.0.0-20190730140822-b51389932cbc/go.mod h1:VV+3haRsgDiVLxyifmMBrBIuCWFBPYKbRssXB9z67Hw= From f55a8092cb1f5ffbc749fde9b7e7b6d2e1b4ae90 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 4 Feb 2021 11:46:32 +0100 Subject: [PATCH 02/10] adjust imports --- {ocis-graph => graph}/.codacy.yml | 0 {ocis-graph => graph}/.dockerignore | 0 {ocis-graph => graph}/.drone.star | 0 {ocis-graph => graph}/.editorconfig | 0 {ocis-graph => graph}/.github/config.yml | 0 {ocis-graph => graph}/.github/issue_template.md | 0 {ocis-graph => graph}/.github/pull_request_template.md | 0 {ocis-graph => graph}/.github/settings.yml | 0 {ocis-graph => graph}/.gitignore | 0 {ocis-graph => graph}/CHANGELOG.md | 0 {ocis-graph => graph}/LICENSE | 0 {ocis-graph => graph}/Makefile | 0 {ocis-graph => graph}/README.md | 0 {ocis-graph => graph}/changelog/CHANGELOG.tmpl | 0 {ocis-graph => graph}/changelog/README.md | 0 {ocis-graph => graph}/changelog/TEMPLATE | 0 {ocis-graph => graph}/changelog/unreleased/.keep | 0 .../changelog/unreleased/config-management.md | 0 .../changelog/unreleased/initial-release.md | 0 .../unreleased/remove-incompatible-dependency.md | 0 .../changelog/unreleased/use-alpine-latest.md | 0 {ocis-graph/cmd/ocis-graph => graph/cmd/graph}/main.go | 2 +- {ocis-graph => graph}/config/example.json | 0 {ocis-graph => graph}/config/example.yml | 0 {ocis-graph => graph}/docker/Dockerfile.linux.amd64 | 0 {ocis-graph => graph}/docker/Dockerfile.linux.arm | 0 {ocis-graph => graph}/docker/Dockerfile.linux.arm64 | 0 {ocis-graph => graph}/docker/manifest.tmpl | 0 {ocis-graph => graph}/docs/.gitignore | 0 {ocis-graph => graph}/docs/archetypes/default.md | 0 {ocis-graph => graph}/docs/config.toml | 0 {ocis-graph => graph}/docs/content/about.md | 0 {ocis-graph => graph}/docs/content/building.md | 0 {ocis-graph => graph}/docs/content/getting-started.md | 0 {ocis-graph => graph}/docs/content/license.md | 0 {ocis-graph => graph}/docs/layouts/_default/list.html | 0 .../docs/layouts/_default/single.html | 0 {ocis-graph => graph}/docs/layouts/index.html | 0 {ocis-graph => graph}/docs/layouts/partials/style.html | 0 {ocis-graph => graph}/docs/static/styles.css | 0 {ocis-graph => graph}/docs/static/syntax.css | 0 {ocis-graph => graph}/go.mod | 2 +- {ocis-graph => graph}/go.sum | 0 {ocis-graph => graph}/pkg/command/health.go | 4 ++-- {ocis-graph => graph}/pkg/command/root.go | 8 ++++---- {ocis-graph => graph}/pkg/command/server.go | 10 +++++----- {ocis-graph => graph}/pkg/config/config.go | 0 {ocis-graph => graph}/pkg/cs3/client.go | 0 {ocis-graph => graph}/pkg/flagset/flagset.go | 2 +- {ocis-graph => graph}/pkg/metrics/metrics.go | 0 {ocis-graph => graph}/pkg/server/debug/option.go | 2 +- {ocis-graph => graph}/pkg/server/debug/server.go | 4 ++-- {ocis-graph => graph}/pkg/server/http/option.go | 4 ++-- {ocis-graph => graph}/pkg/server/http/server.go | 4 ++-- {ocis-graph => graph}/pkg/service/v0/drives.go | 0 .../pkg/service/v0/errorcode/errorcode.go | 0 {ocis-graph => graph}/pkg/service/v0/graph.go | 4 ++-- {ocis-graph => graph}/pkg/service/v0/groups.go | 2 +- {ocis-graph => graph}/pkg/service/v0/instrument.go | 2 +- {ocis-graph => graph}/pkg/service/v0/ldap.go | 0 {ocis-graph => graph}/pkg/service/v0/logging.go | 0 {ocis-graph => graph}/pkg/service/v0/option.go | 2 +- {ocis-graph => graph}/pkg/service/v0/service.go | 0 {ocis-graph => graph}/pkg/service/v0/tracing.go | 0 {ocis-graph => graph}/pkg/service/v0/users.go | 2 +- {ocis-graph => graph}/pkg/version/version.go | 0 {ocis-graph => graph}/reflex.conf | 0 67 files changed, 27 insertions(+), 27 deletions(-) rename {ocis-graph => graph}/.codacy.yml (100%) rename {ocis-graph => graph}/.dockerignore (100%) rename {ocis-graph => graph}/.drone.star (100%) rename {ocis-graph => graph}/.editorconfig (100%) rename {ocis-graph => graph}/.github/config.yml (100%) rename {ocis-graph => graph}/.github/issue_template.md (100%) rename {ocis-graph => graph}/.github/pull_request_template.md (100%) rename {ocis-graph => graph}/.github/settings.yml (100%) rename {ocis-graph => graph}/.gitignore (100%) rename {ocis-graph => graph}/CHANGELOG.md (100%) rename {ocis-graph => graph}/LICENSE (100%) rename {ocis-graph => graph}/Makefile (100%) rename {ocis-graph => graph}/README.md (100%) rename {ocis-graph => graph}/changelog/CHANGELOG.tmpl (100%) rename {ocis-graph => graph}/changelog/README.md (100%) rename {ocis-graph => graph}/changelog/TEMPLATE (100%) rename {ocis-graph => graph}/changelog/unreleased/.keep (100%) rename {ocis-graph => graph}/changelog/unreleased/config-management.md (100%) rename {ocis-graph => graph}/changelog/unreleased/initial-release.md (100%) rename {ocis-graph => graph}/changelog/unreleased/remove-incompatible-dependency.md (100%) rename {ocis-graph => graph}/changelog/unreleased/use-alpine-latest.md (100%) rename {ocis-graph/cmd/ocis-graph => graph/cmd/graph}/main.go (70%) rename {ocis-graph => graph}/config/example.json (100%) rename {ocis-graph => graph}/config/example.yml (100%) rename {ocis-graph => graph}/docker/Dockerfile.linux.amd64 (100%) rename {ocis-graph => graph}/docker/Dockerfile.linux.arm (100%) rename {ocis-graph => graph}/docker/Dockerfile.linux.arm64 (100%) rename {ocis-graph => graph}/docker/manifest.tmpl (100%) rename {ocis-graph => graph}/docs/.gitignore (100%) rename {ocis-graph => graph}/docs/archetypes/default.md (100%) rename {ocis-graph => graph}/docs/config.toml (100%) rename {ocis-graph => graph}/docs/content/about.md (100%) rename {ocis-graph => graph}/docs/content/building.md (100%) rename {ocis-graph => graph}/docs/content/getting-started.md (100%) rename {ocis-graph => graph}/docs/content/license.md (100%) rename {ocis-graph => graph}/docs/layouts/_default/list.html (100%) rename {ocis-graph => graph}/docs/layouts/_default/single.html (100%) rename {ocis-graph => graph}/docs/layouts/index.html (100%) rename {ocis-graph => graph}/docs/layouts/partials/style.html (100%) rename {ocis-graph => graph}/docs/static/styles.css (100%) rename {ocis-graph => graph}/docs/static/syntax.css (100%) rename {ocis-graph => graph}/go.mod (95%) rename {ocis-graph => graph}/go.sum (100%) rename {ocis-graph => graph}/pkg/command/health.go (90%) rename {ocis-graph => graph}/pkg/command/root.go (92%) rename {ocis-graph => graph}/pkg/command/server.go (94%) rename {ocis-graph => graph}/pkg/config/config.go (100%) rename {ocis-graph => graph}/pkg/cs3/client.go (100%) rename {ocis-graph => graph}/pkg/flagset/flagset.go (99%) rename {ocis-graph => graph}/pkg/metrics/metrics.go (100%) rename {ocis-graph => graph}/pkg/server/debug/option.go (95%) rename {ocis-graph => graph}/pkg/server/debug/server.go (93%) rename {ocis-graph => graph}/pkg/server/http/option.go (94%) rename {ocis-graph => graph}/pkg/server/http/server.go (93%) rename {ocis-graph => graph}/pkg/service/v0/drives.go (100%) rename {ocis-graph => graph}/pkg/service/v0/errorcode/errorcode.go (100%) rename {ocis-graph => graph}/pkg/service/v0/graph.go (90%) rename {ocis-graph => graph}/pkg/service/v0/groups.go (97%) rename {ocis-graph => graph}/pkg/service/v0/instrument.go (94%) rename {ocis-graph => graph}/pkg/service/v0/ldap.go (100%) rename {ocis-graph => graph}/pkg/service/v0/logging.go (100%) rename {ocis-graph => graph}/pkg/service/v0/option.go (95%) rename {ocis-graph => graph}/pkg/service/v0/service.go (100%) rename {ocis-graph => graph}/pkg/service/v0/tracing.go (100%) rename {ocis-graph => graph}/pkg/service/v0/users.go (97%) rename {ocis-graph => graph}/pkg/version/version.go (100%) rename {ocis-graph => graph}/reflex.conf (100%) diff --git a/ocis-graph/.codacy.yml b/graph/.codacy.yml similarity index 100% rename from ocis-graph/.codacy.yml rename to graph/.codacy.yml diff --git a/ocis-graph/.dockerignore b/graph/.dockerignore similarity index 100% rename from ocis-graph/.dockerignore rename to graph/.dockerignore diff --git a/ocis-graph/.drone.star b/graph/.drone.star similarity index 100% rename from ocis-graph/.drone.star rename to graph/.drone.star diff --git a/ocis-graph/.editorconfig b/graph/.editorconfig similarity index 100% rename from ocis-graph/.editorconfig rename to graph/.editorconfig diff --git a/ocis-graph/.github/config.yml b/graph/.github/config.yml similarity index 100% rename from ocis-graph/.github/config.yml rename to graph/.github/config.yml diff --git a/ocis-graph/.github/issue_template.md b/graph/.github/issue_template.md similarity index 100% rename from ocis-graph/.github/issue_template.md rename to graph/.github/issue_template.md diff --git a/ocis-graph/.github/pull_request_template.md b/graph/.github/pull_request_template.md similarity index 100% rename from ocis-graph/.github/pull_request_template.md rename to graph/.github/pull_request_template.md diff --git a/ocis-graph/.github/settings.yml b/graph/.github/settings.yml similarity index 100% rename from ocis-graph/.github/settings.yml rename to graph/.github/settings.yml diff --git a/ocis-graph/.gitignore b/graph/.gitignore similarity index 100% rename from ocis-graph/.gitignore rename to graph/.gitignore diff --git a/ocis-graph/CHANGELOG.md b/graph/CHANGELOG.md similarity index 100% rename from ocis-graph/CHANGELOG.md rename to graph/CHANGELOG.md diff --git a/ocis-graph/LICENSE b/graph/LICENSE similarity index 100% rename from ocis-graph/LICENSE rename to graph/LICENSE diff --git a/ocis-graph/Makefile b/graph/Makefile similarity index 100% rename from ocis-graph/Makefile rename to graph/Makefile diff --git a/ocis-graph/README.md b/graph/README.md similarity index 100% rename from ocis-graph/README.md rename to graph/README.md diff --git a/ocis-graph/changelog/CHANGELOG.tmpl b/graph/changelog/CHANGELOG.tmpl similarity index 100% rename from ocis-graph/changelog/CHANGELOG.tmpl rename to graph/changelog/CHANGELOG.tmpl diff --git a/ocis-graph/changelog/README.md b/graph/changelog/README.md similarity index 100% rename from ocis-graph/changelog/README.md rename to graph/changelog/README.md diff --git a/ocis-graph/changelog/TEMPLATE b/graph/changelog/TEMPLATE similarity index 100% rename from ocis-graph/changelog/TEMPLATE rename to graph/changelog/TEMPLATE diff --git a/ocis-graph/changelog/unreleased/.keep b/graph/changelog/unreleased/.keep similarity index 100% rename from ocis-graph/changelog/unreleased/.keep rename to graph/changelog/unreleased/.keep diff --git a/ocis-graph/changelog/unreleased/config-management.md b/graph/changelog/unreleased/config-management.md similarity index 100% rename from ocis-graph/changelog/unreleased/config-management.md rename to graph/changelog/unreleased/config-management.md diff --git a/ocis-graph/changelog/unreleased/initial-release.md b/graph/changelog/unreleased/initial-release.md similarity index 100% rename from ocis-graph/changelog/unreleased/initial-release.md rename to graph/changelog/unreleased/initial-release.md diff --git a/ocis-graph/changelog/unreleased/remove-incompatible-dependency.md b/graph/changelog/unreleased/remove-incompatible-dependency.md similarity index 100% rename from ocis-graph/changelog/unreleased/remove-incompatible-dependency.md rename to graph/changelog/unreleased/remove-incompatible-dependency.md diff --git a/ocis-graph/changelog/unreleased/use-alpine-latest.md b/graph/changelog/unreleased/use-alpine-latest.md similarity index 100% rename from ocis-graph/changelog/unreleased/use-alpine-latest.md rename to graph/changelog/unreleased/use-alpine-latest.md diff --git a/ocis-graph/cmd/ocis-graph/main.go b/graph/cmd/graph/main.go similarity index 70% rename from ocis-graph/cmd/ocis-graph/main.go rename to graph/cmd/graph/main.go index 57f4587029..bc98213e3a 100644 --- a/ocis-graph/cmd/ocis-graph/main.go +++ b/graph/cmd/graph/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/ocis-graph/pkg/command" + "github.com/owncloud/ocis/graph/pkg/command" ) func main() { diff --git a/ocis-graph/config/example.json b/graph/config/example.json similarity index 100% rename from ocis-graph/config/example.json rename to graph/config/example.json diff --git a/ocis-graph/config/example.yml b/graph/config/example.yml similarity index 100% rename from ocis-graph/config/example.yml rename to graph/config/example.yml diff --git a/ocis-graph/docker/Dockerfile.linux.amd64 b/graph/docker/Dockerfile.linux.amd64 similarity index 100% rename from ocis-graph/docker/Dockerfile.linux.amd64 rename to graph/docker/Dockerfile.linux.amd64 diff --git a/ocis-graph/docker/Dockerfile.linux.arm b/graph/docker/Dockerfile.linux.arm similarity index 100% rename from ocis-graph/docker/Dockerfile.linux.arm rename to graph/docker/Dockerfile.linux.arm diff --git a/ocis-graph/docker/Dockerfile.linux.arm64 b/graph/docker/Dockerfile.linux.arm64 similarity index 100% rename from ocis-graph/docker/Dockerfile.linux.arm64 rename to graph/docker/Dockerfile.linux.arm64 diff --git a/ocis-graph/docker/manifest.tmpl b/graph/docker/manifest.tmpl similarity index 100% rename from ocis-graph/docker/manifest.tmpl rename to graph/docker/manifest.tmpl diff --git a/ocis-graph/docs/.gitignore b/graph/docs/.gitignore similarity index 100% rename from ocis-graph/docs/.gitignore rename to graph/docs/.gitignore diff --git a/ocis-graph/docs/archetypes/default.md b/graph/docs/archetypes/default.md similarity index 100% rename from ocis-graph/docs/archetypes/default.md rename to graph/docs/archetypes/default.md diff --git a/ocis-graph/docs/config.toml b/graph/docs/config.toml similarity index 100% rename from ocis-graph/docs/config.toml rename to graph/docs/config.toml diff --git a/ocis-graph/docs/content/about.md b/graph/docs/content/about.md similarity index 100% rename from ocis-graph/docs/content/about.md rename to graph/docs/content/about.md diff --git a/ocis-graph/docs/content/building.md b/graph/docs/content/building.md similarity index 100% rename from ocis-graph/docs/content/building.md rename to graph/docs/content/building.md diff --git a/ocis-graph/docs/content/getting-started.md b/graph/docs/content/getting-started.md similarity index 100% rename from ocis-graph/docs/content/getting-started.md rename to graph/docs/content/getting-started.md diff --git a/ocis-graph/docs/content/license.md b/graph/docs/content/license.md similarity index 100% rename from ocis-graph/docs/content/license.md rename to graph/docs/content/license.md diff --git a/ocis-graph/docs/layouts/_default/list.html b/graph/docs/layouts/_default/list.html similarity index 100% rename from ocis-graph/docs/layouts/_default/list.html rename to graph/docs/layouts/_default/list.html diff --git a/ocis-graph/docs/layouts/_default/single.html b/graph/docs/layouts/_default/single.html similarity index 100% rename from ocis-graph/docs/layouts/_default/single.html rename to graph/docs/layouts/_default/single.html diff --git a/ocis-graph/docs/layouts/index.html b/graph/docs/layouts/index.html similarity index 100% rename from ocis-graph/docs/layouts/index.html rename to graph/docs/layouts/index.html diff --git a/ocis-graph/docs/layouts/partials/style.html b/graph/docs/layouts/partials/style.html similarity index 100% rename from ocis-graph/docs/layouts/partials/style.html rename to graph/docs/layouts/partials/style.html diff --git a/ocis-graph/docs/static/styles.css b/graph/docs/static/styles.css similarity index 100% rename from ocis-graph/docs/static/styles.css rename to graph/docs/static/styles.css diff --git a/ocis-graph/docs/static/syntax.css b/graph/docs/static/syntax.css similarity index 100% rename from ocis-graph/docs/static/syntax.css rename to graph/docs/static/syntax.css diff --git a/ocis-graph/go.mod b/graph/go.mod similarity index 95% rename from ocis-graph/go.mod rename to graph/go.mod index f180a981a2..29ecdd8e15 100644 --- a/ocis-graph/go.mod +++ b/graph/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis-graph +module github.com/owncloud/ocis/graph go 1.13 diff --git a/ocis-graph/go.sum b/graph/go.sum similarity index 100% rename from ocis-graph/go.sum rename to graph/go.sum diff --git a/ocis-graph/pkg/command/health.go b/graph/pkg/command/health.go similarity index 90% rename from ocis-graph/pkg/command/health.go rename to graph/pkg/command/health.go index 9dccd1221a..7da27c3ce0 100644 --- a/ocis-graph/pkg/command/health.go +++ b/graph/pkg/command/health.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/flagset" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/flagset" ) // Health is the entrypoint for the health command. diff --git a/ocis-graph/pkg/command/root.go b/graph/pkg/command/root.go similarity index 92% rename from ocis-graph/pkg/command/root.go rename to graph/pkg/command/root.go index 9e48b23b09..dd0ca3b5be 100644 --- a/ocis-graph/pkg/command/root.go +++ b/graph/pkg/command/root.go @@ -5,10 +5,10 @@ import ( "strings" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/flagset" - "github.com/owncloud/ocis-graph/pkg/version" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/flagset" + "github.com/owncloud/ocis/graph/pkg/version" "github.com/spf13/viper" ) @@ -17,7 +17,7 @@ func Execute() error { cfg := config.New() app := &cli.App{ - Name: "ocis-graph", + Name: "graph", Version: version.String, Usage: "Serve Graph API for oCIS", Compiled: version.Compiled(), diff --git a/ocis-graph/pkg/command/server.go b/graph/pkg/command/server.go similarity index 94% rename from ocis-graph/pkg/command/server.go rename to graph/pkg/command/server.go index ef48d2a81f..902d5550d1 100644 --- a/ocis-graph/pkg/command/server.go +++ b/graph/pkg/command/server.go @@ -14,11 +14,11 @@ import ( "github.com/oklog/run" openzipkin "github.com/openzipkin/zipkin-go" zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/flagset" - "github.com/owncloud/ocis-graph/pkg/metrics" - "github.com/owncloud/ocis-graph/pkg/server/debug" - "github.com/owncloud/ocis-graph/pkg/server/http" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/flagset" + "github.com/owncloud/ocis/graph/pkg/metrics" + "github.com/owncloud/ocis/graph/pkg/server/debug" + "github.com/owncloud/ocis/graph/pkg/server/http" "go.opencensus.io/stats/view" "go.opencensus.io/trace" ) diff --git a/ocis-graph/pkg/config/config.go b/graph/pkg/config/config.go similarity index 100% rename from ocis-graph/pkg/config/config.go rename to graph/pkg/config/config.go diff --git a/ocis-graph/pkg/cs3/client.go b/graph/pkg/cs3/client.go similarity index 100% rename from ocis-graph/pkg/cs3/client.go rename to graph/pkg/cs3/client.go diff --git a/ocis-graph/pkg/flagset/flagset.go b/graph/pkg/flagset/flagset.go similarity index 99% rename from ocis-graph/pkg/flagset/flagset.go rename to graph/pkg/flagset/flagset.go index e78104d973..6e90116dea 100644 --- a/ocis-graph/pkg/flagset/flagset.go +++ b/graph/pkg/flagset/flagset.go @@ -2,7 +2,7 @@ package flagset import ( "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/config" ) // RootWithConfig applies cfg to the root flagset diff --git a/ocis-graph/pkg/metrics/metrics.go b/graph/pkg/metrics/metrics.go similarity index 100% rename from ocis-graph/pkg/metrics/metrics.go rename to graph/pkg/metrics/metrics.go diff --git a/ocis-graph/pkg/server/debug/option.go b/graph/pkg/server/debug/option.go similarity index 95% rename from ocis-graph/pkg/server/debug/option.go rename to graph/pkg/server/debug/option.go index 5cb3e51272..7cb1ee71d8 100644 --- a/ocis-graph/pkg/server/debug/option.go +++ b/graph/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis-graph/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph/pkg/config" ) // Option defines a single option function. diff --git a/ocis-graph/pkg/server/debug/server.go b/graph/pkg/server/debug/server.go similarity index 93% rename from ocis-graph/pkg/server/debug/server.go rename to graph/pkg/server/debug/server.go index 5bebcabe3b..ff5bd8e14d 100644 --- a/ocis-graph/pkg/server/debug/server.go +++ b/graph/pkg/server/debug/server.go @@ -4,9 +4,9 @@ import ( "io" "net/http" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/version" "github.com/owncloud/ocis-pkg/v2/service/debug" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/version" ) // Server initializes the debug service and server. diff --git a/ocis-graph/pkg/server/http/option.go b/graph/pkg/server/http/option.go similarity index 94% rename from ocis-graph/pkg/server/http/option.go rename to graph/pkg/server/http/option.go index 4e6daad5a4..0835a45709 100644 --- a/ocis-graph/pkg/server/http/option.go +++ b/graph/pkg/server/http/option.go @@ -4,9 +4,9 @@ import ( "context" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/metrics" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/metrics" ) // Option defines a single option function. diff --git a/ocis-graph/pkg/server/http/server.go b/graph/pkg/server/http/server.go similarity index 93% rename from ocis-graph/pkg/server/http/server.go rename to graph/pkg/server/http/server.go index 0d762e7e53..758fdf62b8 100644 --- a/ocis-graph/pkg/server/http/server.go +++ b/graph/pkg/server/http/server.go @@ -1,11 +1,11 @@ package http import ( - svc "github.com/owncloud/ocis-graph/pkg/service/v0" - "github.com/owncloud/ocis-graph/pkg/version" "github.com/owncloud/ocis-pkg/v2/middleware" "github.com/owncloud/ocis-pkg/v2/oidc" "github.com/owncloud/ocis-pkg/v2/service/http" + svc "github.com/owncloud/ocis/graph/pkg/service/v0" + "github.com/owncloud/ocis/graph/pkg/version" ) // Server initializes the http service and server. diff --git a/ocis-graph/pkg/service/v0/drives.go b/graph/pkg/service/v0/drives.go similarity index 100% rename from ocis-graph/pkg/service/v0/drives.go rename to graph/pkg/service/v0/drives.go diff --git a/ocis-graph/pkg/service/v0/errorcode/errorcode.go b/graph/pkg/service/v0/errorcode/errorcode.go similarity index 100% rename from ocis-graph/pkg/service/v0/errorcode/errorcode.go rename to graph/pkg/service/v0/errorcode/errorcode.go diff --git a/ocis-graph/pkg/service/v0/graph.go b/graph/pkg/service/v0/graph.go similarity index 90% rename from ocis-graph/pkg/service/v0/graph.go rename to graph/pkg/service/v0/graph.go index 35ea17513d..40f466791a 100644 --- a/ocis-graph/pkg/service/v0/graph.go +++ b/graph/pkg/service/v0/graph.go @@ -5,9 +5,9 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/go-chi/chi" - "github.com/owncloud/ocis-graph/pkg/config" - "github.com/owncloud/ocis-graph/pkg/cs3" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph/pkg/config" + "github.com/owncloud/ocis/graph/pkg/cs3" ) // Graph defines implements the business logic for Service. diff --git a/ocis-graph/pkg/service/v0/groups.go b/graph/pkg/service/v0/groups.go similarity index 97% rename from ocis-graph/pkg/service/v0/groups.go rename to graph/pkg/service/v0/groups.go index aaac64bbe4..f2fef81f3d 100644 --- a/ocis-graph/pkg/service/v0/groups.go +++ b/graph/pkg/service/v0/groups.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis-graph/pkg/service/v0/errorcode" + "github.com/owncloud/ocis/graph/pkg/service/v0/errorcode" "github.com/go-chi/chi" "github.com/go-chi/render" diff --git a/ocis-graph/pkg/service/v0/instrument.go b/graph/pkg/service/v0/instrument.go similarity index 94% rename from ocis-graph/pkg/service/v0/instrument.go rename to graph/pkg/service/v0/instrument.go index b427a0c51b..878945f786 100644 --- a/ocis-graph/pkg/service/v0/instrument.go +++ b/graph/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis-graph/pkg/metrics" + "github.com/owncloud/ocis/graph/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/ocis-graph/pkg/service/v0/ldap.go b/graph/pkg/service/v0/ldap.go similarity index 100% rename from ocis-graph/pkg/service/v0/ldap.go rename to graph/pkg/service/v0/ldap.go diff --git a/ocis-graph/pkg/service/v0/logging.go b/graph/pkg/service/v0/logging.go similarity index 100% rename from ocis-graph/pkg/service/v0/logging.go rename to graph/pkg/service/v0/logging.go diff --git a/ocis-graph/pkg/service/v0/option.go b/graph/pkg/service/v0/option.go similarity index 95% rename from ocis-graph/pkg/service/v0/option.go rename to graph/pkg/service/v0/option.go index 107b745639..98c584f189 100644 --- a/ocis-graph/pkg/service/v0/option.go +++ b/graph/pkg/service/v0/option.go @@ -3,8 +3,8 @@ package svc import ( "net/http" - "github.com/owncloud/ocis-graph/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" + "github.com/owncloud/ocis/graph/pkg/config" ) // Option defines a single option function. diff --git a/ocis-graph/pkg/service/v0/service.go b/graph/pkg/service/v0/service.go similarity index 100% rename from ocis-graph/pkg/service/v0/service.go rename to graph/pkg/service/v0/service.go diff --git a/ocis-graph/pkg/service/v0/tracing.go b/graph/pkg/service/v0/tracing.go similarity index 100% rename from ocis-graph/pkg/service/v0/tracing.go rename to graph/pkg/service/v0/tracing.go diff --git a/ocis-graph/pkg/service/v0/users.go b/graph/pkg/service/v0/users.go similarity index 97% rename from ocis-graph/pkg/service/v0/users.go rename to graph/pkg/service/v0/users.go index 673e461cc5..fb4579f07c 100644 --- a/ocis-graph/pkg/service/v0/users.go +++ b/graph/pkg/service/v0/users.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis-graph/pkg/service/v0/errorcode" + "github.com/owncloud/ocis/graph/pkg/service/v0/errorcode" "github.com/go-chi/chi" "github.com/go-chi/render" diff --git a/ocis-graph/pkg/version/version.go b/graph/pkg/version/version.go similarity index 100% rename from ocis-graph/pkg/version/version.go rename to graph/pkg/version/version.go diff --git a/ocis-graph/reflex.conf b/graph/reflex.conf similarity index 100% rename from ocis-graph/reflex.conf rename to graph/reflex.conf From a7c9414be909708ee50e28ff57ba1cb840dca80e Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 4 Feb 2021 11:54:27 +0100 Subject: [PATCH 03/10] adjustments around dependencies and runtime --- ocis/go.mod | 2 ++ ocis/go.sum | 14 ++++++++++++++ ocis/pkg/config/config.go | 6 +++--- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ocis/go.mod b/ocis/go.mod index 22197add2c..a93cc3f07f 100644 --- a/ocis/go.mod +++ b/ocis/go.mod @@ -20,6 +20,7 @@ require ( github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200828085053-37fcf3c8f853 github.com/owncloud/ocis/accounts v0.5.3-0.20201103104733-ff2c41028d9b github.com/owncloud/ocis/glauth v0.0.0-00010101000000-000000000000 + github.com/owncloud/ocis/graph v0.0.0-20210204104632-f55a8092cb1f // indirect github.com/owncloud/ocis/idp v0.0.0-00010101000000-000000000000 github.com/owncloud/ocis/ocis-pkg v0.1.0 github.com/owncloud/ocis/ocs v0.0.0-00010101000000-000000000000 @@ -55,5 +56,6 @@ replace ( github.com/owncloud/ocis/thumbnails => ../thumbnails github.com/owncloud/ocis/web => ../web github.com/owncloud/ocis/webdav => ../webdav + github.com/owncloud/ocis/graph => ../graph google.golang.org/grpc => google.golang.org/grpc v1.26.0 ) diff --git a/ocis/go.sum b/ocis/go.sum index ba68cd407d..465624e03a 100644 --- a/ocis/go.sum +++ b/ocis/go.sum @@ -259,6 +259,7 @@ github.com/cs3org/cato v0.0.0-20200626150132-28a40e643719/go.mod h1:XJEZ3/EQuI3B github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= 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-20200730121022-c4f3d4f7ddfd/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= +github.com/cs3org/go-cs3apis v0.0.0-20200810113633-b00aca449666/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21 h1:mZpylrgnCgSeaZ5EznvHIPIKuaQHMHZDi2wkJtk4M8Y= github.com/cs3org/go-cs3apis v0.0.0-20201118090759-87929f5bae21/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv4eIhKvRK736fQuOyS1HuHnUcz0Dq6NK1A= @@ -1066,6 +1067,7 @@ github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203/go.mod h1:jip86t4OV github.com/owncloud/flaex v0.2.0 h1:3FLf8oyMgA6HLK7w4+VJ5N1oVA8G7MptLCVjfxxIaww= github.com/owncloud/flaex v0.2.0/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8kex4JWw= github.com/owncloud/ocis v1.0.0 h1:gtQZZSEzbSRucGPl3Ag5BOelZuw2OGv2e6WLAJMvQTQ= +github.com/owncloud/ocis v1.1.0-rc1.0.20210204104632-f55a8092cb1f h1:Pbs1vYQ63bJj0pZxKw2J7ZV42fV9bT8h2JKVg/XQ3eo= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7 h1:gT0GyIOoR7XtpZ7sIxVJSckcz/nueGB1Cm1xNaflXQ0= github.com/owncloud/ocis-graph v0.0.0-20200318175820-9a5a6e029db7/go.mod h1:IRm6BBJqyPhYI+3fm5bWkhgFL/yh63ASUznFqN4yXgs= github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c h1:8g3u2JwOMP/UE+0B+YjV7UWEQzyCPbnZzwIto6lNc0I= @@ -1073,9 +1075,12 @@ github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c/go.mo github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200828085053-37fcf3c8f853 h1:ei0C5Wmppw+9oiSB0XpAdwymD8+ZnmewNdVVzYE3UvQ= github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200828085053-37fcf3c8f853/go.mod h1:vnpYlDkhVoiuUAuTnY4Ajz2d5Alz0c/49AxptOLTpYA= github.com/owncloud/ocis-pkg/v2 v2.0.1/go.mod h1:7bVnn3VUaqdmvpMkXF0QVEF1fRugs35hSkuVTAq9yjk= +github.com/owncloud/ocis-pkg/v2 v2.2.1/go.mod h1:MXv7QzsYsu4YWuyJxhq1kLLmJa/r5gbqHe1FXulMHaw= github.com/owncloud/ocis-pkg/v2 v2.4.0 h1:/3ZOd4txtwjiNKJA9iLT9BjrJw5YgHSX13fQR4BYfGY= github.com/owncloud/ocis-pkg/v2 v2.4.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-settings v0.3.2-0.20200827193534-8caf098e6537/go.mod h1:vRge9QDkOsc6j76gPBmZs1Z5uOPrV4DIkZCgZCEFwBA= +github.com/owncloud/ocis/graph v0.0.0-20210204104632-f55a8092cb1f h1:W8dKPVxlABfOeNx9hao7Zmx/tqovjT+5imUXY+e4Ge0= +github.com/owncloud/ocis/graph v0.0.0-20210204104632-f55a8092cb1f/go.mod h1:cpCxSvyOOTCZVihIYVOlbsw1ypNJUHVz3wI4v5OGkC4= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw= github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0= github.com/parnurzeal/gorequest v0.2.15/go.mod h1:3Kh2QUMJoqw3icWAecsyzkpY7UzRfDhbRdTjtNwNiUE= @@ -1168,6 +1173,10 @@ github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qq github.com/restic/calens v0.1.0/go.mod h1:u67f5msOjCTDYNzOf/NoAUSdmXP03YXPCwIQLYADy5M= github.com/restic/calens v0.2.0 h1:LVNAtmFc+Pb4ODX66qdX1T3Di1P0OTLyUsVyvM/xD7E= github.com/restic/calens v0.2.0/go.mod h1:UXwyAKS4wsgUZGEc7NrzzygJbLsQZIo3wl+62Q1wvmU= +github.com/rickb777/date v1.12.4 h1:+6IzcCCS/1t17DrmnEvrznyq7nM8vPwir6/UhlyohKw= +github.com/rickb777/date v1.12.4/go.mod h1:xP0eo/I5qmUt97yRGClHZfyLZ3ikMw6v6SU5MOGZTE0= +github.com/rickb777/plural v1.2.0 h1:5tvEc7UBCZ7l8h/2UeybSkt/uu1DQsZFOFdNevmUhlE= +github.com/rickb777/plural v1.2.0/go.mod h1:UdpyWFCGbo3mvK3f/PfZOAOrkjzJlYN/sD46XNWJ+Es= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.0.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -1347,6 +1356,9 @@ github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63M github.com/yaegashi/msgraph.go v0.0.0-20191104022859-3f9096c750b2/go.mod h1:tso14hwzqX4VbnWTNsxiL0DvMb2OwbGISFA7jDibdWc= github.com/yaegashi/msgraph.go v0.1.1-0.20200221123608-2d438cf2a7cc h1:ejaC8rvIvCWmsaFrvmGOxhBuMxxhBB1xRshuM98XQ7M= github.com/yaegashi/msgraph.go v0.1.1-0.20200221123608-2d438cf2a7cc/go.mod h1:tso14hwzqX4VbnWTNsxiL0DvMb2OwbGISFA7jDibdWc= +github.com/yaegashi/msgraph.go v0.1.4 h1:leDXSczAbwBpYFSmmZrdByTiPoUw8dbTfNMetAjJvbw= +github.com/yaegashi/msgraph.go v0.1.4/go.mod h1:vgeYhHa5skJt/3lTyjGXThTZhwbhRnGo6uUxzoJIGME= +github.com/yaegashi/wtz.go v0.0.2/go.mod h1:nOLA5QXsmdkRxBkP5tljhua13ADHCKirLBrzPf4PEJc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1698,7 +1710,9 @@ golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200529172331-a64b76657301/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200721223218-6123e77877b2/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200731060945-b5fad4ed8dd6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200811215021-48a8ffc5b207 h1:8Kg+JssU1jBZs8GIrL5pl4nVyaqyyhdmHAR4D1zGErg= golang.org/x/tools v0.0.0-20200811215021-48a8ffc5b207/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= diff --git a/ocis/pkg/config/config.go b/ocis/pkg/config/config.go index 4c9bce3751..ba75de32a4 100644 --- a/ocis/pkg/config/config.go +++ b/ocis/pkg/config/config.go @@ -7,6 +7,7 @@ import ( accounts "github.com/owncloud/ocis/accounts/pkg/config" glauth "github.com/owncloud/ocis/glauth/pkg/config" idp "github.com/owncloud/ocis/idp/pkg/config" + pman "github.com/owncloud/ocis/ocis/pkg/runtime/config" ocs "github.com/owncloud/ocis/ocs/pkg/config" onlyoffice "github.com/owncloud/ocis/onlyoffice/pkg/config" proxy "github.com/owncloud/ocis/proxy/pkg/config" @@ -16,7 +17,6 @@ import ( thumbnails "github.com/owncloud/ocis/thumbnails/pkg/config" web "github.com/owncloud/ocis/web/pkg/config" webdav "github.com/owncloud/ocis/webdav/pkg/config" - pman "github.com/refs/pman/pkg/config" ) // Log defines the available logging configuration. @@ -75,7 +75,7 @@ type Config struct { Graph *graph.Config GraphExplorer *graphExplorer.Config Hello *hello.Config - IDP *idp.Config + IDP *idp.Config OCS *ocs.Config Onlyoffice *onlyoffice.Config Web *web.Config @@ -96,7 +96,7 @@ func New() *Config { Graph: graph.New(), GraphExplorer: graphExplorer.New(), Hello: hello.New(), - IDP: idp.New(), + IDP: idp.New(), OCS: ocs.New(), Onlyoffice: onlyoffice.New(), Web: web.New(), From 937a07f2c65c81ae9228a11d19e56d303dfdf553 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 4 Feb 2021 11:58:50 +0100 Subject: [PATCH 04/10] add changelog --- changelog/unreleased/port-ocis-graph.md | 7 +++++ graph/changelog/CHANGELOG.tmpl | 28 ------------------- graph/changelog/README.md | 6 ---- graph/changelog/TEMPLATE | 11 -------- graph/changelog/unreleased/.keep | 0 .../changelog/unreleased/config-management.md | 5 ---- graph/changelog/unreleased/initial-release.md | 6 ---- .../remove-incompatible-dependency.md | 5 ---- .../changelog/unreleased/use-alpine-latest.md | 5 ---- 9 files changed, 7 insertions(+), 66 deletions(-) create mode 100644 changelog/unreleased/port-ocis-graph.md delete mode 100644 graph/changelog/CHANGELOG.tmpl delete mode 100644 graph/changelog/README.md delete mode 100644 graph/changelog/TEMPLATE delete mode 100644 graph/changelog/unreleased/.keep delete mode 100644 graph/changelog/unreleased/config-management.md delete mode 100644 graph/changelog/unreleased/initial-release.md delete mode 100644 graph/changelog/unreleased/remove-incompatible-dependency.md delete mode 100644 graph/changelog/unreleased/use-alpine-latest.md diff --git a/changelog/unreleased/port-ocis-graph.md b/changelog/unreleased/port-ocis-graph.md new file mode 100644 index 0000000000..533d6f73fb --- /dev/null +++ b/changelog/unreleased/port-ocis-graph.md @@ -0,0 +1,7 @@ +Enhancement: Migrate ocis-graph to ocis monorepo + +Tags: ocis, ocis-graph + +Ocis-graph was not migrated during the monorepo conversion. + +https://github.com/owncloud/ocis/pull/1594 diff --git a/graph/changelog/CHANGELOG.tmpl b/graph/changelog/CHANGELOG.tmpl deleted file mode 100644 index 3fee894812..0000000000 --- a/graph/changelog/CHANGELOG.tmpl +++ /dev/null @@ -1,28 +0,0 @@ -{{- range $changes := . }}{{ with $changes -}} -# Changelog for {{ .Version }} - -The following sections list the changes for {{ .Version }}. - -## Summary -{{ range $entry := .Entries }}{{ with $entry }} - * {{ .TypeShort }} #{{ .PrimaryID }}: {{ .Title }} -{{- end }}{{ end }} - -## Details -{{ range $entry := .Entries }}{{ with $entry }} - * {{ .Type }} #{{ .PrimaryID }}: {{ .Title }} -{{ range $par := .Paragraphs }} - {{ wrap $par 80 3 }} -{{ end -}} -{{ range $url := .IssueURLs }} - {{ $url -}} -{{ end -}} -{{ range $url := .PRURLs }} - {{ $url -}} -{{ end -}} -{{ range $url := .OtherURLs }} - {{ $url -}} -{{ end }} -{{ end }}{{ end }} - -{{ end }}{{ end -}} diff --git a/graph/changelog/README.md b/graph/changelog/README.md deleted file mode 100644 index 0ae5d5b3e2..0000000000 --- a/graph/changelog/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# Changelog - -We are using [calens](https://github.com/restic/calens) to properly generate a -changelog before we are tagging a new release. To get an idea how this could -look like would be the -best reference. diff --git a/graph/changelog/TEMPLATE b/graph/changelog/TEMPLATE deleted file mode 100644 index a284668662..0000000000 --- a/graph/changelog/TEMPLATE +++ /dev/null @@ -1,11 +0,0 @@ -Bugfix: Fix behavior for foobar (in present tense) - -We've fixed the behavior for foobar, a long-standing annoyance for users. The -text should be wrapped at 80 characters length. - -The text in the paragraphs is written in past tense. The last section is a list -of issue URLs, PR URLs and other URLs. The first issue ID (or the first PR ID, -in case there aren't any issue links) is used as the primary ID. - -https://github.com/owncloud/ocis-graph/issues/1234 -https://github.com/owncloud/ocis-graph/pull/55555 diff --git a/graph/changelog/unreleased/.keep b/graph/changelog/unreleased/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/graph/changelog/unreleased/config-management.md b/graph/changelog/unreleased/config-management.md deleted file mode 100644 index 903a0420d1..0000000000 --- a/graph/changelog/unreleased/config-management.md +++ /dev/null @@ -1,5 +0,0 @@ -Enhancement: Configuration - -Extensions should be responsible of configuring themselves. We use Viper for config loading from default paths. Environment variables **WILL** take precedence over config files. - -https://github.com/owncloud/ocis-graph/pull/27 diff --git a/graph/changelog/unreleased/initial-release.md b/graph/changelog/unreleased/initial-release.md deleted file mode 100644 index e744c86a34..0000000000 --- a/graph/changelog/unreleased/initial-release.md +++ /dev/null @@ -1,6 +0,0 @@ -Change: Initial release of basic version - -Just prepare an initial basic version to serve a graph world API that can be -used by Phoenix or other extensions. - -https://github.com/owncloud/ocis-graph/issues/7 diff --git a/graph/changelog/unreleased/remove-incompatible-dependency.md b/graph/changelog/unreleased/remove-incompatible-dependency.md deleted file mode 100644 index 54fd21aaa7..0000000000 --- a/graph/changelog/unreleased/remove-incompatible-dependency.md +++ /dev/null @@ -1,5 +0,0 @@ -Bugfix: remove redigo 2.0.0+incompatible dependency - -get rid of redigo v2.0.0 - -https://github.com/owncloud/ocis-graph/pull/33 diff --git a/graph/changelog/unreleased/use-alpine-latest.md b/graph/changelog/unreleased/use-alpine-latest.md deleted file mode 100644 index 56ba6cbfa5..0000000000 --- a/graph/changelog/unreleased/use-alpine-latest.md +++ /dev/null @@ -1,5 +0,0 @@ -Bugfix: build docker images with alpine:latest instead of alpine:edge - -ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - -https://github.com/owncloud/ocis-graph/pull/32 From c0651479f49820b146cb44790adcbd9f832bce84 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Thu, 4 Feb 2021 12:04:40 +0100 Subject: [PATCH 05/10] fix makefiles --- graph/.codacy.yml | 8 - graph/.drone.star | 654 ------------------------- graph/.editorconfig | 35 -- graph/.github/config.yml | 12 - graph/.github/issue_template.md | 0 graph/.github/pull_request_template.md | 0 graph/.github/settings.yml | 98 ---- graph/.gitignore | 4 - graph/CHANGELOG.md | 33 -- graph/Makefile | 22 +- graph/README.md | 45 -- 11 files changed, 16 insertions(+), 895 deletions(-) delete mode 100644 graph/.codacy.yml delete mode 100644 graph/.drone.star delete mode 100644 graph/.editorconfig delete mode 100644 graph/.github/config.yml delete mode 100644 graph/.github/issue_template.md delete mode 100644 graph/.github/pull_request_template.md delete mode 100644 graph/.github/settings.yml delete mode 100644 graph/.gitignore delete mode 100644 graph/CHANGELOG.md delete mode 100644 graph/README.md diff --git a/graph/.codacy.yml b/graph/.codacy.yml deleted file mode 100644 index 855b4f298b..0000000000 --- a/graph/.codacy.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -exclude_paths: - - CHANGELOG.md - - changelog/** - - docs/** - - pkg/proto/** - -... diff --git a/graph/.drone.star b/graph/.drone.star deleted file mode 100644 index c1bba64194..0000000000 --- a/graph/.drone.star +++ /dev/null @@ -1,654 +0,0 @@ -def main(ctx): - before = [ - testing(ctx), - ] - - stages = [ - docker(ctx, 'amd64'), - docker(ctx, 'arm64'), - docker(ctx, 'arm'), - binary(ctx, 'linux'), - binary(ctx, 'darwin'), - binary(ctx, 'windows'), - ] - - after = [ - manifest(ctx), - changelog(ctx), - readme(ctx), - badges(ctx), - website(ctx), - ] - - return before + stages + after - -def testing(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'testing', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'generate', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make generate', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'vet', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make vet', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'staticcheck', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make staticcheck', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'lint', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make lint', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'build', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make build', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'test', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make test', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'codacy', - 'image': 'plugins/codacy:1', - 'pull': 'always', - 'settings': { - 'token': { - 'from_secret': 'codacy_token', - }, - }, - }, - ], - 'volumes': [ - { - 'name': 'gopath', - 'temp': {}, - }, - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - 'refs/pull/**', - ], - }, - } - -def docker(ctx, arch): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': arch, - 'platform': { - 'os': 'linux', - 'arch': arch, - }, - 'steps': [ - { - 'name': 'generate', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make generate', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'build', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make build', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'dryrun', - 'image': 'plugins/docker:18.09', - 'pull': 'always', - 'settings': { - 'dry_run': True, - 'tags': 'linux-%s' % (arch), - 'dockerfile': 'docker/Dockerfile.linux.%s' % (arch), - 'repo': ctx.repo.slug, - }, - 'when': { - 'ref': { - 'include': [ - 'refs/pull/**', - ], - }, - }, - }, - { - 'name': 'docker', - 'image': 'plugins/docker:18.09', - 'pull': 'always', - 'settings': { - 'username': { - 'from_secret': 'docker_username', - }, - 'password': { - 'from_secret': 'docker_password', - }, - 'auto_tag': True, - 'auto_tag_suffix': 'linux-%s' % (arch), - 'dockerfile': 'docker/Dockerfile.linux.%s' % (arch), - 'repo': ctx.repo.slug, - }, - 'when': { - 'ref': { - 'exclude': [ - 'refs/pull/**', - ], - }, - }, - }, - ], - 'volumes': [ - { - 'name': 'gopath', - 'temp': {}, - }, - ], - 'depends_on': [ - 'testing', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - 'refs/pull/**', - ], - }, - } - -def binary(ctx, name): - if ctx.build.event == "tag": - settings = { - 'endpoint': { - 'from_secret': 's3_endpoint', - }, - 'access_key': { - 'from_secret': 'aws_access_key_id', - }, - 'secret_key': { - 'from_secret': 'aws_secret_access_key', - }, - 'bucket': { - 'from_secret': 's3_bucket', - }, - 'path_style': True, - 'strip_prefix': 'dist/release/', - 'source': 'dist/release/*', - 'target': '/ocis/%s/%s' % (ctx.repo.name.replace("ocis-", ""), ctx.build.ref.replace("refs/tags/v", "")), - } - else: - settings = { - 'endpoint': { - 'from_secret': 's3_endpoint', - }, - 'access_key': { - 'from_secret': 'aws_access_key_id', - }, - 'secret_key': { - 'from_secret': 'aws_secret_access_key', - }, - 'bucket': { - 'from_secret': 's3_bucket', - }, - 'path_style': True, - 'strip_prefix': 'dist/release/', - 'source': 'dist/release/*', - 'target': '/ocis/%s/testing' % (ctx.repo.name.replace("ocis-", "")), - } - - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': name, - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'generate', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make generate', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'build', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make release-%s' % (name), - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'finish', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make release-finish', - ], - 'volumes': [ - { - 'name': 'gopath', - 'path': '/srv/app', - }, - ], - }, - { - 'name': 'upload', - 'image': 'plugins/s3:1', - 'pull': 'always', - 'settings': settings, - 'when': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - }, - { - 'name': 'changelog', - 'image': 'toolhippie/calens:latest', - 'pull': 'always', - 'commands': [ - 'calens --version %s -o dist/CHANGELOG.md' % ctx.build.ref.replace("refs/tags/v", "").split("-")[0], - ], - 'when': { - 'ref': [ - 'refs/tags/**', - ], - }, - }, - { - 'name': 'release', - 'image': 'plugins/github-release:1', - 'pull': 'always', - 'settings': { - 'api_key': { - 'from_secret': 'github_token', - }, - 'files': [ - 'dist/release/*', - ], - 'title': ctx.build.ref.replace("refs/tags/", ""), - 'note': 'dist/CHANGELOG.md', - 'overwrite': True, - }, - 'when': { - 'ref': [ - 'refs/tags/**', - ], - }, - }, - ], - 'volumes': [ - { - 'name': 'gopath', - 'temp': {}, - }, - ], - 'depends_on': [ - 'testing', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - 'refs/pull/**', - ], - }, - } - -def manifest(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'manifest', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'execute', - 'image': 'plugins/manifest:1', - 'pull': 'always', - 'settings': { - 'username': { - 'from_secret': 'docker_username', - }, - 'password': { - 'from_secret': 'docker_password', - }, - 'spec': 'docker/manifest.tmpl', - 'auto_tag': True, - 'ignore_missing': True, - }, - }, - ], - 'depends_on': [ - 'amd64', - 'arm64', - 'arm', - 'linux', - 'darwin', - 'windows', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - } - -def changelog(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'changelog', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'clone': { - 'disable': True, - }, - 'steps': [ - { - 'name': 'clone', - 'image': 'plugins/git-action:1', - 'pull': 'always', - 'settings': { - 'actions': [ - 'clone', - ], - 'remote': 'https://github.com/%s' % (ctx.repo.slug), - 'branch': ctx.build.branch if ctx.build.event == 'pull_request' else 'master', - 'path': '/drone/src', - 'netrc_machine': 'github.com', - 'netrc_username': { - 'from_secret': 'github_username', - }, - 'netrc_password': { - 'from_secret': 'github_token', - }, - }, - }, - { - 'name': 'generate', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'make changelog', - ], - }, - { - 'name': 'output', - 'image': 'webhippie/golang:1.13', - 'pull': 'always', - 'commands': [ - 'cat CHANGELOG.md', - ], - }, - { - 'name': 'publish', - 'image': 'plugins/git-action:1', - 'pull': 'always', - 'settings': { - 'actions': [ - 'commit', - 'push', - ], - 'message': 'Automated changelog update [skip ci]', - 'branch': 'master', - 'author_email': 'devops@owncloud.com', - 'author_name': 'ownClouders', - 'netrc_machine': 'github.com', - 'netrc_username': { - 'from_secret': 'github_username', - }, - 'netrc_password': { - 'from_secret': 'github_token', - }, - }, - 'when': { - 'ref': { - 'exclude': [ - 'refs/pull/**', - ], - }, - }, - }, - ], - 'depends_on': [ - 'manifest', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - } - -def readme(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'readme', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'execute', - 'image': 'sheogorath/readme-to-dockerhub:latest', - 'pull': 'always', - 'environment': { - 'DOCKERHUB_USERNAME': { - 'from_secret': 'docker_username', - }, - 'DOCKERHUB_PASSWORD': { - 'from_secret': 'docker_password', - }, - 'DOCKERHUB_REPO_PREFIX': ctx.repo.namespace, - 'DOCKERHUB_REPO_NAME': ctx.repo.name, - 'SHORT_DESCRIPTION': 'Docker images for %s' % (ctx.repo.name), - 'README_PATH': 'README.md', - }, - }, - ], - 'depends_on': [ - 'changelog', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - } - -def badges(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'badges', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'execute', - 'image': 'plugins/webhook:1', - 'pull': 'always', - 'settings': { - 'urls': { - 'from_secret': 'microbadger_url', - }, - }, - }, - ], - 'depends_on': [ - 'readme', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - } - -def website(ctx): - return { - 'kind': 'pipeline', - 'type': 'docker', - 'name': 'website', - 'platform': { - 'os': 'linux', - 'arch': 'amd64', - }, - 'steps': [ - { - 'name': 'generate', - 'image': 'webhippie/hugo:latest', - 'pull': 'always', - 'commands': [ - 'make docs', - ], - }, - { - 'name': 'publish', - 'image': 'plugins/gh-pages:1', - 'pull': 'always', - 'settings': { - 'username': { - 'from_secret': 'github_username', - }, - 'password': { - 'from_secret': 'github_token', - }, - 'pages_directory': 'docs/public/', - 'temporary_base': 'tmp/', - }, - 'when': { - 'ref': { - 'exclude': [ - 'refs/pull/**', - ], - }, - }, - }, - ], - 'depends_on': [ - 'badges', - ], - 'trigger': { - 'ref': [ - 'refs/heads/master', - 'refs/pull/**', - ], - }, - } diff --git a/graph/.editorconfig b/graph/.editorconfig deleted file mode 100644 index 77129cd393..0000000000 --- a/graph/.editorconfig +++ /dev/null @@ -1,35 +0,0 @@ -# http://editorconfig.org - -root = true - -[*] -charset = utf-8 -insert_final_newline = true -trim_trailing_whitespace = true - -[Makefile] -indent_style = tab -indent_size = 4 - -[*.go] -indent_style = tab -indent_size = 4 - -[*.starlark] -indent_style = space -indent_size = 2 - -[*.{yml,json}] -indent_style = space -indent_size = 2 - -[*.{js,vue}] -indent_style = space -indent_size = 2 - -[*.{css,less}] -indent_style = space -indent_size = 2 - -[*.md] -trim_trailing_whitespace = true diff --git a/graph/.github/config.yml b/graph/.github/config.yml deleted file mode 100644 index 110195aceb..0000000000 --- a/graph/.github/config.yml +++ /dev/null @@ -1,12 +0,0 @@ -# Configuration for update-docs - https://github.com/behaviorbot/update-docs - -# Comment to be posted to on PRs that don't update documentation -updateDocsComment: > - Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis-graph/blob/master/changelog/README.md) item based on your changes. -updateDocsWhiteList: - - Tests-only - - tests-only - - Tests-Only - -updateDocsTargetFiles: - - changelog/unreleased/ diff --git a/graph/.github/issue_template.md b/graph/.github/issue_template.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/graph/.github/pull_request_template.md b/graph/.github/pull_request_template.md deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/graph/.github/settings.yml b/graph/.github/settings.yml deleted file mode 100644 index 469b6ecad0..0000000000 --- a/graph/.github/settings.yml +++ /dev/null @@ -1,98 +0,0 @@ ---- -repository: - name: ocis-graph - description: ':atom_symbol: Serve Graph API for oCIS' - homepage: https://owncloud.github.io/ocis-graph/ - topics: reva, ocis - - private: false - has_issues: true - has_projects: false - has_wiki: false - has_downloads: false - - default_branch: master - - allow_squash_merge: true - allow_merge_commit: true - allow_rebase_merge: true - -labels: - - name: bug - color: d73a4a - description: Something isn't working - - name: documentation - color: 0075ca - description: Improvements or additions to documentation - - name: duplicate - color: cfd3d7 - description: This issue or pull request already exists - - name: enhancement - color: a2eeef - description: New feature or request - - name: good first issue - color: 7057ff - description: Good for newcomers - - name: help wanted - color: 008672 - description: Extra attention is needed - - name: invalid - color: e4e669 - description: This doesn't seem right - - name: question - color: d876e3 - description: Further information is requested - - name: wontfix - color: ffffff - description: This will not be worked on - - name: effort/trivial - color: c2e0c6 - description: Required effort to finish task - - name: effort/0.25d - color: c2e0c6 - description: Required effort to finish task - - name: effort/0.5d - color: c2e0c6 - description: Required effort to finish task - - name: effort/1d - color: c2e0c6 - description: Required effort to finish task - - name: effort/2d - color: c2e0c6 - description: Required effort to finish task - - name: effort/4d - color: c2e0c6 - description: Required effort to finish task - - name: effort/5d - color: c2e0c6 - description: Required effort to finish task - - name: effort/10d - color: c2e0c6 - description: Required effort to finish task - -teams: - - name: ci - permission: admin - - name: employees - permission: push - -branches: - - name: master - protection: - required_pull_request_reviews: - required_approving_review_count: 1 - dismiss_stale_reviews: false - require_code_owner_reviews: false - dismissal_restrictions: {} - required_status_checks: - strict: true - contexts: - - continuous-integration/drone/pr - enforce_admins: false - restrictions: - users: [] - teams: - - ci - - employees - -... diff --git a/graph/.gitignore b/graph/.gitignore deleted file mode 100644 index 88846a9f3c..0000000000 --- a/graph/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -coverage.out - -/bin -/dist diff --git a/graph/CHANGELOG.md b/graph/CHANGELOG.md deleted file mode 100644 index 25b3752bfe..0000000000 --- a/graph/CHANGELOG.md +++ /dev/null @@ -1,33 +0,0 @@ -# Changelog for unreleased - -The following sections list the changes for unreleased. - -## Summary - - * Fix #32: Build docker images with alpine:latest instead of alpine:edge - * Chg #7: Initial release of basic version - * Enh #27: Configuration - -## Details - - * Bugfix #32: Build docker images with alpine:latest instead of alpine:edge - - ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - - https://github.com/owncloud/ocis-graph/pull/32 - - * Change #7: Initial release of basic version - - Just prepare an initial basic version to serve a graph world API that can be used by Phoenix or - other extensions. - - https://github.com/owncloud/ocis-graph/issues/7 - - * Enhancement #27: Configuration - - Extensions should be responsible of configuring themselves. We use Viper for config loading - from default paths. Environment variables **WILL** take precedence over config files. - - https://github.com/owncloud/ocis-graph/pull/27 - - diff --git a/graph/Makefile b/graph/Makefile index 3a9531542b..4f153de6ec 100644 --- a/graph/Makefile +++ b/graph/Makefile @@ -1,6 +1,6 @@ SHELL := bash -NAME := ocis-graph -IMPORT := github.com/owncloud/$(NAME) +NAME := graph +IMPORT := github.com/owncloud/ocis/$(NAME) BIN := bin DIST := dist @@ -45,6 +45,7 @@ ifndef DATE endif LDFLAGS += -s -w -X "$(IMPORT)/pkg/version.String=$(VERSION)" -X "$(IMPORT)/pkg/version.Date=$(DATE)" +DEBUG_LDFLAGS += -X "$(IMPORT)/pkg/version.String=$(VERSION)" -X "$(IMPORT)/pkg/version.Date=$(DATE)" GCFLAGS += all=-N -l .PHONY: all @@ -59,6 +60,10 @@ clean: go clean -i ./... rm -rf $(BIN) $(DIST) +.PHONY: go-mod-tidy +go-mod-tidy: + @go mod tidy + .PHONY: fmt fmt: gofmt -s -w $(SOURCES) @@ -87,6 +92,11 @@ changelog: test: go run github.com/haya14busa/goverage -v -coverprofile coverage.out $(PACKAGES) +.PHONY: go-coverage +go-coverage: + @if [ ! -f coverage.out ]; then $(MAKE) test &>/dev/null; fi; + @go tool cover -func coverage.out | tail -1 | grep -Eo "[0-9]+\.[0-9]+" + .PHONY: install install: $(SOURCES) go install -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' ./cmd/$(NAME) @@ -98,7 +108,7 @@ $(BIN)/$(EXECUTABLE): $(SOURCES) $(GOBUILD) -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $@ ./cmd/$(NAME) $(BIN)/$(EXECUTABLE)-debug: $(SOURCES) - $(GOBUILD) -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -gcflags '$(GCFLAGS)' -o $@ ./cmd/$(NAME) + $(GOBUILD) -v -tags '$(TAGS)' -ldflags '$(DEBUG_LDFLAGS)' -gcflags '$(GCFLAGS)' -o $@ ./cmd/$(NAME) .PHONY: release release: release-dirs release-linux release-windows release-darwin release-copy release-check @@ -130,9 +140,9 @@ release-check: .PHONY: release-finish release-finish: release-copy release-check -.PHONY: docs -docs: - cd docs; hugo +.PHONY: config-docs-generate +config-docs-generate: + go run github.com/owncloud/flaex >| ../docs/extensions/$(NAME)/configuration.md .PHONY: watch watch: diff --git a/graph/README.md b/graph/README.md deleted file mode 100644 index fc4949048b..0000000000 --- a/graph/README.md +++ /dev/null @@ -1,45 +0,0 @@ -# ownCloud Infinite Scale: Graph - -[![Build Status](https://cloud.drone.io/api/badges/owncloud/ocis-graph/status.svg)](https://cloud.drone.io/owncloud/ocis-graph) -[![Gitter chat](https://badges.gitter.im/cs3org/reva.svg)](https://gitter.im/cs3org/reva) -[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6f1eaaa399294d959ef7b3b10deed41d)](https://www.codacy.com/manual/owncloud/ocis-graph?utm_source=github.com&utm_medium=referral&utm_content=owncloud/ocis-graph&utm_campaign=Badge_Grade) -[![Go Doc](https://godoc.org/github.com/owncloud/ocis-graph?status.svg)](http://godoc.org/github.com/owncloud/ocis-graph) -[![Go Report](http://goreportcard.com/badge/github.com/owncloud/ocis-graph)](http://goreportcard.com/report/github.com/owncloud/ocis-graph) -[![](https://images.microbadger.com/badges/image/owncloud/ocis-graph.svg)](http://microbadger.com/images/owncloud/ocis-graph "Get your own image badge on microbadger.com") - -**This project is under heavy development, it's not in a working state yet!** - -## Install - -You can download prebuilt binaries from the GitHub releases or from our [download mirrors](http://download.owncloud.com/ocis/graph/). For instructions how to install this on your platform you should take a look at our [documentation](https://owncloud.github.io/ocis-graph/) - -## Development - -Make sure you have a working Go environment, for further reference or a guide take a look at the [install instructions](http://golang.org/doc/install.html). This project requires Go >= v1.13. - -```console -git clone https://github.com/owncloud/ocis-graph.git -cd ocis-graph - -make generate build - -./bin/ocis-graph -h -``` - -## Security - -If you find a security issue please contact security@owncloud.com first. - -## Contributing - -Fork -> Patch -> Push -> Pull Request - -## License - -Apache-2.0 - -## Copyright - -```console -Copyright (c) 2019 ownCloud GmbH -``` From 3f362283d06a6d056319999ebf4b2c9ea5879e80 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Mon, 15 Feb 2021 10:38:17 +0100 Subject: [PATCH 06/10] Move docs to top level folder --- accounts/go.sum | 1 + .../graph-explorer-initial-release.md | 9 + docs/extensions/graph-explorer/.gitignore | 1 + docs/extensions/graph-explorer/_index.md | 11 + docs/extensions/graph/.gitignore | 1 + docs/extensions/graph/_index.md | 11 + glauth/go.sum | 1 + graph-explorer/changelog/CHANGELOG.tmpl | 28 -- graph-explorer/changelog/README.md | 6 - graph-explorer/changelog/TEMPLATE | 11 - graph-explorer/changelog/unreleased/.keep | 0 .../changelog/unreleased/initial-release.md | 7 - .../changelog/unreleased/use-alpine-latest.md | 5 - graph-explorer/docs/.gitignore | 1 - graph-explorer/docs/archetypes/default.md | 6 - graph-explorer/docs/config.toml | 18 - graph-explorer/docs/content/about.md | 8 - graph-explorer/docs/content/building.md | 24 -- .../docs/content/getting-started.md | 335 ----------------- graph-explorer/docs/content/license.md | 8 - .../docs/layouts/_default/list.html | 0 .../docs/layouts/_default/single.html | 0 graph-explorer/docs/layouts/index.html | 57 --- .../docs/layouts/partials/style.html | 2 - graph-explorer/docs/static/styles.css | 338 ------------------ graph-explorer/docs/static/syntax.css | 59 --- graph/docs/.gitignore | 1 - graph/docs/archetypes/default.md | 6 - graph/docs/config.toml | 18 - graph/docs/content/about.md | 8 - graph/docs/content/building.md | 24 -- graph/docs/content/getting-started.md | 265 -------------- graph/docs/content/license.md | 8 - graph/docs/layouts/_default/list.html | 0 graph/docs/layouts/_default/single.html | 0 graph/docs/layouts/index.html | 57 --- graph/docs/layouts/partials/style.html | 2 - graph/docs/static/styles.css | 338 ------------------ graph/docs/static/syntax.css | 59 --- ocis/go.sum | 8 + ocs/go.sum | 1 + settings/go.sum | 1 + store/go.sum | 1 + thumbnails/go.sum | 1 + web/go.sum | 1 + webdav/go.sum | 2 + 46 files changed, 50 insertions(+), 1699 deletions(-) create mode 100644 changelog/unreleased/graph-explorer-initial-release.md create mode 100644 docs/extensions/graph-explorer/.gitignore create mode 100644 docs/extensions/graph-explorer/_index.md create mode 100644 docs/extensions/graph/.gitignore create mode 100644 docs/extensions/graph/_index.md delete mode 100644 graph-explorer/changelog/CHANGELOG.tmpl delete mode 100644 graph-explorer/changelog/README.md delete mode 100644 graph-explorer/changelog/TEMPLATE delete mode 100644 graph-explorer/changelog/unreleased/.keep delete mode 100644 graph-explorer/changelog/unreleased/initial-release.md delete mode 100644 graph-explorer/changelog/unreleased/use-alpine-latest.md delete mode 100644 graph-explorer/docs/.gitignore delete mode 100644 graph-explorer/docs/archetypes/default.md delete mode 100644 graph-explorer/docs/config.toml delete mode 100644 graph-explorer/docs/content/about.md delete mode 100644 graph-explorer/docs/content/building.md delete mode 100644 graph-explorer/docs/content/getting-started.md delete mode 100644 graph-explorer/docs/content/license.md delete mode 100644 graph-explorer/docs/layouts/_default/list.html delete mode 100644 graph-explorer/docs/layouts/_default/single.html delete mode 100644 graph-explorer/docs/layouts/index.html delete mode 100644 graph-explorer/docs/layouts/partials/style.html delete mode 100644 graph-explorer/docs/static/styles.css delete mode 100644 graph-explorer/docs/static/syntax.css delete mode 100644 graph/docs/.gitignore delete mode 100644 graph/docs/archetypes/default.md delete mode 100644 graph/docs/config.toml delete mode 100644 graph/docs/content/about.md delete mode 100644 graph/docs/content/building.md delete mode 100644 graph/docs/content/getting-started.md delete mode 100644 graph/docs/content/license.md delete mode 100644 graph/docs/layouts/_default/list.html delete mode 100644 graph/docs/layouts/_default/single.html delete mode 100644 graph/docs/layouts/index.html delete mode 100644 graph/docs/layouts/partials/style.html delete mode 100644 graph/docs/static/styles.css delete mode 100644 graph/docs/static/syntax.css diff --git a/accounts/go.sum b/accounts/go.sum index 598c07d974..12e8c68062 100644 --- a/accounts/go.sum +++ b/accounts/go.sum @@ -1042,6 +1042,7 @@ github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE= github.com/ory/x v0.0.162 h1:xE/UBmmMlInTvlgGXUyo+VeZAcWU5gyWb/xh6jmBWsI= github.com/ory/x v0.0.162/go.mod h1:sj3z/MeCrAyNFFTfN6yK1nTmHXGSFnw+QwIIQ/Rowec= github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= +github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203 h1:sXVTQ94GWeiBhlgN0kSbcyXQNmwzPuuhWyObxgTu/xE= github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8kex4JWw= github.com/owncloud/ocis/accounts v0.5.3-0.20201103104733-ff2c41028d9b/go.mod h1:IX7T4MJ1U8Y4z9dfDW1J2jq1nv/SHCM7n2zt1fmBHI8= github.com/owncloud/ocis/storage v0.0.0-20201015120921-38358ba4d4df h1:PhRLD+WTGIfQ1T4MqBabp6/1Q8H/iwxjlygh6xzao0A= diff --git a/changelog/unreleased/graph-explorer-initial-release.md b/changelog/unreleased/graph-explorer-initial-release.md new file mode 100644 index 0000000000..0e931cfa76 --- /dev/null +++ b/changelog/unreleased/graph-explorer-initial-release.md @@ -0,0 +1,9 @@ +Change: Initial release of graph and graph explorer + +Tags: graph, graph-explorer + +We brought initial basic Graph and Graph-Explorer support for the ownCloud +Infinite Scale project. + +https://github.com/owncloud/ocis/pull/1594 +https://github.com/owncloud/ocis-graph-explorer/pull/3 diff --git a/docs/extensions/graph-explorer/.gitignore b/docs/extensions/graph-explorer/.gitignore new file mode 100644 index 0000000000..b0c8840e2f --- /dev/null +++ b/docs/extensions/graph-explorer/.gitignore @@ -0,0 +1 @@ +configuration.md diff --git a/docs/extensions/graph-explorer/_index.md b/docs/extensions/graph-explorer/_index.md new file mode 100644 index 0000000000..366e5b1b9e --- /dev/null +++ b/docs/extensions/graph-explorer/_index.md @@ -0,0 +1,11 @@ +--- +title: "Graph-Explorer" +date: 2018-05-02T00:00:00+00:00 +weight: 20 +geekdocRepo: https://github.com/owncloud/ocis +geekdocEditPath: edit/master/docs/extensions/graph-explorer +geekdocFilePath: _index.md +geekdocCollapseSection: true +--- + +This service embeds [Graph-Explorer](https://github.com/owncloud/ocis/graph-explorer) to provide a UI for ownCloud Infinite Scale. diff --git a/docs/extensions/graph/.gitignore b/docs/extensions/graph/.gitignore new file mode 100644 index 0000000000..b0c8840e2f --- /dev/null +++ b/docs/extensions/graph/.gitignore @@ -0,0 +1 @@ +configuration.md diff --git a/docs/extensions/graph/_index.md b/docs/extensions/graph/_index.md new file mode 100644 index 0000000000..3ad1e8d9b8 --- /dev/null +++ b/docs/extensions/graph/_index.md @@ -0,0 +1,11 @@ +--- +title: "Graph" +date: 2018-05-02T00:00:00+00:00 +weight: 20 +geekdocRepo: https://github.com/owncloud/ocis +geekdocEditPath: edit/master/docs/extensions/graph +geekdocFilePath: _index.md +geekdocCollapseSection: true +--- + +This service provides a simple graph world API which can be used by clients or other extensions. diff --git a/glauth/go.sum b/glauth/go.sum index f5cd0b3f0b..e8640844b0 100644 --- a/glauth/go.sum +++ b/glauth/go.sum @@ -1120,6 +1120,7 @@ github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE= github.com/ory/x v0.0.162 h1:xE/UBmmMlInTvlgGXUyo+VeZAcWU5gyWb/xh6jmBWsI= github.com/ory/x v0.0.162/go.mod h1:sj3z/MeCrAyNFFTfN6yK1nTmHXGSFnw+QwIIQ/Rowec= github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= +github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203 h1:sXVTQ94GWeiBhlgN0kSbcyXQNmwzPuuhWyObxgTu/xE= github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8kex4JWw= github.com/owncloud/ocis-pkg/v2 v2.4.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200902134813-1e87c6173ada h1:iVknnuT/z8QCAeBpHEcbI/AiQ9FOBvF5aOAFT3TIM+I= diff --git a/graph-explorer/changelog/CHANGELOG.tmpl b/graph-explorer/changelog/CHANGELOG.tmpl deleted file mode 100644 index 3fee894812..0000000000 --- a/graph-explorer/changelog/CHANGELOG.tmpl +++ /dev/null @@ -1,28 +0,0 @@ -{{- range $changes := . }}{{ with $changes -}} -# Changelog for {{ .Version }} - -The following sections list the changes for {{ .Version }}. - -## Summary -{{ range $entry := .Entries }}{{ with $entry }} - * {{ .TypeShort }} #{{ .PrimaryID }}: {{ .Title }} -{{- end }}{{ end }} - -## Details -{{ range $entry := .Entries }}{{ with $entry }} - * {{ .Type }} #{{ .PrimaryID }}: {{ .Title }} -{{ range $par := .Paragraphs }} - {{ wrap $par 80 3 }} -{{ end -}} -{{ range $url := .IssueURLs }} - {{ $url -}} -{{ end -}} -{{ range $url := .PRURLs }} - {{ $url -}} -{{ end -}} -{{ range $url := .OtherURLs }} - {{ $url -}} -{{ end }} -{{ end }}{{ end }} - -{{ end }}{{ end -}} diff --git a/graph-explorer/changelog/README.md b/graph-explorer/changelog/README.md deleted file mode 100644 index 0ae5d5b3e2..0000000000 --- a/graph-explorer/changelog/README.md +++ /dev/null @@ -1,6 +0,0 @@ -# Changelog - -We are using [calens](https://github.com/restic/calens) to properly generate a -changelog before we are tagging a new release. To get an idea how this could -look like would be the -best reference. diff --git a/graph-explorer/changelog/TEMPLATE b/graph-explorer/changelog/TEMPLATE deleted file mode 100644 index b4762b57d8..0000000000 --- a/graph-explorer/changelog/TEMPLATE +++ /dev/null @@ -1,11 +0,0 @@ -Bugfix: Fix behavior for foobar (in present tense) - -We've fixed the behavior for foobar, a long-standing annoyance for users. The -text should be wrapped at 80 characters length. - -The text in the paragraphs is written in past tense. The last section is a list -of issue URLs, PR URLs and other URLs. The first issue ID (or the first PR ID, -in case there aren't any issue links) is used as the primary ID. - -https://github.com/owncloud/ocis-graph-explorer/issues/1234 -https://github.com/owncloud/ocis-graph-explorer/pull/55555 diff --git a/graph-explorer/changelog/unreleased/.keep b/graph-explorer/changelog/unreleased/.keep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/graph-explorer/changelog/unreleased/initial-release.md b/graph-explorer/changelog/unreleased/initial-release.md deleted file mode 100644 index 5ccca79a87..0000000000 --- a/graph-explorer/changelog/unreleased/initial-release.md +++ /dev/null @@ -1,7 +0,0 @@ -Change: Initial release of basic version - -Just prepared an initial basic version to serve Graph-Explorer for the ownCloud -Infinite Scale project. It just provides a minimal viable product to -demonstrate the microservice pattern. - -https://github.com/owncloud/ocis-graph-explorer/issues/3 diff --git a/graph-explorer/changelog/unreleased/use-alpine-latest.md b/graph-explorer/changelog/unreleased/use-alpine-latest.md deleted file mode 100644 index 458bb06c38..0000000000 --- a/graph-explorer/changelog/unreleased/use-alpine-latest.md +++ /dev/null @@ -1,5 +0,0 @@ -Bugfix: build docker images with alpine:latest instead of alpine:edge - -ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - -https://github.com/owncloud/ocis-graph-explorer/pull/7 diff --git a/graph-explorer/docs/.gitignore b/graph-explorer/docs/.gitignore deleted file mode 100644 index 364fdec1aa..0000000000 --- a/graph-explorer/docs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -public/ diff --git a/graph-explorer/docs/archetypes/default.md b/graph-explorer/docs/archetypes/default.md deleted file mode 100644 index 4e777bee13..0000000000 --- a/graph-explorer/docs/archetypes/default.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: "{{ replace .TranslationBaseName "-" " " | title }}" -date: {{ .Date }} -anchor: "{{ replace .TranslationBaseName "-" " " | title | urlize }}" -weight: ---- diff --git a/graph-explorer/docs/config.toml b/graph-explorer/docs/config.toml deleted file mode 100644 index d75df4b4c2..0000000000 --- a/graph-explorer/docs/config.toml +++ /dev/null @@ -1,18 +0,0 @@ -baseURL = "https://owncloud.github.io/ocis-graph-explorer/" -languageCode = "en-us" -title = "ownCloud Infinite Scale: Graph-Explorer" -pygmentsUseClasses = true - -disableKinds = ["taxonomy", "taxonomyTerm", "RSS", "sitemap"] - -[blackfriday] - angledQuotes = true - fractions = false - plainIDAnchors = true - smartlists = true - extensions = ["hardLineBreak"] - -[params] - author = "ownCloud GmbH" - description = "Serve Graph-Explorer for oCIS" - keywords = "reva, ocis" diff --git a/graph-explorer/docs/content/about.md b/graph-explorer/docs/content/about.md deleted file mode 100644 index b822e8a8d3..0000000000 --- a/graph-explorer/docs/content/about.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: "About" -date: 2018-05-02T00:00:00+00:00 -anchor: "about" -weight: 10 ---- - -This service embeds [Graph-Explorer](https://github.com/owncloud/graph-explorer) to provide a UI for ownCloud Infinite Scale. diff --git a/graph-explorer/docs/content/building.md b/graph-explorer/docs/content/building.md deleted file mode 100644 index a6c851dda7..0000000000 --- a/graph-explorer/docs/content/building.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -title: "Building" -date: 2018-05-02T00:00:00+00:00 -anchor: "building" -weight: 30 ---- - -As this project is built with Go, so you need to install that first. The installation of Go is out of the scope of this document, please follow the official documentation for [Go](https://golang.org/doc/install), to build this project you have to install Go >= v1.12. After the installation of the required tools you need to get the sources: - -{{< highlight txt >}} -git clone https://github.com/owncloud/ocis-graph-explorer.git -cd ocis-graph-explorer -{{< / highlight >}} - -All required tool besides Go itself and make are bundled or getting automatically installed within the `GOPATH`. All commands to build this project are part of our `Makefile`. - -### Backend - -{{< highlight txt >}} -make generate -make build -{{< / highlight >}} - -The above commands will download a [Graph-Explorer](https://github.com/owncloud/graph-explorer) release and embed it into the binary. Finally you should have the binary within the `bin/` folder now, give it a try with `./bin/ocis-graph-explorer -h` to see all available options. diff --git a/graph-explorer/docs/content/getting-started.md b/graph-explorer/docs/content/getting-started.md deleted file mode 100644 index 215ef1cb06..0000000000 --- a/graph-explorer/docs/content/getting-started.md +++ /dev/null @@ -1,335 +0,0 @@ ---- -title: "Getting Started" -date: 2018-05-02T00:00:00+00:00 -anchor: "getting-started" -weight: 20 ---- - -### Installation - -So far we are offering two different variants for the installation. You can choose between [Docker](https://www.docker.com/) or pre-built binaries which are stored on our download mirrors and GitHub releases. Maybe we will also provide system packages for the major distributions later if we see the need for it. - -#### Docker - -TBD - -#### Binaries - -TBD - -### Configuration - -We provide overall three different variants of configuration. The variant based on environment variables and commandline flags are split up into global values and command-specific values. - -#### Envrionment variables - -If you prefer to configure the service with environment variables you can see the available variables below. - -##### Global - -GRAPH_EXPLORER_CONFIG_FILE -: Path to config file, empty default value - -GRAPH_EXPLORER_LOG_LEVEL -: Set logging level, defaults to `info` - -GRAPH_EXPLORER_LOG_COLOR -: Enable colored logging, defaults to `true` - -GRAPH_EXPLORER_LOG_PRETTY -: Enable pretty logging, defaults to `true` - -##### Server - -GRAPH_EXPLORER_TRACING_ENABLED -: Enable sending traces, defaults to `false` - -GRAPH_EXPLORER_TRACING_TYPE -: Tracing backend type, defaults to `jaeger` - -GRAPH_EXPLORER_TRACING_ENDPOINT -: Endpoint for the agent, empty default value - -GRAPH_EXPLORER_TRACING_COLLECTOR -: Endpoint for the collector, empty default value - -GRAPH_EXPLORER_TRACING_SERVICE -: Service name for tracing, defaults to `graph-explorer` - -GRAPH_EXPLORER_DEBUG_ADDR -: Address to bind debug server, defaults to `0.0.0.0:9104` - -GRAPH_EXPLORER_DEBUG_TOKEN -: Token to grant metrics access, empty default value - -GRAPH_EXPLORER_DEBUG_PPROF -: Enable pprof debugging, defaults to `false` - -GRAPH_EXPLORER_DEBUG_ZPAGES -: Enable zpages debugging, defaults to `false` - -GRAPH_EXPLORER_HTTP_ADDR -: Address to bind http server, defaults to `0.0.0.0:9100` - -GRAPH_EXPLORER_HTTP_ROOT -: Root path of http server, defaults to `/` - -GRAPH_EXPLORER_ASSET_PATH -: Path to custom assets, empty default value - -GRAPH_EXPLORER_WEB_CONFIG -: Path to graph-explorer config, empty default value - -GRAPH_EXPLORER_WEB_CONFIG_SERVER -: Server URL, defaults to `http://localhost:9135` - -GRAPH_EXPLORER_WEB_CONFIG_THEME -: Theme, defaults to `owncloud` - -GRAPH_EXPLORER_WEB_CONFIG_VERSION -: Version, defaults to `0.1.0` - -GRAPH_EXPLORER_APPS -: Use multiple times to provide multiple apps - -GRAPH_EXPLORER_EXTERNAL_APPS -: Not supported yet, specify a config.json file via `GRAPH_EXPLORER_WEB_CONFIG` - -GRAPH_EXPLORER_OIDC_METADATA_URL -: OpenID Connect metadata URL, defaults to `http://localhost:9130/.well-known/openid-configuration` - -GRAPH_EXPLORER_OIDC_AUTHORITY -: OpenID Connect authority, defaults to `http://localhost:9130` - -GRAPH_EXPLORER_OIDC_CLIENT_ID -: OpenID Connect client ID, defaults to `graph-explorer` - -GRAPH_EXPLORER_OIDC_RESPONSE_TYPE -: OpenID Connect response type, defaults to `code` - -GRAPH_EXPLORER_OIDC_SCOPE -: OpenID Connect scope, defaults to `openid profile email` - -In case you want to render any additional properties in the config.json you can provide a custom config.json using eg. `GRAPH_EXPLORER_WEB_CONFIG=/path/to/config.json ocis-graph-explorer server` - -##### Health - -GRAPH_EXPLORER_DEBUG_ADDR -: Address to debug endpoint, defaults to `0.0.0.0:9104` - -#### 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, empty default value - ---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, defaults to `false` - ---tracing-type -: Tracing backend type, defaults to `jaeger` - ---tracing-endpoint -: Endpoint for the agent, empty default value - ---tracing-collector -: Endpoint for the collector, empty default value - ---tracing-service -: Service name for tracing, defaults to `graph-explorer` - ---debug-addr -: Address to bind debug server, defaults to `0.0.0.0:9104` - ---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:9100` - ---http-root -: Root path of http server, defaults to `/` - ---asset-path -: Path to custom assets, empty default value - ---web-config -: Path to graph-explorer config, empty default value - ---web-config-server -: Server URL, defaults to `http://localhost:9135` - ---web-config-theme -: Theme, defaults to `owncloud` - ---web-config-version -: Version, defaults to `0.1.0` - ---web-config-apps -: Use multiple times to provide multiple apps - ---oidc-metadata-url -: OpenID Connect metadata URL, defaults to `http://localhost:9130/.well-known/openid-configuration` - ---oidc-authority -: OpenID Connect authority, defaults to `http://localhost:9130` - ---oidc-client-id -: OpenID Connect client ID, defaults to `graph-explorer` - ---oidc-response-type -: OpenID Connect response type, defaults to `code` - ---oidc-scope -: OpenID Connect scope, defaults to `openid profile email` - -In case you want to render any additional properties in the config.json you can provide a custom config.json using eg. `ocis-graph-explorer server --web-config=/path/to/config.json` - -##### Health - ---debug-addr -: Address to debug endpoint, defaults to `0.0.0.0:9104` - -#### 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-graph-explorer/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/graph-explorer.yml`, `${HOME}/.ocis/graph-explorer.yml` or `$(pwd)/config/graph-explorer.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-graph-explorer --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-graph-explorer 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-graph-explorer 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 `GRAPH_EXPLORER_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:9104/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/graph-explorer/docs/content/license.md b/graph-explorer/docs/content/license.md deleted file mode 100644 index b4950ccfd6..0000000000 --- a/graph-explorer/docs/content/license.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: "License" -date: 2018-05-02T00:00:00+00:00 -anchor: "license" -weight: 40 ---- - -This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis-graph-explorer/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. diff --git a/graph-explorer/docs/layouts/_default/list.html b/graph-explorer/docs/layouts/_default/list.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/graph-explorer/docs/layouts/_default/single.html b/graph-explorer/docs/layouts/_default/single.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/graph-explorer/docs/layouts/index.html b/graph-explorer/docs/layouts/index.html deleted file mode 100644 index 27db113acd..0000000000 --- a/graph-explorer/docs/layouts/index.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - {{ .Site.Title }} - - - - - - {{ partial "style.html" . }} - - - - - - {{ range .Data.Pages.ByWeight }} -
-

- - {{ .Title }} - - - - - Back to Top - - -

- - {{ .Content | markdownify }} -
- {{ end }} - - diff --git a/graph-explorer/docs/layouts/partials/style.html b/graph-explorer/docs/layouts/partials/style.html deleted file mode 100644 index 1386c59b0d..0000000000 --- a/graph-explorer/docs/layouts/partials/style.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/graph-explorer/docs/static/styles.css b/graph-explorer/docs/static/styles.css deleted file mode 100644 index 3eeea791fe..0000000000 --- a/graph-explorer/docs/static/styles.css +++ /dev/null @@ -1,338 +0,0 @@ -body, -html { - cursor: default; -} - -body, -div, -dl, -dt, -dd, -ul, -ol, -li, -h1, -h2, -h3, -h4, -h5, -h6, -pre, -form, -fieldset, -input, -textarea, -p, -blockquote, -th, -td { - margin: 0; - padding: 0; -} - -* { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -:before, -:after { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -img, -object, -embed { - max-width: 100%; - height: auto; -} - -object, -embed { - height: 100%; -} - -img { - margin: 1.25% 0; - -ms-interpolation-mode: bicubic; -} - -html { - background-color: #F0F1F3; - padding: 2%; -} - -body { - font-size: 16px; - line-height: 1.6; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; - color: #242424; - max-width: 800px; - margin: 5% auto; -} - -body::after { - clear: both; - content: ""; - display: table; -} - -header { - margin-bottom: 8%; -} - -footer { - text-align: center; -} - -h1, -h2, -h3, -h4, -h5, -h2 a { - color: #263A48; - font-weight: 500; - text-decoration: none; -} - -h1, -h2 { - font-size: 36px; - padding-bottom: 0.3em; - margin-bottom: 0.4em; - border-bottom: 1px solid #eee -} - -h2 { - font-size: 22px; - padding-bottom: 0.6em; - margin-bottom: 0.6em; - margin-top: 2.5em; -} - -h3 { - font-size: 18px; - margin-bottom: 0.3em; -} - -h2 small a { - color: #98999C; - font-size: 15px; - font-weight: normal; - float: right; - position: absolute; - top: 15px; - right: 20px; -} - -section { - background: #fff; - margin-bottom: 1%; - position: relative; - padding: 6% 8%; -} - -blockquote { - border-left: 3px solid #d54e21; - font-size: 16px; - padding: 0 0 0 20px; - color: #d54e21; -} - -blockquote a { - color: #d54e21; - font-weight: 500; -} - -blockquote code { - color: #d54e21; -} - -.highlight pre { - padding: 10px; -} - -.highlight { - margin-bottom: 4%; -} - -a { - color: #1e8cbe; - text-decoration: underline; -} - -a:hover { - color: #d54e21; -} - -ul { - list-style: none; -} - -ol { - list-style: number; -} - -ol li { - color: #98999C; - margin-bottom: 5px; -} - -ol li:last-child { - margin-bottom: 0; -} - -p, -ul, -ol, -blockquote { - margin-bottom: 4%; -} - -ul ul { - padding-top: 0; - margin-bottom: 0; - margin-left: 4%; -} - -ul ul li:before { - content: '-'; - display: inline-block; - padding-right: 2%; -} - -ul.col-2 { - color: #98999C; - -webkit-column-count: 2; - -moz-column-count: 2; - column-count: 2; - -webkit-column-gap: 20px; - -moz-column-gap: 20px; - column-gap: 20px; -} - -dl dt { - font-weight: bold; -} - -dl dd { - padding-left: 10px; -} - -@media screen and (min-width: 500px) { - ul.col-2 { - -webkit-column-count: 3; - -moz-column-count: 3; - column-count: 3; - -webkit-column-gap: 20px; - -moz-column-gap: 20px; - column-gap: 20px; - } -} - -nav { - background: #F0F1F3; - min-width: 215px; - margin-bottom: 5px; - margin-top: 15px; -} - -nav:first-of-type a { - color: #d54e21; - border-radius: 0; -} - -nav:first-of-type a:hover { - color: #d54e21; -} - -nav:first-of-type a:before { - background-color: #d54e21; -} - -nav.affix { - position: fixed; - top: 20px; -} - -nav.affix-bottom { - position: absolute; -} - -nav a { - border-radius: 3px; - font-size: 15px; - display: block; - cursor: pointer; - font-weight: 500; - position: relative; - text-decoration: none; - padding: 10px 12px; - width: 100%; - padding-right: 3px; - border-bottom: 2px solid #fff; -} - -nav a:before { - content: ''; - width: 4px; - display: block; - left: 0; - position: absolute; - height: 100%; - display: none; - background: #1e8cbe; - top: 0; -} - -nav a:hover { - background-color: #E6E8EA; - color: #1e8cbe; - text-decoration: underline; -} - -nav a:hover:before { - display: block; -} - -nav a:last-of-type { - border-bottom: none; -} - -.gist { - margin-top: 5.1%; - margin-bottom: 5%; -} - -@media screen and (max-width: 1050px) { - body { - margin: 0 auto; - } -} - -@media screen and (max-width: 767px) { - header span { - display: none; - } - - h1 { - font-size: 26px; - } - - h2 { - font-size: 20px; - } -} - -@media screen and (max-width: 514px) { - p, - ul, - ol, - blockquote { - margin-bottom: 8%; - } -} diff --git a/graph-explorer/docs/static/syntax.css b/graph-explorer/docs/static/syntax.css deleted file mode 100644 index 681758d068..0000000000 --- a/graph-explorer/docs/static/syntax.css +++ /dev/null @@ -1,59 +0,0 @@ -/* Background */ .chroma { color: #f8f8f2; background-color: #272822 } -/* Error */ .chroma .err { color: #960050; background-color: #1e0010 } -/* LineTableTD */ .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; } -/* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; } -/* LineHighlight */ .chroma .hl { display: block; width: 100%;background-color: #ffffcc } -/* LineNumbersTable */ .chroma .lnt { margin-right: 0.4em; padding: 0 0.4em 0 0.4em; } -/* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em; } -/* Keyword */ .chroma .k { color: #66d9ef } -/* KeywordConstant */ .chroma .kc { color: #66d9ef } -/* KeywordDeclaration */ .chroma .kd { color: #66d9ef } -/* KeywordNamespace */ .chroma .kn { color: #f92672 } -/* KeywordPseudo */ .chroma .kp { color: #66d9ef } -/* KeywordReserved */ .chroma .kr { color: #66d9ef } -/* KeywordType */ .chroma .kt { color: #66d9ef } -/* NameAttribute */ .chroma .na { color: #a6e22e } -/* NameClass */ .chroma .nc { color: #a6e22e } -/* NameConstant */ .chroma .no { color: #66d9ef } -/* NameDecorator */ .chroma .nd { color: #a6e22e } -/* NameException */ .chroma .ne { color: #a6e22e } -/* NameFunction */ .chroma .nf { color: #a6e22e } -/* NameOther */ .chroma .nx { color: #a6e22e } -/* NameTag */ .chroma .nt { color: #f92672 } -/* Literal */ .chroma .l { color: #ae81ff } -/* LiteralDate */ .chroma .ld { color: #e6db74 } -/* LiteralString */ .chroma .s { color: #e6db74 } -/* LiteralStringAffix */ .chroma .sa { color: #e6db74 } -/* LiteralStringBacktick */ .chroma .sb { color: #e6db74 } -/* LiteralStringChar */ .chroma .sc { color: #e6db74 } -/* LiteralStringDelimiter */ .chroma .dl { color: #e6db74 } -/* LiteralStringDoc */ .chroma .sd { color: #e6db74 } -/* LiteralStringDouble */ .chroma .s2 { color: #e6db74 } -/* LiteralStringEscape */ .chroma .se { color: #ae81ff } -/* LiteralStringHeredoc */ .chroma .sh { color: #e6db74 } -/* LiteralStringInterpol */ .chroma .si { color: #e6db74 } -/* LiteralStringOther */ .chroma .sx { color: #e6db74 } -/* LiteralStringRegex */ .chroma .sr { color: #e6db74 } -/* LiteralStringSingle */ .chroma .s1 { color: #e6db74 } -/* LiteralStringSymbol */ .chroma .ss { color: #e6db74 } -/* LiteralNumber */ .chroma .m { color: #ae81ff } -/* LiteralNumberBin */ .chroma .mb { color: #ae81ff } -/* LiteralNumberFloat */ .chroma .mf { color: #ae81ff } -/* LiteralNumberHex */ .chroma .mh { color: #ae81ff } -/* LiteralNumberInteger */ .chroma .mi { color: #ae81ff } -/* LiteralNumberIntegerLong */ .chroma .il { color: #ae81ff } -/* LiteralNumberOct */ .chroma .mo { color: #ae81ff } -/* Operator */ .chroma .o { color: #f92672 } -/* OperatorWord */ .chroma .ow { color: #f92672 } -/* Comment */ .chroma .c { color: #75715e } -/* CommentHashbang */ .chroma .ch { color: #75715e } -/* CommentMultiline */ .chroma .cm { color: #75715e } -/* CommentSingle */ .chroma .c1 { color: #75715e } -/* CommentSpecial */ .chroma .cs { color: #75715e } -/* CommentPreproc */ .chroma .cp { color: #75715e } -/* CommentPreprocFile */ .chroma .cpf { color: #75715e } -/* GenericDeleted */ .chroma .gd { color: #f92672 } -/* GenericEmph */ .chroma .ge { font-style: italic } -/* GenericInserted */ .chroma .gi { color: #a6e22e } -/* GenericStrong */ .chroma .gs { font-weight: bold } -/* GenericSubheading */ .chroma .gu { color: #75715e } diff --git a/graph/docs/.gitignore b/graph/docs/.gitignore deleted file mode 100644 index 364fdec1aa..0000000000 --- a/graph/docs/.gitignore +++ /dev/null @@ -1 +0,0 @@ -public/ diff --git a/graph/docs/archetypes/default.md b/graph/docs/archetypes/default.md deleted file mode 100644 index 4e777bee13..0000000000 --- a/graph/docs/archetypes/default.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: "{{ replace .TranslationBaseName "-" " " | title }}" -date: {{ .Date }} -anchor: "{{ replace .TranslationBaseName "-" " " | title | urlize }}" -weight: ---- diff --git a/graph/docs/config.toml b/graph/docs/config.toml deleted file mode 100644 index 9b70b08e70..0000000000 --- a/graph/docs/config.toml +++ /dev/null @@ -1,18 +0,0 @@ -baseURL = "https://owncloud.github.io/ocis-graph/" -languageCode = "en-us" -title = "ownCloud Infinite Scale: Graph" -pygmentsUseClasses = true - -disableKinds = ["taxonomy", "taxonomyTerm", "RSS", "sitemap"] - -[blackfriday] - angledQuotes = true - fractions = false - plainIDAnchors = true - smartlists = true - extensions = ["hardLineBreak"] - -[params] - author = "ownCloud GmbH" - description = "Serve Graph API for oCIS" - keywords = "reva, ocis" diff --git a/graph/docs/content/about.md b/graph/docs/content/about.md deleted file mode 100644 index 22736cdbdc..0000000000 --- a/graph/docs/content/about.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: "About" -date: 2018-05-02T00:00:00+00:00 -anchor: "about" -weight: 10 ---- - -This service provides a simple graph world API which can be used by clients or other extensions. diff --git a/graph/docs/content/building.md b/graph/docs/content/building.md deleted file mode 100644 index 91d0ca2c3d..0000000000 --- a/graph/docs/content/building.md +++ /dev/null @@ -1,24 +0,0 @@ ---- -title: "Building" -date: 2018-05-02T00:00:00+00:00 -anchor: "building" -weight: 30 ---- - -As this project is built with Go, so you need to install that first. The installation of Go is out of the scope of this document, please follow the official documentation for [Go](https://golang.org/doc/install), to build this project you have to install Go >= v1.13. After the installation of the required tools you need to get the sources: - -{{< highlight txt >}} -git clone https://github.com/owncloud/ocis-graph.git -cd ocis-graph -{{< / highlight >}} - -All required tool besides Go itself and make are bundled or getting automatically installed within the `GOPATH`. All commands to build this project are part of our `Makefile`. - -### Backend - -{{< highlight txt >}} -make generate -make build -{{< / highlight >}} - -Finally you should have the binary within the `bin/` folder now, give it a try with `./bin/ocis-graph -h` to see all available options. diff --git a/graph/docs/content/getting-started.md b/graph/docs/content/getting-started.md deleted file mode 100644 index ea7072d371..0000000000 --- a/graph/docs/content/getting-started.md +++ /dev/null @@ -1,265 +0,0 @@ ---- -title: "Getting Started" -date: 2018-05-02T00:00:00+00:00 -anchor: "getting-started" -weight: 20 ---- - -### Installation - -So far we are offering two different variants for the installation. You can choose between [Docker](https://www.docker.com/) or pre-built binaries which are stored on our download mirrors and GitHub releases. Maybe we will also provide system packages for the major distributions later if we see the need for it. - -#### Docker - -TBD - -#### Binaries - -TBD - -### Configuration - -We provide overall three different variants of configuration. The variant based on environment variables and commandline flags are split up into global values and command-specific values. - -#### Envrionment variables - -If you prefer to configure the service with environment variables you can see the available variables below. - -##### Global - -GRAPH_CONFIG_FILE -: Path to config file, empty default value - -GRAPH_LOG_LEVEL -: Set logging level, defaults to `info` - -GRAPH_LOG_COLOR -: Enable colored logging, defaults to `true` - -GRAPH_LOG_PRETTY -: Enable pretty logging, defaults to `true` - -##### Server - -GRAPH_TRACING_ENABLED -: Enable sending traces, defaults to `false` - -GRAPH_TRACING_TYPE -: Tracing backend type, defaults to `jaeger` - -GRAPH_TRACING_ENDPOINT -: Endpoint for the agent, empty default value - -GRAPH_TRACING_COLLECTOR -: Endpoint for the collector, empty default value - -GRAPH_TRACING_SERVICE -: Service name for tracing, defaults to `graph` - -GRAPH_DEBUG_ADDR -: Address to bind debug server, defaults to `0.0.0.0:9124` - -GRAPH_DEBUG_TOKEN -: Token to grant metrics access, empty default value - -GRAPH_DEBUG_PPROF -: Enable pprof debugging, defaults to `false` - -GRAPH_DEBUG_ZPAGES -: Enable zpages debugging, defaults to `false` - -GRAPH_HTTP_ADDR -: Address to bind http server, defaults to `0.0.0.0:9120` - -GRAPH_HTTP_ROOT -: Root path of http server, defaults to `/` - -##### Health - -GRAPH_DEBUG_ADDR -: Address to debug endpoint, defaults to `0.0.0.0:9124` - -#### 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, empty default value - ---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, defaults to `false` - ---tracing-type -: Tracing backend type, defaults to `jaeger` - ---tracing-endpoint -: Endpoint for the agent, empty default value - ---tracing-collector -: Endpoint for the collector, empty default value - ---tracing-service -: Service name for tracing, defaults to `graph` - ---debug-addr -: Address to bind debug server, defaults to `0.0.0.0:9124` - ---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:9120` - ---http-namespace -: Namespace for internal services communication, defaults to `com.owncloud.web` - ---http-root -: Root path of http server, defaults to `/` - -##### Health - ---debug-addr -: Address to debug endpoint, defaults to `0.0.0.0:9124` - -#### 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-graph/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/graph.yml`, `${HOME}/.ocis/graph.yml` or `$(pwd)/config/graph.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-graph --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-graph 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-graph 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 `GRAPH_DEBUG_TOKEN` mentioned above. By default the metrics endpoint is bound to `http://0.0.0.0:9124/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/graph/docs/content/license.md b/graph/docs/content/license.md deleted file mode 100644 index 50a5ad1de7..0000000000 --- a/graph/docs/content/license.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: "License" -date: 2018-05-02T00:00:00+00:00 -anchor: "license" -weight: 40 ---- - -This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis-graph/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. diff --git a/graph/docs/layouts/_default/list.html b/graph/docs/layouts/_default/list.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/graph/docs/layouts/_default/single.html b/graph/docs/layouts/_default/single.html deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/graph/docs/layouts/index.html b/graph/docs/layouts/index.html deleted file mode 100644 index 27db113acd..0000000000 --- a/graph/docs/layouts/index.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - {{ .Site.Title }} - - - - - - {{ partial "style.html" . }} - - - - - - {{ range .Data.Pages.ByWeight }} -
-

- - {{ .Title }} - - - - - Back to Top - - -

- - {{ .Content | markdownify }} -
- {{ end }} - - diff --git a/graph/docs/layouts/partials/style.html b/graph/docs/layouts/partials/style.html deleted file mode 100644 index 1386c59b0d..0000000000 --- a/graph/docs/layouts/partials/style.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/graph/docs/static/styles.css b/graph/docs/static/styles.css deleted file mode 100644 index 61acc8ddb5..0000000000 --- a/graph/docs/static/styles.css +++ /dev/null @@ -1,338 +0,0 @@ -body, -html { - cursor: default; -} - -body, -div, -dl, -dt, -dd, -ul, -ol, -li, -h1, -h2, -h3, -h4, -h5, -h6, -pre, -form, -fieldset, -input, -textarea, -p, -blockquote, -th, -td { - margin: 0; - padding: 0; -} - -* { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -:before, -:after { - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; -} - -img, -object, -embed { - max-width: 100%; - height: auto; -} - -object, -embed { - height: 100%; -} - -img { - margin: 1.25% 0; - -ms-interpolation-mode: bicubic; -} - -html { - background-color: #F0F1F3; - padding: 2%; -} - -body { - font-size: 16px; - line-height: 1.6; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; - color: #242424; - max-width: 800px; - margin: 5% auto; -} - -body::after { - clear: both; - content: ""; - display: table; -} - -header { - margin-bottom: 8%; -} - -footer { - text-align: center; -} - -h1, -h2, -h3, -h4, -h5, -h2 a { - color: #263A48; - font-weight: 500; - text-decoration: none; -} - -h1, -h2 { - font-size: 36px; - padding-bottom: 0.3em; - margin-bottom: 0.4em; - border-bottom: 1px solid #eee -} - -h2 { - font-size: 22px; - padding-bottom: 0.6em; - margin-bottom: 0.6em; - margin-top: 2.5em; -} - -h3 { - font-size: 18px; - margin-bottom: 0.3em; -} - -h2 small a { - color: #98999C; - font-size: 15px; - font-weight: normal; - float: right; - position: absolute; - top: 15px; - right: 20px; -} - -section { - background: #fff; - margin-bottom: 1%; - position: relative; - padding: 6% 8%; -} - -blockquote { - border-left: 3px solid #d54e21; - font-size: 16px; - padding: 0 0 0 20px; - color: #d54e21; -} - -blockquote a { - color: #d54e21; - font-weight: 500; -} - -blockquote code { - color: #d54e21; -} - -.highlight pre { - padding: 10px; -} - -.highlight { - margin-bottom: 4%; -} - -a { - color: #1e8cbe; - text-decoration: underline; -} - -a:hover { - color: #d54e21; -} - -ul { - list-style: none; -} - -ol { - list-style: number; -} - -ol li { - color: #98999C; - margin-bottom: 5px; -} - -ol li:last-child { - margin-bottom: 0; -} - -p, -ul, -ol, -blockquote { - margin-bottom: 4%; -} - -ul ul { - padding-top: 0; - margin-bottom: 0; - margin-left: 4%; -} - -ul ul li:before { - content: '-'; - display: inline-block; - padding-right: 2%; -} - -ul.col-2 { - color: #98999C; - -webkit-column-count: 2; - -moz-column-count: 2; - column-count: 2; - -webkit-column-gap: 20px; - -moz-column-gap: 20px; - column-gap: 20px; -} - -dl dt { - font-weight: bold; -} - -dl dd { - padding-left: 10px; -} - -@media screen and (min-width: 500px) { - ul.col-2 { - -webkit-column-count: 3; - -moz-column-count: 3; - column-count: 3; - -webkit-column-gap: 20px; - -moz-column-gap: 20px; - column-gap: 20px; - } -} - -nav { - background: #F0F1F3; - min-width: 215px; - margin-bottom: 5px; - margin-top: 15px; -} - -nav:first-of-type a { - color: #d54e21; - border-radius: 0; -} - -nav:first-of-type a:hover { - color: #d54e21; -} - -nav:first-of-type a:before { - background-color: #d54e21; -} - -nav.affix { - position: fixed; - top: 20px; -} - -nav.affix-bottom { - position: absolute; -} - -nav a { - border-radius: 3px; - font-size: 15px; - display: block; - cursor: pointer; - font-weight: 500; - position: relative; - text-decoration: none; - padding: 10px 12px; - width: 100%; - padding-right: 3px; - border-bottom: 2px solid #fff; -} - -nav a:before { - content: ''; - width: 4px; - display: block; - left: 0; - position: absolute; - height: 100%; - display: none; - background: #1e8cbe; - top: 0; -} - -nav a:hover { - background-color: #E6E8EA; - color: #1e8cbe; - text-decoration: underline; -} - -nav a:hover:before { - display: block; -} - -nav a:last-of-type { - border-bottom: none; -} - -.gist { - margin-top: 5.1%; - margin-bottom: 5%; -} - -@media screen and (max-width: 1050px) { - body { - margin: 0 auto; - } -} - -@media screen and (max-width: 767px) { - header span { - display: none; - } - - h1 { - font-size: 26px; - } - - h2 { - font-size: 20px; - } -} - -@media screen and (max-width: 514px) { - p, - ul, - ol, - blockquote { - margin-bottom: 8%; - } -} diff --git a/graph/docs/static/syntax.css b/graph/docs/static/syntax.css deleted file mode 100644 index 681758d068..0000000000 --- a/graph/docs/static/syntax.css +++ /dev/null @@ -1,59 +0,0 @@ -/* Background */ .chroma { color: #f8f8f2; background-color: #272822 } -/* Error */ .chroma .err { color: #960050; background-color: #1e0010 } -/* LineTableTD */ .chroma .lntd { vertical-align: top; padding: 0; margin: 0; border: 0; } -/* LineTable */ .chroma .lntable { border-spacing: 0; padding: 0; margin: 0; border: 0; width: auto; overflow: auto; display: block; } -/* LineHighlight */ .chroma .hl { display: block; width: 100%;background-color: #ffffcc } -/* LineNumbersTable */ .chroma .lnt { margin-right: 0.4em; padding: 0 0.4em 0 0.4em; } -/* LineNumbers */ .chroma .ln { margin-right: 0.4em; padding: 0 0.4em 0 0.4em; } -/* Keyword */ .chroma .k { color: #66d9ef } -/* KeywordConstant */ .chroma .kc { color: #66d9ef } -/* KeywordDeclaration */ .chroma .kd { color: #66d9ef } -/* KeywordNamespace */ .chroma .kn { color: #f92672 } -/* KeywordPseudo */ .chroma .kp { color: #66d9ef } -/* KeywordReserved */ .chroma .kr { color: #66d9ef } -/* KeywordType */ .chroma .kt { color: #66d9ef } -/* NameAttribute */ .chroma .na { color: #a6e22e } -/* NameClass */ .chroma .nc { color: #a6e22e } -/* NameConstant */ .chroma .no { color: #66d9ef } -/* NameDecorator */ .chroma .nd { color: #a6e22e } -/* NameException */ .chroma .ne { color: #a6e22e } -/* NameFunction */ .chroma .nf { color: #a6e22e } -/* NameOther */ .chroma .nx { color: #a6e22e } -/* NameTag */ .chroma .nt { color: #f92672 } -/* Literal */ .chroma .l { color: #ae81ff } -/* LiteralDate */ .chroma .ld { color: #e6db74 } -/* LiteralString */ .chroma .s { color: #e6db74 } -/* LiteralStringAffix */ .chroma .sa { color: #e6db74 } -/* LiteralStringBacktick */ .chroma .sb { color: #e6db74 } -/* LiteralStringChar */ .chroma .sc { color: #e6db74 } -/* LiteralStringDelimiter */ .chroma .dl { color: #e6db74 } -/* LiteralStringDoc */ .chroma .sd { color: #e6db74 } -/* LiteralStringDouble */ .chroma .s2 { color: #e6db74 } -/* LiteralStringEscape */ .chroma .se { color: #ae81ff } -/* LiteralStringHeredoc */ .chroma .sh { color: #e6db74 } -/* LiteralStringInterpol */ .chroma .si { color: #e6db74 } -/* LiteralStringOther */ .chroma .sx { color: #e6db74 } -/* LiteralStringRegex */ .chroma .sr { color: #e6db74 } -/* LiteralStringSingle */ .chroma .s1 { color: #e6db74 } -/* LiteralStringSymbol */ .chroma .ss { color: #e6db74 } -/* LiteralNumber */ .chroma .m { color: #ae81ff } -/* LiteralNumberBin */ .chroma .mb { color: #ae81ff } -/* LiteralNumberFloat */ .chroma .mf { color: #ae81ff } -/* LiteralNumberHex */ .chroma .mh { color: #ae81ff } -/* LiteralNumberInteger */ .chroma .mi { color: #ae81ff } -/* LiteralNumberIntegerLong */ .chroma .il { color: #ae81ff } -/* LiteralNumberOct */ .chroma .mo { color: #ae81ff } -/* Operator */ .chroma .o { color: #f92672 } -/* OperatorWord */ .chroma .ow { color: #f92672 } -/* Comment */ .chroma .c { color: #75715e } -/* CommentHashbang */ .chroma .ch { color: #75715e } -/* CommentMultiline */ .chroma .cm { color: #75715e } -/* CommentSingle */ .chroma .c1 { color: #75715e } -/* CommentSpecial */ .chroma .cs { color: #75715e } -/* CommentPreproc */ .chroma .cp { color: #75715e } -/* CommentPreprocFile */ .chroma .cpf { color: #75715e } -/* GenericDeleted */ .chroma .gd { color: #f92672 } -/* GenericEmph */ .chroma .ge { font-style: italic } -/* GenericInserted */ .chroma .gi { color: #a6e22e } -/* GenericStrong */ .chroma .gs { font-weight: bold } -/* GenericSubheading */ .chroma .gu { color: #75715e } diff --git a/ocis/go.sum b/ocis/go.sum index b16e81aa7e..083f360495 100644 --- a/ocis/go.sum +++ b/ocis/go.sum @@ -272,6 +272,7 @@ github.com/cs3org/cato v0.0.0-20200626150132-28a40e643719/go.mod h1:XJEZ3/EQuI3B github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= 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-20200730121022-c4f3d4f7ddfd/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= +github.com/cs3org/go-cs3apis v0.0.0-20200810113633-b00aca449666/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/go-cs3apis v0.0.0-20210104105209-0d3ecb3453dc h1:vHFqu+Gb/iOKYFy2KswpwIG3G6zRMudRn+rQ2bg3TPE= github.com/cs3org/go-cs3apis v0.0.0-20210104105209-0d3ecb3453dc/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv4eIhKvRK736fQuOyS1HuHnUcz0Dq6NK1A= @@ -1244,6 +1245,7 @@ github.com/owncloud/ocis-graph-explorer v0.0.0-20200210111049-017eeb40dc0c/go.mo github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200828085053-37fcf3c8f853 h1:ei0C5Wmppw+9oiSB0XpAdwymD8+ZnmewNdVVzYE3UvQ= github.com/owncloud/ocis-hello v0.1.0-alpha1.0.20200828085053-37fcf3c8f853/go.mod h1:vnpYlDkhVoiuUAuTnY4Ajz2d5Alz0c/49AxptOLTpYA= github.com/owncloud/ocis-pkg/v2 v2.0.1/go.mod h1:7bVnn3VUaqdmvpMkXF0QVEF1fRugs35hSkuVTAq9yjk= +github.com/owncloud/ocis-pkg/v2 v2.2.1/go.mod h1:MXv7QzsYsu4YWuyJxhq1kLLmJa/r5gbqHe1FXulMHaw= github.com/owncloud/ocis-pkg/v2 v2.4.0 h1:/3ZOd4txtwjiNKJA9iLT9BjrJw5YgHSX13fQR4BYfGY= github.com/owncloud/ocis-pkg/v2 v2.4.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-settings v0.3.2-0.20200827193534-8caf098e6537/go.mod h1:vRge9QDkOsc6j76gPBmZs1Z5uOPrV4DIkZCgZCEFwBA= @@ -1342,6 +1344,8 @@ github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qq github.com/restic/calens v0.1.0/go.mod h1:u67f5msOjCTDYNzOf/NoAUSdmXP03YXPCwIQLYADy5M= github.com/restic/calens v0.2.0 h1:LVNAtmFc+Pb4ODX66qdX1T3Di1P0OTLyUsVyvM/xD7E= github.com/restic/calens v0.2.0/go.mod h1:UXwyAKS4wsgUZGEc7NrzzygJbLsQZIo3wl+62Q1wvmU= +github.com/rickb777/date v1.12.4/go.mod h1:xP0eo/I5qmUt97yRGClHZfyLZ3ikMw6v6SU5MOGZTE0= +github.com/rickb777/plural v1.2.0/go.mod h1:UdpyWFCGbo3mvK3f/PfZOAOrkjzJlYN/sD46XNWJ+Es= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.0.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= @@ -1543,6 +1547,8 @@ github.com/xtgo/uuid v0.0.0-20140804021211-a0b114877d4c/go.mod h1:UrdRz5enIKZ63M github.com/yaegashi/msgraph.go v0.0.0-20191104022859-3f9096c750b2/go.mod h1:tso14hwzqX4VbnWTNsxiL0DvMb2OwbGISFA7jDibdWc= github.com/yaegashi/msgraph.go v0.1.1-0.20200221123608-2d438cf2a7cc h1:ejaC8rvIvCWmsaFrvmGOxhBuMxxhBB1xRshuM98XQ7M= github.com/yaegashi/msgraph.go v0.1.1-0.20200221123608-2d438cf2a7cc/go.mod h1:tso14hwzqX4VbnWTNsxiL0DvMb2OwbGISFA7jDibdWc= +github.com/yaegashi/msgraph.go v0.1.4/go.mod h1:vgeYhHa5skJt/3lTyjGXThTZhwbhRnGo6uUxzoJIGME= +github.com/yaegashi/wtz.go v0.0.2/go.mod h1:nOLA5QXsmdkRxBkP5tljhua13ADHCKirLBrzPf4PEJc= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1941,7 +1947,9 @@ golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200529172331-a64b76657301/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200721223218-6123e77877b2/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200731060945-b5fad4ed8dd6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200811215021-48a8ffc5b207 h1:8Kg+JssU1jBZs8GIrL5pl4nVyaqyyhdmHAR4D1zGErg= golang.org/x/tools v0.0.0-20200811215021-48a8ffc5b207/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= diff --git a/ocs/go.sum b/ocs/go.sum index c4874bbd53..74883967f9 100644 --- a/ocs/go.sum +++ b/ocs/go.sum @@ -1067,6 +1067,7 @@ github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE= github.com/ory/x v0.0.162 h1:xE/UBmmMlInTvlgGXUyo+VeZAcWU5gyWb/xh6jmBWsI= github.com/ory/x v0.0.162/go.mod h1:sj3z/MeCrAyNFFTfN6yK1nTmHXGSFnw+QwIIQ/Rowec= github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= +github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203 h1:sXVTQ94GWeiBhlgN0kSbcyXQNmwzPuuhWyObxgTu/xE= github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8kex4JWw= github.com/owncloud/ocis/storage v0.0.0-20201015120921-38358ba4d4df h1:PhRLD+WTGIfQ1T4MqBabp6/1Q8H/iwxjlygh6xzao0A= github.com/owncloud/ocis/storage v0.0.0-20201015120921-38358ba4d4df/go.mod h1:s9kJvxtBlHEi5qc1TuPAdz2bprk9yGFe+FSOeC76Pbs= diff --git a/settings/go.sum b/settings/go.sum index 2850f258c9..7443da1229 100644 --- a/settings/go.sum +++ b/settings/go.sum @@ -1032,6 +1032,7 @@ github.com/ory/x v0.0.93/go.mod h1:lfcTaGXpTZs7IEQAW00r9EtTCOxD//SiP5uWtNiz31g= github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE= github.com/ory/x v0.0.162/go.mod h1:sj3z/MeCrAyNFFTfN6yK1nTmHXGSFnw+QwIIQ/Rowec= github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= +github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203 h1:sXVTQ94GWeiBhlgN0kSbcyXQNmwzPuuhWyObxgTu/xE= github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8kex4JWw= github.com/owncloud/ocis-pkg/v2 v2.4.0 h1:/3ZOd4txtwjiNKJA9iLT9BjrJw5YgHSX13fQR4BYfGY= github.com/owncloud/ocis-pkg/v2 v2.4.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= diff --git a/store/go.sum b/store/go.sum index 211b1a0920..9a83b2186e 100644 --- a/store/go.sum +++ b/store/go.sum @@ -1104,6 +1104,7 @@ github.com/ory/x v0.0.93/go.mod h1:lfcTaGXpTZs7IEQAW00r9EtTCOxD//SiP5uWtNiz31g= github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE= github.com/ory/x v0.0.162/go.mod h1:sj3z/MeCrAyNFFTfN6yK1nTmHXGSFnw+QwIIQ/Rowec= github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= +github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203 h1:sXVTQ94GWeiBhlgN0kSbcyXQNmwzPuuhWyObxgTu/xE= github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8kex4JWw= github.com/owncloud/ocis-pkg/v2 v2.4.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200902134813-1e87c6173ada/go.mod h1:WdcVM54z0X7aQzS8eyGl7S5sjEMVBtLpfpzsPX3Z+Pw= diff --git a/thumbnails/go.sum b/thumbnails/go.sum index 1a4acdf5e8..d6947efe7a 100644 --- a/thumbnails/go.sum +++ b/thumbnails/go.sum @@ -1062,6 +1062,7 @@ github.com/ory/x v0.0.93/go.mod h1:lfcTaGXpTZs7IEQAW00r9EtTCOxD//SiP5uWtNiz31g= github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE= github.com/ory/x v0.0.162/go.mod h1:sj3z/MeCrAyNFFTfN6yK1nTmHXGSFnw+QwIIQ/Rowec= github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= +github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203 h1:sXVTQ94GWeiBhlgN0kSbcyXQNmwzPuuhWyObxgTu/xE= github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8kex4JWw= github.com/owncloud/ocis-pkg/v2 v2.4.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200902134813-1e87c6173ada/go.mod h1:WdcVM54z0X7aQzS8eyGl7S5sjEMVBtLpfpzsPX3Z+Pw= diff --git a/web/go.sum b/web/go.sum index e98e12a0e0..b3a76e7025 100644 --- a/web/go.sum +++ b/web/go.sum @@ -1049,6 +1049,7 @@ github.com/ory/x v0.0.93/go.mod h1:lfcTaGXpTZs7IEQAW00r9EtTCOxD//SiP5uWtNiz31g= github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE= github.com/ory/x v0.0.162/go.mod h1:sj3z/MeCrAyNFFTfN6yK1nTmHXGSFnw+QwIIQ/Rowec= github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= +github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203 h1:sXVTQ94GWeiBhlgN0kSbcyXQNmwzPuuhWyObxgTu/xE= github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8kex4JWw= github.com/owncloud/ocis-pkg/v2 v2.4.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200902134813-1e87c6173ada/go.mod h1:WdcVM54z0X7aQzS8eyGl7S5sjEMVBtLpfpzsPX3Z+Pw= diff --git a/webdav/go.sum b/webdav/go.sum index b645bb2bd0..8232786eb9 100644 --- a/webdav/go.sum +++ b/webdav/go.sum @@ -704,6 +704,7 @@ github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63 github.com/huandu/xstrings v1.3.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/huandu/xstrings v1.3.1 h1:4jgBlKK6tLKFvO8u5pmYjG91cqytmDCDvGh7ECVFfFs= github.com/huandu/xstrings v1.3.1/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= +github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/iancoleman/strcase v0.1.2/go.mod h1:SK73tn/9oHe+/Y0h39VT4UCxmurVJkR5NA7kMEAOgSE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -1053,6 +1054,7 @@ github.com/ory/x v0.0.93/go.mod h1:lfcTaGXpTZs7IEQAW00r9EtTCOxD//SiP5uWtNiz31g= github.com/ory/x v0.0.110/go.mod h1:DJfkE3GdakhshNhw4zlKoRaL/ozg/lcTahA9OCih2BE= github.com/ory/x v0.0.162/go.mod h1:sj3z/MeCrAyNFFTfN6yK1nTmHXGSFnw+QwIIQ/Rowec= github.com/ovh/go-ovh v0.0.0-20181109152953-ba5adb4cf014/go.mod h1:joRatxRJaZBsY3JAOEMcoOp05CnZzsx4scTxi95DHyQ= +github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203 h1:sXVTQ94GWeiBhlgN0kSbcyXQNmwzPuuhWyObxgTu/xE= github.com/owncloud/flaex v0.0.0-20200411150708-dce59891a203/go.mod h1:jip86t4OVURJTf8CM/0e2qcji/Y4NG3l2lR8kex4JWw= github.com/owncloud/ocis-pkg/v2 v2.4.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200902134813-1e87c6173ada/go.mod h1:WdcVM54z0X7aQzS8eyGl7S5sjEMVBtLpfpzsPX3Z+Pw= From 7af5b8249c12285e554eede75f6063d5d1fe471d Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Mon, 15 Feb 2021 11:22:28 +0100 Subject: [PATCH 07/10] Add graph and graph-explorer pipelines to drone config --- .drone.star | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index cac4fe974d..0050f65a87 100644 --- a/.drone.star +++ b/.drone.star @@ -13,7 +13,9 @@ config = { 'store':'', 'thumbnails':'', 'webdav':'', - 'onlyoffice':'frontend' + 'onlyoffice':'frontend', + 'graph': '', + 'graph-explorer': '' }, 'apiTests': { 'numberOfParts': 10 From 8395d55fc57ab5384e6ea0ab1350d2cb37fd5c66 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Mon, 15 Feb 2021 17:58:53 +0100 Subject: [PATCH 08/10] fix makefile The makefile was missing the assets step before generate. Re-added the assets step which downloads the graph-explorer lib --- graph-explorer/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/graph-explorer/Makefile b/graph-explorer/Makefile index 0808f548eb..ec9d98a354 100644 --- a/graph-explorer/Makefile +++ b/graph-explorer/Makefile @@ -58,7 +58,7 @@ sync: .PHONY: clean clean: go clean -i ./... - rm -rf $(BIN) $(DIST) + rm -rf $(BIN) $(DIST) assets .PHONY: go-mod-tidy go-mod-tidy: @@ -81,7 +81,7 @@ lint: for PKG in $(PACKAGES); do go run golang.org/x/lint/golint -set_exit_status $$PKG || exit 1; done; .PHONY: generate -generate: +generate: assets go generate $(GENERATE) .PHONY: changelog @@ -186,3 +186,6 @@ watch: # .PHONY: protobuf # protobuf: $(GOPATH)/bin/protoc-gen-go $(GOPATH)/bin/protoc-gen-micro $(GOPATH)/bin/protoc-gen-microweb $(GOPATH)/bin/protoc-gen-swagger pkg/proto/v0/example.pb.go pkg/proto/v0/example.pb.micro.go pkg/proto/v0/example.pb.web.go pkg/proto/v0/example.swagger.json + +assets: + mkdir assets/ && curl -slL -o- https://github.com/owncloud/graph-explorer/releases/download/v1.7.10.3/release.tar.gz | tar xvzf - -C assets/ From 4147434a3310ee674e8a9e08b4d6dcf4f9d27415 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Mon, 15 Feb 2021 18:29:28 +0100 Subject: [PATCH 09/10] add flaex template --- graph/templates/CONFIGURATION.tmpl | 76 ++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 graph/templates/CONFIGURATION.tmpl diff --git a/graph/templates/CONFIGURATION.tmpl b/graph/templates/CONFIGURATION.tmpl new file mode 100644 index 0000000000..57d8052af2 --- /dev/null +++ b/graph/templates/CONFIGURATION.tmpl @@ -0,0 +1,76 @@ +--- +title: "Configuration" +date: "{{ date "2006-01-02T15:04:05-0700" now }}" +weight: 20 +geekdocRepo: https://github.com/owncloud/ocis +geekdocEditPath: edit/master/graph/templates +geekdocFilePath: CONFIGURATION.tmpl +--- +{{- define "options"}} +{{ $fnName := (last . ).Flags -}} +{{ range $opt := first . }}{{ with list $fnName $opt -}} +{{ $o := last . -}} +{{ if eq $o.FnName $fnName -}} +-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }} +: {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }} + +{{ end -}} +{{ end -}} +{{ end -}} +{{ end }} + +{{`{{< toc >}}`}} + +## Configuration + +### 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 `proxy.json | yaml | toml ...`*. + +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/graph/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`. + +### Environment variables + +If you prefer to configure the service with environment variables you can see the available variables below. + +If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given. + +### Commandline flags + +If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly. + +{{ $options := .Options -}} +{{ range $com := .Commands }}{{ with (list $options $com) -}} +{{ $c := last . -}} +{{ if eq $c.Name "graph" -}} +## Root Command + +{{ $c.Usage }} + +Usage: `graph [global options] command [command options] [arguments...]` +{{ template "options" . -}} +## Sub Commands + +{{ end -}} +{{ end -}} +{{ end -}} +{{- range $com := .Commands }}{{ with (list $options $com) -}} +{{- $c := last . }} +{{- if ne $c.Name "graph" -}} +### graph {{ $c.Name }} + +{{ $c.Usage }} + +Usage: `graph {{ $c.Name }} [command options] [arguments...]` +{{ template "options" . }} +{{- end -}} +{{- end -}} +{{- end -}} From d1183fb2a29f7668762770878f21515456f58e29 Mon Sep 17 00:00:00 2001 From: David Christofas Date: Mon, 15 Feb 2021 18:33:10 +0100 Subject: [PATCH 10/10] add flaex template to graph-explorer --- graph-explorer/templates/CONFIGURATION.tmpl | 76 +++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 graph-explorer/templates/CONFIGURATION.tmpl diff --git a/graph-explorer/templates/CONFIGURATION.tmpl b/graph-explorer/templates/CONFIGURATION.tmpl new file mode 100644 index 0000000000..418f1dacfd --- /dev/null +++ b/graph-explorer/templates/CONFIGURATION.tmpl @@ -0,0 +1,76 @@ +--- +title: "Configuration" +date: "{{ date "2006-01-02T15:04:05-0700" now }}" +weight: 20 +geekdocRepo: https://github.com/owncloud/ocis +geekdocEditPath: edit/master/graph-explorer/templates +geekdocFilePath: CONFIGURATION.tmpl +--- +{{- define "options"}} +{{ $fnName := (last . ).Flags -}} +{{ range $opt := first . }}{{ with list $fnName $opt -}} +{{ $o := last . -}} +{{ if eq $o.FnName $fnName -}} +-{{ $o.Name }} | {{ range $i, $e := $o.Env }} {{ if $i }}, {{ end }}${{ $e }}{{ end }} +: {{ $o.Usage }}. {{- if $o.Default }} Default: `{{ $o.Default }}`.{{ end }} + +{{ end -}} +{{ end -}} +{{ end -}} +{{ end }} + +{{`{{< toc >}}`}} + +## Configuration + +### 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 `proxy.json | yaml | toml ...`*. + +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/graph-explorer/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`. + +### Environment variables + +If you prefer to configure the service with environment variables you can see the available variables below. + +If multiple variables are listed for one option, they are in order of precedence. This means the leftmost variable will always win if given. + +### Commandline flags + +If you prefer to configure the service with commandline flags you can see the available variables below. Command line flags are only working when calling the subcommand directly. + +{{ $options := .Options -}} +{{ range $com := .Commands }}{{ with (list $options $com) -}} +{{ $c := last . -}} +{{ if eq $c.Name "graph-explorer" -}} +## Root Command + +{{ $c.Usage }} + +Usage: `graph-explorer [global options] command [command options] [arguments...]` +{{ template "options" . -}} +## Sub Commands + +{{ end -}} +{{ end -}} +{{ end -}} +{{- range $com := .Commands }}{{ with (list $options $com) -}} +{{- $c := last . }} +{{- if ne $c.Name "graph-explorer" -}} +### graph-explorer {{ $c.Name }} + +{{ $c.Usage }} + +Usage: `graph-explorer {{ $c.Name }} [command options] [arguments...]` +{{ template "options" . }} +{{- end -}} +{{- end -}} +{{- end -}}