diff --git a/store/.github/config.yml b/store/.github/config.yml index c78c4545b..041425528 100644 --- a/store/.github/config.yml +++ b/store/.github/config.yml @@ -2,7 +2,7 @@ # 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-store/blob/master/changelog/README.md) item based on your changes. + 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/store/blob/master/changelog/README.md) item based on your changes. updateDocsWhiteList: - Tests-only - tests-only diff --git a/store/CHANGELOG.md b/store/CHANGELOG.md index 8c876241e..8a271201b 100644 --- a/store/CHANGELOG.md +++ b/store/CHANGELOG.md @@ -2,42 +2,42 @@ The following sections list the changes in ocis-store 0.1.1. -[0.1.1]: https://github.com/owncloud/ocis-store/compare/v0.1.0...v0.1.1 +[0.1.1]: https://github.com/owncloud/ocis/store/compare/v0.1.0...v0.1.1 ## Summary -* Bugfix - Removed code from other service: [#7](https://github.com/owncloud/ocis-store/pull/7) +* Bugfix - Removed code from other service: [#7](https://github.com/owncloud/ocis/store/pull/7) ## Details -* Bugfix - Removed code from other service: [#7](https://github.com/owncloud/ocis-store/pull/7) +* Bugfix - Removed code from other service: [#7](https://github.com/owncloud/ocis/store/pull/7) We had code copied over from another repository which doesn't belong in here and now removed it again. - https://github.com/owncloud/ocis-store/pull/7 + https://github.com/owncloud/ocis/store/pull/7 # Changelog for [0.1.0] (2020-07-23) The following sections list the changes in ocis-store 0.1.0. -[0.1.0]: https://github.com/owncloud/ocis-store/compare/a57983ac33e65bcd73702eb1d74f56d36a94ef6c...v0.1.0 +[0.1.0]: https://github.com/owncloud/ocis/store/compare/a57983ac33e65bcd73702eb1d74f56d36a94ef6c...v0.1.0 ## Summary -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#5](https://github.com/owncloud/ocis-store/pull/5) -* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-store/pull/1) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#5](https://github.com/owncloud/ocis/store/pull/5) +* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis/store/pull/1) ## Details -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#5](https://github.com/owncloud/ocis-store/pull/5) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#5](https://github.com/owncloud/ocis/store/pull/5) ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - https://github.com/owncloud/ocis-store/pull/5 + https://github.com/owncloud/ocis/store/pull/5 -* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-store/pull/1) +* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis/store/pull/1) We have built a new service which implements go micro's [store interface](https://github.com/micro/development/blob/master/design/framework/store.md), @@ -45,7 +45,7 @@ The following sections list the changes in ocis-store 0.1.0. implementation stores data as json files on disk and maintains an index using [bleve](https://github.com/blevesearch/bleve). - https://github.com/owncloud/ocis-store/pull/1 - https://github.com/owncloud/ocis-store/pull/2 + https://github.com/owncloud/ocis/store/pull/1 + https://github.com/owncloud/ocis/store/pull/2 -}} diff --git a/store/changelog/0.1.0_2020-07-23/initial-release.md b/store/changelog/0.1.0_2020-07-23/initial-release.md index ec45f6345..da1c70bcc 100644 --- a/store/changelog/0.1.0_2020-07-23/initial-release.md +++ b/store/changelog/0.1.0_2020-07-23/initial-release.md @@ -4,5 +4,5 @@ We have built a new service which implements go micro's [store interface](https: so that we can provide a key-value-store through GRPC for our services. The underlying implementation stores data as json files on disk and maintains an index using [bleve](https://github.com/blevesearch/bleve). -https://github.com/owncloud/ocis-store/pull/1 -https://github.com/owncloud/ocis-store/pull/2 +https://github.com/owncloud/ocis/store/pull/1 +https://github.com/owncloud/ocis/store/pull/2 diff --git a/store/changelog/0.1.0_2020-07-23/use-alpine-latest.md b/store/changelog/0.1.0_2020-07-23/use-alpine-latest.md index 83dc5cf3b..9e1d72fbe 100644 --- a/store/changelog/0.1.0_2020-07-23/use-alpine-latest.md +++ b/store/changelog/0.1.0_2020-07-23/use-alpine-latest.md @@ -2,4 +2,4 @@ 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-store/pull/5 +https://github.com/owncloud/ocis/store/pull/5 diff --git a/store/changelog/0.1.1_2020-08-17/cleanup-code.md b/store/changelog/0.1.1_2020-08-17/cleanup-code.md index f9b24811a..3627107c4 100644 --- a/store/changelog/0.1.1_2020-08-17/cleanup-code.md +++ b/store/changelog/0.1.1_2020-08-17/cleanup-code.md @@ -2,5 +2,5 @@ Bugfix: Removed code from other service We had code copied over from another repository which doesn't belong in here and now removed it again. -https://github.com/owncloud/ocis-store/pull/7 +https://github.com/owncloud/ocis/store/pull/7 diff --git a/store/changelog/CHANGELOG.tmpl b/store/changelog/CHANGELOG.tmpl index 636c6c645..43f2492dc 100644 --- a/store/changelog/CHANGELOG.tmpl +++ b/store/changelog/CHANGELOG.tmpl @@ -10,17 +10,17 @@ The following sections list the changes in ocis-store {{ .Version }}. {{ if ne (len $allVersions) $next -}} {{ $previousVersion := (index $allVersions $next).Version -}} {{ if eq .Version "unreleased" -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-store/compare/v{{ $previousVersion }}...master +[{{ .Version }}]: https://github.com/owncloud/ocis/store/compare/v{{ $previousVersion }}...master {{ else -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-store/compare/v{{ $previousVersion }}...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/store/compare/v{{ $previousVersion }}...v{{ .Version }} {{ end -}} {{ end -}} {{- /* last version managed by calens, end of the loop */ -}} {{ if eq .Version "0.1.0" -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-store/compare/a57983ac33e65bcd73702eb1d74f56d36a94ef6c...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/store/compare/a57983ac33e65bcd73702eb1d74f56d36a94ef6c...v{{ .Version }} {{ end -}} {{ else -}} diff --git a/store/changelog/TEMPLATE b/store/changelog/TEMPLATE index a7cf95b39..5760753cf 100644 --- a/store/changelog/TEMPLATE +++ b/store/changelog/TEMPLATE @@ -7,6 +7,6 @@ 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-store/issues/1234 -https://github.com/owncloud/ocis-store/pull/55555 +https://github.com/owncloud/ocis/store/issues/1234 +https://github.com/owncloud/ocis/store/pull/55555 5 diff --git a/store/cmd/ocis-store/main.go b/store/cmd/ocis-store/main.go index 0d20241b8..a034fb12f 100644 --- a/store/cmd/ocis-store/main.go +++ b/store/cmd/ocis-store/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/ocis-store/pkg/command" + "github.com/owncloud/ocis/store/pkg/command" ) func main() { diff --git a/store/docs/getting-started.md b/store/docs/getting-started.md index 878318348..e9724f7f3 100644 --- a/store/docs/getting-started.md +++ b/store/docs/getting-started.md @@ -149,7 +149,7 @@ If you prefer to configure the service with commandline flags you can see the av ### 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-store/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/store.yml`, `${HOME}/.ocis/store.yml` or `$(pwd)/config/store.yml`. +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/store/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/store.yml`, `${HOME}/.ocis/store.yml` or `$(pwd)/config/store.yml`. ## Usage diff --git a/store/docs/license.md b/store/docs/license.md index dc1d70f06..a551d61f2 100644 --- a/store/docs/license.md +++ b/store/docs/license.md @@ -7,4 +7,4 @@ geekdocEditPath: edit/master/docs geekdocFilePath: license.md --- -This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis-store/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. +This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis/store/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. diff --git a/store/go.mod b/store/go.mod index 27dda8373..fdc8eb17b 100644 --- a/store/go.mod +++ b/store/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis-store +module github.com/owncloud/ocis/store go 1.13 diff --git a/store/ocis-boilerplate/.github/config.yml b/store/ocis-boilerplate/.github/config.yml index 520c37b1e..3efdb7cbe 100644 --- a/store/ocis-boilerplate/.github/config.yml +++ b/store/ocis-boilerplate/.github/config.yml @@ -2,7 +2,7 @@ # 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-store/blob/master/changelog/README.md) item based on your changes. + 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/store/blob/master/changelog/README.md) item based on your changes. updateDocsWhiteList: - Tests-only - tests-only diff --git a/store/pkg/command/health.go b/store/pkg/command/health.go index 0e5eb1843..9dd90b436 100644 --- a/store/pkg/command/health.go +++ b/store/pkg/command/health.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-store/pkg/config" - "github.com/owncloud/ocis-store/pkg/flagset" + "github.com/owncloud/ocis/store/pkg/config" + "github.com/owncloud/ocis/store/pkg/flagset" ) // Health is the entrypoint for the health command. diff --git a/store/pkg/command/root.go b/store/pkg/command/root.go index 31a077736..571108e3c 100644 --- a/store/pkg/command/root.go +++ b/store/pkg/command/root.go @@ -6,9 +6,9 @@ import ( "github.com/micro/cli/v2" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-store/pkg/config" - "github.com/owncloud/ocis-store/pkg/flagset" - "github.com/owncloud/ocis-store/pkg/version" + "github.com/owncloud/ocis/store/pkg/config" + "github.com/owncloud/ocis/store/pkg/flagset" + "github.com/owncloud/ocis/store/pkg/version" "github.com/spf13/viper" ) diff --git a/store/pkg/command/server.go b/store/pkg/command/server.go index 3964f135b..b08473286 100644 --- a/store/pkg/command/server.go +++ b/store/pkg/command/server.go @@ -13,11 +13,11 @@ import ( "github.com/oklog/run" openzipkin "github.com/openzipkin/zipkin-go" zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http" - "github.com/owncloud/ocis-store/pkg/config" - "github.com/owncloud/ocis-store/pkg/flagset" - "github.com/owncloud/ocis-store/pkg/metrics" - "github.com/owncloud/ocis-store/pkg/server/debug" - "github.com/owncloud/ocis-store/pkg/server/grpc" + "github.com/owncloud/ocis/store/pkg/config" + "github.com/owncloud/ocis/store/pkg/flagset" + "github.com/owncloud/ocis/store/pkg/metrics" + "github.com/owncloud/ocis/store/pkg/server/debug" + "github.com/owncloud/ocis/store/pkg/server/grpc" "go.opencensus.io/stats/view" "go.opencensus.io/trace" diff --git a/store/pkg/flagset/flagset.go b/store/pkg/flagset/flagset.go index 5ae2971ef..2f81e419f 100644 --- a/store/pkg/flagset/flagset.go +++ b/store/pkg/flagset/flagset.go @@ -2,7 +2,7 @@ package flagset import ( "github.com/micro/cli/v2" - "github.com/owncloud/ocis-store/pkg/config" + "github.com/owncloud/ocis/store/pkg/config" ) // RootWithConfig applies cfg to the root flagset diff --git a/store/pkg/server/debug/option.go b/store/pkg/server/debug/option.go index 6c57e2090..1b1fdae4c 100644 --- a/store/pkg/server/debug/option.go +++ b/store/pkg/server/debug/option.go @@ -4,7 +4,7 @@ import ( "context" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-store/pkg/config" + "github.com/owncloud/ocis/store/pkg/config" ) // Option defines a single option function. diff --git a/store/pkg/server/debug/server.go b/store/pkg/server/debug/server.go index 0528264e2..b9c9fef88 100644 --- a/store/pkg/server/debug/server.go +++ b/store/pkg/server/debug/server.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/owncloud/ocis-pkg/v2/service/debug" - "github.com/owncloud/ocis-store/pkg/config" - "github.com/owncloud/ocis-store/pkg/version" + "github.com/owncloud/ocis/store/pkg/config" + "github.com/owncloud/ocis/store/pkg/version" ) // Server initializes the debug service and server. diff --git a/store/pkg/server/grpc/option.go b/store/pkg/server/grpc/option.go index a748bd750..ff4535010 100644 --- a/store/pkg/server/grpc/option.go +++ b/store/pkg/server/grpc/option.go @@ -5,8 +5,8 @@ import ( "github.com/micro/cli/v2" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-store/pkg/config" - "github.com/owncloud/ocis-store/pkg/metrics" + "github.com/owncloud/ocis/store/pkg/config" + "github.com/owncloud/ocis/store/pkg/metrics" ) // Option defines a single option function. diff --git a/store/pkg/server/grpc/server.go b/store/pkg/server/grpc/server.go index 4fd784dbc..056aabbe3 100644 --- a/store/pkg/server/grpc/server.go +++ b/store/pkg/server/grpc/server.go @@ -2,8 +2,8 @@ package grpc import ( "github.com/owncloud/ocis-pkg/v2/service/grpc" - "github.com/owncloud/ocis-store/pkg/proto/v0" - svc "github.com/owncloud/ocis-store/pkg/service/v0" + "github.com/owncloud/ocis/store/pkg/proto/v0" + svc "github.com/owncloud/ocis/store/pkg/service/v0" ) // Server initializes a new go-micro service ready to run diff --git a/store/pkg/service/v0/option.go b/store/pkg/service/v0/option.go index e74f0e4f5..5b3ac116c 100644 --- a/store/pkg/service/v0/option.go +++ b/store/pkg/service/v0/option.go @@ -2,7 +2,7 @@ package service import ( "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-store/pkg/config" + "github.com/owncloud/ocis/store/pkg/config" ) // Option defines a single option function. diff --git a/store/pkg/service/v0/service.go b/store/pkg/service/v0/service.go index 913196a24..22d54840b 100644 --- a/store/pkg/service/v0/service.go +++ b/store/pkg/service/v0/service.go @@ -11,8 +11,8 @@ import ( "github.com/blevesearch/bleve/analysis/analyzer/keyword" merrors "github.com/micro/go-micro/v2/errors" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-store/pkg/config" - "github.com/owncloud/ocis-store/pkg/proto/v0" + "github.com/owncloud/ocis/store/pkg/config" + "github.com/owncloud/ocis/store/pkg/proto/v0" "google.golang.org/protobuf/encoding/protojson" )