From d6733b47cc116c8701cf5bf7c073772472e5c07c Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Fri, 18 Sep 2020 12:44:53 +0200 Subject: [PATCH] update settings import paths and module name --- settings/.github/config.yml | 2 +- settings/CHANGELOG.md | 140 +++++++++--------- .../adjust-uuid-validation.md | 2 +- .../0.1.0_2020-08-17/cleanup-makefile.md | 2 +- settings/changelog/0.1.0_2020-08-17/docs.md | 4 +- .../0.1.0_2020-08-17/dynamic-nav-items.md | 2 +- .../hardening-type-assertion.md | 4 +- .../0.1.0_2020-08-17/input-validation.md | 8 +- .../changelog/0.1.0_2020-08-17/update-pkg2.md | 2 +- .../changelog/0.1.0_2020-08-17/upgrade-ods.md | 2 +- .../0.1.0_2020-08-17/use-access-token.md | 2 +- .../0.1.0_2020-08-17/use-alpine-latest.md | 2 +- .../0.1.0_2020-08-17/use-server-config.md | 2 +- .../0.2.0_2020-08-20/add-role-service.md | 4 +- .../0.2.0_2020-08-20/refactor-naming.md | 6 +- .../0.2.0_2020-08-20/switch-to-uuids.md | 2 +- .../0.3.0_2020-08-26/filter-settings.md | 2 +- .../0.3.1_2020-08-27/fix-fetching-bundles.md | 2 +- settings/changelog/CHANGELOG.tmpl | 6 +- settings/changelog/TEMPLATE | 4 +- .../unreleased/add-endpoint-permissions.md | 2 +- .../unreleased/fix-system-scope-values.md | 2 +- .../changelog/unreleased/input-validation.md | 2 +- .../unreleased/role-ids-from-context.md | 2 +- .../roleids-helper-moved-package.md | 2 +- settings/cmd/ocis-settings/main.go | 2 +- settings/docs/getting-started.md | 2 +- settings/docs/license.md | 2 +- settings/go.mod | 2 +- settings/go.sum | 1 + settings/package.json | 2 +- settings/pkg/assets/assets.go | 2 +- settings/pkg/assets/option.go | 2 +- settings/pkg/command/health.go | 4 +- settings/pkg/command/root.go | 6 +- settings/pkg/command/server.go | 10 +- settings/pkg/flagset/flagset.go | 2 +- .../pkg/proto/v0/settings.pb.micro_test.go | 20 +-- settings/pkg/proto/v0/settings.proto | 2 +- settings/pkg/proto/v0/settings.swagger.json | 2 +- settings/pkg/server/debug/option.go | 2 +- settings/pkg/server/debug/server.go | 4 +- settings/pkg/server/grpc/option.go | 4 +- settings/pkg/server/grpc/server.go | 6 +- settings/pkg/server/http/option.go | 4 +- settings/pkg/server/http/server.go | 8 +- settings/pkg/service/v0/instrument.go | 2 +- settings/pkg/service/v0/option.go | 2 +- settings/pkg/service/v0/permissions.go | 2 +- settings/pkg/service/v0/service.go | 8 +- settings/pkg/service/v0/settings.go | 2 +- settings/pkg/service/v0/validator.go | 2 +- settings/pkg/settings/settings.go | 4 +- settings/pkg/store/filesystem/assignments.go | 2 +- .../pkg/store/filesystem/assignments_test.go | 2 +- settings/pkg/store/filesystem/bundles.go | 2 +- settings/pkg/store/filesystem/bundles_test.go | 2 +- settings/pkg/store/filesystem/permissions.go | 4 +- settings/pkg/store/filesystem/store.go | 4 +- settings/pkg/store/filesystem/values.go | 2 +- settings/pkg/store/filesystem/values_test.go | 2 +- settings/pkg/store/registry.go | 2 +- settings/pkg/util/resource_helper.go | 2 +- settings/pkg/util/resource_helper_test.go | 2 +- settings/ui/components/SettingsApp.vue | 2 +- 65 files changed, 175 insertions(+), 174 deletions(-) diff --git a/settings/.github/config.yml b/settings/.github/config.yml index d8c81e331..b81cbaeb9 100644 --- a/settings/.github/config.yml +++ b/settings/.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-settings/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/settings/blob/master/changelog/README.md) item based on your changes. updateDocsWhiteList: - Tests-only - tests-only diff --git a/settings/CHANGELOG.md b/settings/CHANGELOG.md index 05f23e958..044fcebf7 100644 --- a/settings/CHANGELOG.md +++ b/settings/CHANGELOG.md @@ -2,83 +2,83 @@ The following sections list the changes in ocis-settings unreleased. -[unreleased]: https://github.com/owncloud/ocis-settings/compare/v0.3.1...master +[unreleased]: https://github.com/owncloud/ocis/settings/compare/v0.3.1...master ## Summary -* Bugfix - Fix loading and saving system scoped values: [#66](https://github.com/owncloud/ocis-settings/pull/66) -* Bugfix - Complete input validation: [#66](https://github.com/owncloud/ocis-settings/pull/66) -* Change - Add filter option for bundle ids in ListBundles and ListRoles: [#59](https://github.com/owncloud/ocis-settings/pull/59) -* Change - Reuse roleIDs from the metadata context: [#69](https://github.com/owncloud/ocis-settings/pull/69) -* Change - Update ocis-pkg/v2: [#72](https://github.com/owncloud/ocis-settings/pull/72) +* Bugfix - Fix loading and saving system scoped values: [#66](https://github.com/owncloud/ocis/settings/pull/66) +* Bugfix - Complete input validation: [#66](https://github.com/owncloud/ocis/settings/pull/66) +* Change - Add filter option for bundle ids in ListBundles and ListRoles: [#59](https://github.com/owncloud/ocis/settings/pull/59) +* Change - Reuse roleIDs from the metadata context: [#69](https://github.com/owncloud/ocis/settings/pull/69) +* Change - Update ocis-pkg/v2: [#72](https://github.com/owncloud/ocis/settings/pull/72) ## Details -* Bugfix - Fix loading and saving system scoped values: [#66](https://github.com/owncloud/ocis-settings/pull/66) +* Bugfix - Fix loading and saving system scoped values: [#66](https://github.com/owncloud/ocis/settings/pull/66) We fixed loading and saving system scoped values. Those are now saved without an account uuid, so that the value can be loaded by other accounts as well. - https://github.com/owncloud/ocis-settings/pull/66 + https://github.com/owncloud/ocis/settings/pull/66 -* Bugfix - Complete input validation: [#66](https://github.com/owncloud/ocis-settings/pull/66) +* Bugfix - Complete input validation: [#66](https://github.com/owncloud/ocis/settings/pull/66) There was one handler function without input validation. We implemented the input validation for `ValueService.ReadValueByUniqueIdentifiers`. - https://github.com/owncloud/ocis-settings/pull/66 + https://github.com/owncloud/ocis/settings/pull/66 -* Change - Add filter option for bundle ids in ListBundles and ListRoles: [#59](https://github.com/owncloud/ocis-settings/pull/59) +* Change - Add filter option for bundle ids in ListBundles and ListRoles: [#59](https://github.com/owncloud/ocis/settings/pull/59) We added bundle ids as filter option for ListBundles and ListRoles and a new endpoint for fetching a permission by ID. - https://github.com/owncloud/ocis-settings/pull/59 + https://github.com/owncloud/ocis/settings/pull/59 -* Change - Reuse roleIDs from the metadata context: [#69](https://github.com/owncloud/ocis-settings/pull/69) +* Change - Reuse roleIDs from the metadata context: [#69](https://github.com/owncloud/ocis/settings/pull/69) The roleIDs of the authenticated user are coming in from the metadata context. Since we decided to move the role assignments over to the accounts service we need to start trusting those roleIDs from the metadata context instead of reloading them from disk on each request. - https://github.com/owncloud/ocis-settings/pull/69 + https://github.com/owncloud/ocis/settings/pull/69 -* Change - Update ocis-pkg/v2: [#72](https://github.com/owncloud/ocis-settings/pull/72) +* Change - Update ocis-pkg/v2: [#72](https://github.com/owncloud/ocis/settings/pull/72) The helper we used from ocis-pkg for extracting roleIDs from the metadata context has moved to another package, so we needed to update as well. - https://github.com/owncloud/ocis-settings/pull/72 + https://github.com/owncloud/ocis/settings/pull/72 https://github.com/owncloud/ocis-pkg/pull/60 # Changelog for [0.3.1] (2020-08-27) The following sections list the changes in ocis-settings 0.3.1. -[0.3.1]: https://github.com/owncloud/ocis-settings/compare/v0.3.0...v0.3.1 +[0.3.1]: https://github.com/owncloud/ocis/settings/compare/v0.3.0...v0.3.1 ## Summary -* Bugfix - Fix fetching bundles in settings UI: [#61](https://github.com/owncloud/ocis-settings/pull/61) +* Bugfix - Fix fetching bundles in settings UI: [#61](https://github.com/owncloud/ocis/settings/pull/61) ## Details -* Bugfix - Fix fetching bundles in settings UI: [#61](https://github.com/owncloud/ocis-settings/pull/61) +* Bugfix - Fix fetching bundles in settings UI: [#61](https://github.com/owncloud/ocis/settings/pull/61) We fixed the settings UI to use the changed API endpoint `BundleService.ListBundles` properly. - https://github.com/owncloud/ocis-settings/pull/61 + https://github.com/owncloud/ocis/settings/pull/61 # Changelog for [0.3.0] (2020-08-26) The following sections list the changes in ocis-settings 0.3.0. -[0.3.0]: https://github.com/owncloud/ocis-settings/compare/v0.2.0...v0.3.0 +[0.3.0]: https://github.com/owncloud/ocis/settings/compare/v0.2.0...v0.3.0 ## Summary @@ -93,19 +93,19 @@ The following sections list the changes in ocis-settings 0.3.0. to the user when their role doesn't have appropriate permissions. https://github.com/owncloud/product/issues/99 - https://github.com/owncloud/ocis-settings/pull/48 + https://github.com/owncloud/ocis/settings/pull/48 # Changelog for [0.2.0] (2020-08-20) The following sections list the changes in ocis-settings 0.2.0. -[0.2.0]: https://github.com/owncloud/ocis-settings/compare/v0.1.0...v0.2.0 +[0.2.0]: https://github.com/owncloud/ocis/settings/compare/v0.1.0...v0.2.0 ## Summary * Change - Add role service: [#110](https://github.com/owncloud/product/issues/110) -* Change - Rename endpoints and message types: [#36](https://github.com/owncloud/ocis-settings/issues/36) -* Change - Use UUIDs instead of alphanumeric identifiers: [#46](https://github.com/owncloud/ocis-settings/pull/46) +* Change - Rename endpoints and message types: [#36](https://github.com/owncloud/ocis/settings/issues/36) +* Change - Use UUIDs instead of alphanumeric identifiers: [#46](https://github.com/owncloud/ocis/settings/pull/46) ## Details @@ -114,67 +114,67 @@ The following sections list the changes in ocis-settings 0.2.0. We added service endpoints for registering roles and maintaining permissions. https://github.com/owncloud/product/issues/110 - https://github.com/owncloud/ocis-settings/issues/10 - https://github.com/owncloud/ocis-settings/pull/47 + https://github.com/owncloud/ocis/settings/issues/10 + https://github.com/owncloud/ocis/settings/pull/47 -* Change - Rename endpoints and message types: [#36](https://github.com/owncloud/ocis-settings/issues/36) +* Change - Rename endpoints and message types: [#36](https://github.com/owncloud/ocis/settings/issues/36) We decided to rename endpoints and message types to be less verbose. Specifically, `SettingsBundle` became `Bundle`, `Setting` (inside a bundle) kept its name and `SettingsValue` became `Value`. - https://github.com/owncloud/ocis-settings/issues/36 - https://github.com/owncloud/ocis-settings/issues/32 - https://github.com/owncloud/ocis-settings/pull/46 + https://github.com/owncloud/ocis/settings/issues/36 + https://github.com/owncloud/ocis/settings/issues/32 + https://github.com/owncloud/ocis/settings/pull/46 -* Change - Use UUIDs instead of alphanumeric identifiers: [#46](https://github.com/owncloud/ocis-settings/pull/46) +* Change - Use UUIDs instead of alphanumeric identifiers: [#46](https://github.com/owncloud/ocis/settings/pull/46) `Bundles`, `Settings` and `Values` were identified by a set of alphanumeric identifiers so far. We switched to UUIDs in order to achieve a flat file hierarchy on disk. Referencing the respective entities by their alphanumeric identifiers (as used in UI code) is still supported. - https://github.com/owncloud/ocis-settings/pull/46 + https://github.com/owncloud/ocis/settings/pull/46 # Changelog for [0.1.0] (2020-08-17) The following sections list the changes in ocis-settings 0.1.0. -[0.1.0]: https://github.com/owncloud/ocis-settings/compare/6fdbbd7e8eb39f18ada1a8a3c45a1c925e239889...v0.1.0 +[0.1.0]: https://github.com/owncloud/ocis/settings/compare/6fdbbd7e8eb39f18ada1a8a3c45a1c925e239889...v0.1.0 ## Summary -* Bugfix - Adjust UUID validation to be more tolerant: [#41](https://github.com/owncloud/ocis-settings/issues/41) -* Bugfix - Fix runtime error when type asserting on nil value: [#38](https://github.com/owncloud/ocis-settings/pull/38) +* Bugfix - Adjust UUID validation to be more tolerant: [#41](https://github.com/owncloud/ocis/settings/issues/41) +* Bugfix - Fix runtime error when type asserting on nil value: [#38](https://github.com/owncloud/ocis/settings/pull/38) * Bugfix - Fix multiple submits on string and number form elements: [#745](https://github.com/owncloud/owncloud-design-system/issues/745) -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#39](https://github.com/owncloud/ocis-settings/pull/39) -* Change - Dynamically add navItems for extensions with settings bundles: [#25](https://github.com/owncloud/ocis-settings/pull/25) -* Change - Introduce input validation: [#22](https://github.com/owncloud/ocis-settings/pull/22) -* Change - Use account uuid from x-access-token: [#14](https://github.com/owncloud/ocis-settings/pull/14) -* Change - Use server config variable from ocis-web: [#34](https://github.com/owncloud/ocis-settings/pull/34) -* Enhancement - Remove paths from Makefile: [#33](https://github.com/owncloud/ocis-settings/pull/33) -* Enhancement - Extend the docs: [#11](https://github.com/owncloud/ocis-settings/issues/11) -* Enhancement - Update ocis-pkg/v2: [#42](https://github.com/owncloud/ocis-settings/pull/42) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#39](https://github.com/owncloud/ocis/settings/pull/39) +* Change - Dynamically add navItems for extensions with settings bundles: [#25](https://github.com/owncloud/ocis/settings/pull/25) +* Change - Introduce input validation: [#22](https://github.com/owncloud/ocis/settings/pull/22) +* Change - Use account uuid from x-access-token: [#14](https://github.com/owncloud/ocis/settings/pull/14) +* Change - Use server config variable from ocis-web: [#34](https://github.com/owncloud/ocis/settings/pull/34) +* Enhancement - Remove paths from Makefile: [#33](https://github.com/owncloud/ocis/settings/pull/33) +* Enhancement - Extend the docs: [#11](https://github.com/owncloud/ocis/settings/issues/11) +* Enhancement - Update ocis-pkg/v2: [#42](https://github.com/owncloud/ocis/settings/pull/42) ## Details -* Bugfix - Adjust UUID validation to be more tolerant: [#41](https://github.com/owncloud/ocis-settings/issues/41) +* Bugfix - Adjust UUID validation to be more tolerant: [#41](https://github.com/owncloud/ocis/settings/issues/41) The UUID now allows any alphanumeric character and "-", "_", ".", "+" and "@" which can also allow regular user names. - https://github.com/owncloud/ocis-settings/issues/41 + https://github.com/owncloud/ocis/settings/issues/41 -* Bugfix - Fix runtime error when type asserting on nil value: [#38](https://github.com/owncloud/ocis-settings/pull/38) +* Bugfix - Fix runtime error when type asserting on nil value: [#38](https://github.com/owncloud/ocis/settings/pull/38) Fixed the case where an account UUID present in the context is nil, and type asserting it as a string would produce a runtime error. - https://github.com/owncloud/ocis-settings/issues/37 - https://github.com/owncloud/ocis-settings/pull/38 + https://github.com/owncloud/ocis/settings/issues/37 + https://github.com/owncloud/ocis/settings/pull/38 * Bugfix - Fix multiple submits on string and number form elements: [#745](https://github.com/owncloud/owncloud-design-system/issues/745) @@ -185,74 +185,74 @@ The following sections list the changes in ocis-settings 0.1.0. https://github.com/owncloud/owncloud-design-system/issues/745 https://github.com/owncloud/owncloud-design-system/pull/768 - https://github.com/owncloud/ocis-settings/pulls/31 + https://github.com/owncloud/ocis/settings/pulls/31 -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#39](https://github.com/owncloud/ocis-settings/pull/39) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#39](https://github.com/owncloud/ocis/settings/pull/39) ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - https://github.com/owncloud/ocis-settings/pull/39 + https://github.com/owncloud/ocis/settings/pull/39 -* Change - Dynamically add navItems for extensions with settings bundles: [#25](https://github.com/owncloud/ocis-settings/pull/25) +* Change - Dynamically add navItems for extensions with settings bundles: [#25](https://github.com/owncloud/ocis/settings/pull/25) We now make use of a new feature in ocis-web-core, allowing us to add navItems not only through configuration, but also after app initialization. With this we now have navItems available for all extensions within the settings ui, that have at least one settings bundle registered. - https://github.com/owncloud/ocis-settings/pull/25 + https://github.com/owncloud/ocis/settings/pull/25 -* Change - Introduce input validation: [#22](https://github.com/owncloud/ocis-settings/pull/22) +* Change - Introduce input validation: [#22](https://github.com/owncloud/ocis/settings/pull/22) We set up input validation, starting with enforcing alphanumeric identifier values and UUID format on account uuids. As a result, traversal into parent folders is not possible anymore. We also made sure that get and list requests are side effect free, i.e. not creating any folders. - https://github.com/owncloud/ocis-settings/issues/15 - https://github.com/owncloud/ocis-settings/issues/16 - https://github.com/owncloud/ocis-settings/issues/19 - https://github.com/owncloud/ocis-settings/pull/22 + https://github.com/owncloud/ocis/settings/issues/15 + https://github.com/owncloud/ocis/settings/issues/16 + https://github.com/owncloud/ocis/settings/issues/19 + https://github.com/owncloud/ocis/settings/pull/22 -* Change - Use account uuid from x-access-token: [#14](https://github.com/owncloud/ocis-settings/pull/14) +* Change - Use account uuid from x-access-token: [#14](https://github.com/owncloud/ocis/settings/pull/14) We are now using an ocis-pkg middleware for extracting the account uuid of the authenticated user from the `x-access-token` of the http request header and inject it into the Identifier protobuf messages wherever possible. This allows us to use `me` instead of an actual account uuid, when the request comes through the proxy. - https://github.com/owncloud/ocis-settings/pull/14 + https://github.com/owncloud/ocis/settings/pull/14 -* Change - Use server config variable from ocis-web: [#34](https://github.com/owncloud/ocis-settings/pull/34) +* Change - Use server config variable from ocis-web: [#34](https://github.com/owncloud/ocis/settings/pull/34) We are not providing an api url anymore but use the server url from ocis-web config instead. This still - as before - requires that ocis-proxy is in place for routing requests to ocis-settings. - https://github.com/owncloud/ocis-settings/pull/34 + https://github.com/owncloud/ocis/settings/pull/34 -* Enhancement - Remove paths from Makefile: [#33](https://github.com/owncloud/ocis-settings/pull/33) +* Enhancement - Remove paths from Makefile: [#33](https://github.com/owncloud/ocis/settings/pull/33) We have a variable for the proto files path in our Makefile, but were not using it. Changed the Makefile to use the PROTO_SRC variable where possible. - https://github.com/owncloud/ocis-settings/pull/33 + https://github.com/owncloud/ocis/settings/pull/33 -* Enhancement - Extend the docs: [#11](https://github.com/owncloud/ocis-settings/issues/11) +* Enhancement - Extend the docs: [#11](https://github.com/owncloud/ocis/settings/issues/11) We have extended the documentation by adding a chapter about settings values. - https://github.com/owncloud/ocis-settings/issues/11 - https://github.com/owncloud/ocis-settings/pulls/28 + https://github.com/owncloud/ocis/settings/issues/11 + https://github.com/owncloud/ocis/settings/pulls/28 -* Enhancement - Update ocis-pkg/v2: [#42](https://github.com/owncloud/ocis-settings/pull/42) +* Enhancement - Update ocis-pkg/v2: [#42](https://github.com/owncloud/ocis/settings/pull/42) Update to ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d - https://github.com/owncloud/ocis-settings/pull/42 + https://github.com/owncloud/ocis/settings/pull/42 diff --git a/settings/changelog/0.1.0_2020-08-17/adjust-uuid-validation.md b/settings/changelog/0.1.0_2020-08-17/adjust-uuid-validation.md index 2e5133da5..09ce1e216 100644 --- a/settings/changelog/0.1.0_2020-08-17/adjust-uuid-validation.md +++ b/settings/changelog/0.1.0_2020-08-17/adjust-uuid-validation.md @@ -3,4 +3,4 @@ Bugfix: Adjust UUID validation to be more tolerant The UUID now allows any alphanumeric character and "-", "_", ".", "+" and "@" which can also allow regular user names. -https://github.com/owncloud/ocis-settings/issues/41 +https://github.com/owncloud/ocis/settings/issues/41 diff --git a/settings/changelog/0.1.0_2020-08-17/cleanup-makefile.md b/settings/changelog/0.1.0_2020-08-17/cleanup-makefile.md index bcc80f2c8..721a659eb 100644 --- a/settings/changelog/0.1.0_2020-08-17/cleanup-makefile.md +++ b/settings/changelog/0.1.0_2020-08-17/cleanup-makefile.md @@ -3,4 +3,4 @@ Enhancement: Remove paths from Makefile We have a variable for the proto files path in our Makefile, but were not using it. Changed the Makefile to use the PROTO_SRC variable where possible. -https://github.com/owncloud/ocis-settings/pull/33 +https://github.com/owncloud/ocis/settings/pull/33 diff --git a/settings/changelog/0.1.0_2020-08-17/docs.md b/settings/changelog/0.1.0_2020-08-17/docs.md index a95ab70ad..03cb41db7 100644 --- a/settings/changelog/0.1.0_2020-08-17/docs.md +++ b/settings/changelog/0.1.0_2020-08-17/docs.md @@ -2,5 +2,5 @@ Enhancement: Extend the docs We have extended the documentation by adding a chapter about settings values. -https://github.com/owncloud/ocis-settings/issues/11 -https://github.com/owncloud/ocis-settings/pulls/28 +https://github.com/owncloud/ocis/settings/issues/11 +https://github.com/owncloud/ocis/settings/pulls/28 diff --git a/settings/changelog/0.1.0_2020-08-17/dynamic-nav-items.md b/settings/changelog/0.1.0_2020-08-17/dynamic-nav-items.md index 9a77c85bc..3172d3cf5 100644 --- a/settings/changelog/0.1.0_2020-08-17/dynamic-nav-items.md +++ b/settings/changelog/0.1.0_2020-08-17/dynamic-nav-items.md @@ -5,4 +5,4 @@ navItems not only through configuration, but also after app initialization. With this we now have navItems available for all extensions within the settings ui, that have at least one settings bundle registered. -https://github.com/owncloud/ocis-settings/pull/25 +https://github.com/owncloud/ocis/settings/pull/25 diff --git a/settings/changelog/0.1.0_2020-08-17/hardening-type-assertion.md b/settings/changelog/0.1.0_2020-08-17/hardening-type-assertion.md index 1cd31f6d3..6ea5331ef 100644 --- a/settings/changelog/0.1.0_2020-08-17/hardening-type-assertion.md +++ b/settings/changelog/0.1.0_2020-08-17/hardening-type-assertion.md @@ -2,5 +2,5 @@ Bugfix: Fix runtime error when type asserting on nil value Fixed the case where an account UUID present in the context is nil, and type asserting it as a string would produce a runtime error. -https://github.com/owncloud/ocis-settings/pull/38 -https://github.com/owncloud/ocis-settings/issues/37 +https://github.com/owncloud/ocis/settings/pull/38 +https://github.com/owncloud/ocis/settings/issues/37 diff --git a/settings/changelog/0.1.0_2020-08-17/input-validation.md b/settings/changelog/0.1.0_2020-08-17/input-validation.md index 6d2f12cdb..4be070872 100644 --- a/settings/changelog/0.1.0_2020-08-17/input-validation.md +++ b/settings/changelog/0.1.0_2020-08-17/input-validation.md @@ -4,7 +4,7 @@ We set up input validation, starting with enforcing alphanumeric identifier valu format on account uuids. As a result, traversal into parent folders is not possible anymore. We also made sure that get and list requests are side effect free, i.e. not creating any folders. -https://github.com/owncloud/ocis-settings/pull/22 -https://github.com/owncloud/ocis-settings/issues/15 -https://github.com/owncloud/ocis-settings/issues/16 -https://github.com/owncloud/ocis-settings/issues/19 +https://github.com/owncloud/ocis/settings/pull/22 +https://github.com/owncloud/ocis/settings/issues/15 +https://github.com/owncloud/ocis/settings/issues/16 +https://github.com/owncloud/ocis/settings/issues/19 diff --git a/settings/changelog/0.1.0_2020-08-17/update-pkg2.md b/settings/changelog/0.1.0_2020-08-17/update-pkg2.md index 2413a1ab3..2eecf0dbb 100644 --- a/settings/changelog/0.1.0_2020-08-17/update-pkg2.md +++ b/settings/changelog/0.1.0_2020-08-17/update-pkg2.md @@ -2,4 +2,4 @@ Enhancement: Update ocis-pkg/v2 Update to ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d -https://github.com/owncloud/ocis-settings/pull/42 +https://github.com/owncloud/ocis/settings/pull/42 diff --git a/settings/changelog/0.1.0_2020-08-17/upgrade-ods.md b/settings/changelog/0.1.0_2020-08-17/upgrade-ods.md index b91cc664e..3aeeadb6d 100644 --- a/settings/changelog/0.1.0_2020-08-17/upgrade-ods.md +++ b/settings/changelog/0.1.0_2020-08-17/upgrade-ods.md @@ -6,4 +6,4 @@ to the settings ui as well. https://github.com/owncloud/owncloud-design-system/issues/745 https://github.com/owncloud/owncloud-design-system/pull/768 -https://github.com/owncloud/ocis-settings/pulls/31 +https://github.com/owncloud/ocis/settings/pulls/31 diff --git a/settings/changelog/0.1.0_2020-08-17/use-access-token.md b/settings/changelog/0.1.0_2020-08-17/use-access-token.md index 219c4c9ee..124304e3f 100644 --- a/settings/changelog/0.1.0_2020-08-17/use-access-token.md +++ b/settings/changelog/0.1.0_2020-08-17/use-access-token.md @@ -5,4 +5,4 @@ authenticated user from the `x-access-token` of the http request header and inje it into the Identifier protobuf messages wherever possible. This allows us to use `me` instead of an actual account uuid, when the request comes through the proxy. -https://github.com/owncloud/ocis-settings/pull/14 +https://github.com/owncloud/ocis/settings/pull/14 diff --git a/settings/changelog/0.1.0_2020-08-17/use-alpine-latest.md b/settings/changelog/0.1.0_2020-08-17/use-alpine-latest.md index 918dbe899..76b5c77f0 100644 --- a/settings/changelog/0.1.0_2020-08-17/use-alpine-latest.md +++ b/settings/changelog/0.1.0_2020-08-17/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-settings/pull/39 +https://github.com/owncloud/ocis/settings/pull/39 diff --git a/settings/changelog/0.1.0_2020-08-17/use-server-config.md b/settings/changelog/0.1.0_2020-08-17/use-server-config.md index cba0ade05..18e1f3ecb 100644 --- a/settings/changelog/0.1.0_2020-08-17/use-server-config.md +++ b/settings/changelog/0.1.0_2020-08-17/use-server-config.md @@ -2,4 +2,4 @@ Change: Use server config variable from ocis-web We are not providing an api url anymore but use the server url from ocis-web config instead. This still - as before - requires that ocis-proxy is in place for routing requests to ocis-settings. -https://github.com/owncloud/ocis-settings/pull/34 +https://github.com/owncloud/ocis/settings/pull/34 diff --git a/settings/changelog/0.2.0_2020-08-20/add-role-service.md b/settings/changelog/0.2.0_2020-08-20/add-role-service.md index 6348e7574..9fd5cae45 100644 --- a/settings/changelog/0.2.0_2020-08-20/add-role-service.md +++ b/settings/changelog/0.2.0_2020-08-20/add-role-service.md @@ -3,5 +3,5 @@ Change: Add role service We added service endpoints for registering roles and maintaining permissions. https://github.com/owncloud/product/issues/110 -https://github.com/owncloud/ocis-settings/issues/10 -https://github.com/owncloud/ocis-settings/pull/47 +https://github.com/owncloud/ocis/settings/issues/10 +https://github.com/owncloud/ocis/settings/pull/47 diff --git a/settings/changelog/0.2.0_2020-08-20/refactor-naming.md b/settings/changelog/0.2.0_2020-08-20/refactor-naming.md index e9799bdc6..fcf9ed701 100644 --- a/settings/changelog/0.2.0_2020-08-20/refactor-naming.md +++ b/settings/changelog/0.2.0_2020-08-20/refactor-naming.md @@ -3,6 +3,6 @@ Change: Rename endpoints and message types We decided to rename endpoints and message types to be less verbose. Specifically, `SettingsBundle` became `Bundle`, `Setting` (inside a bundle) kept its name and `SettingsValue` became `Value`. -https://github.com/owncloud/ocis-settings/issues/36 -https://github.com/owncloud/ocis-settings/issues/32 -https://github.com/owncloud/ocis-settings/pull/46 +https://github.com/owncloud/ocis/settings/issues/36 +https://github.com/owncloud/ocis/settings/issues/32 +https://github.com/owncloud/ocis/settings/pull/46 diff --git a/settings/changelog/0.2.0_2020-08-20/switch-to-uuids.md b/settings/changelog/0.2.0_2020-08-20/switch-to-uuids.md index cde19c7cd..d0ce57404 100644 --- a/settings/changelog/0.2.0_2020-08-20/switch-to-uuids.md +++ b/settings/changelog/0.2.0_2020-08-20/switch-to-uuids.md @@ -4,4 +4,4 @@ Change: Use UUIDs instead of alphanumeric identifiers in order to achieve a flat file hierarchy on disk. Referencing the respective entities by their alphanumeric identifiers (as used in UI code) is still supported. -https://github.com/owncloud/ocis-settings/pull/46 +https://github.com/owncloud/ocis/settings/pull/46 diff --git a/settings/changelog/0.3.0_2020-08-26/filter-settings.md b/settings/changelog/0.3.0_2020-08-26/filter-settings.md index 2fae06b66..6e89439c8 100644 --- a/settings/changelog/0.3.0_2020-08-26/filter-settings.md +++ b/settings/changelog/0.3.0_2020-08-26/filter-settings.md @@ -3,4 +3,4 @@ Change: Filter settings by permissions `BundleService.GetBundle` and `BundleService.ListBundles` are now filtered by READ permissions in the role of the authenticated user. This prevents settings from being visible to the user when their role doesn't have appropriate permissions. https://github.com/owncloud/product/issues/99 -https://github.com/owncloud/ocis-settings/pull/48 +https://github.com/owncloud/ocis/settings/pull/48 diff --git a/settings/changelog/0.3.1_2020-08-27/fix-fetching-bundles.md b/settings/changelog/0.3.1_2020-08-27/fix-fetching-bundles.md index d19ab78a6..3c9df061c 100644 --- a/settings/changelog/0.3.1_2020-08-27/fix-fetching-bundles.md +++ b/settings/changelog/0.3.1_2020-08-27/fix-fetching-bundles.md @@ -2,5 +2,5 @@ Bugfix: Fix fetching bundles in settings UI We fixed the settings UI to use the changed API endpoint `BundleService.ListBundles` properly. -https://github.com/owncloud/ocis-settings/pull/61 +https://github.com/owncloud/ocis/settings/pull/61 diff --git a/settings/changelog/CHANGELOG.tmpl b/settings/changelog/CHANGELOG.tmpl index 9f9d8215d..a641683b9 100644 --- a/settings/changelog/CHANGELOG.tmpl +++ b/settings/changelog/CHANGELOG.tmpl @@ -10,17 +10,17 @@ The following sections list the changes in ocis-settings {{ .Version }}. {{ if ne (len $allVersions) $next -}} {{ $previousVersion := (index $allVersions $next).Version -}} {{ if eq .Version "unreleased" -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-settings/compare/v{{ $previousVersion }}...master +[{{ .Version }}]: https://github.com/owncloud/ocis/settings/compare/v{{ $previousVersion }}...master {{ else -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-settings/compare/v{{ $previousVersion }}...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/settings/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-settings/compare/6fdbbd7e8eb39f18ada1a8a3c45a1c925e239889...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/settings/compare/6fdbbd7e8eb39f18ada1a8a3c45a1c925e239889...v{{ .Version }} {{ end -}} {{ else -}} diff --git a/settings/changelog/TEMPLATE b/settings/changelog/TEMPLATE index 38a490cf2..8f7edbca6 100644 --- a/settings/changelog/TEMPLATE +++ b/settings/changelog/TEMPLATE @@ -7,5 +7,5 @@ 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-settings/issues/1234 -https://github.com/owncloud/ocis-settings/pull/55555 +https://github.com/owncloud/ocis/settings/issues/1234 +https://github.com/owncloud/ocis/settings/pull/55555 diff --git a/settings/changelog/unreleased/add-endpoint-permissions.md b/settings/changelog/unreleased/add-endpoint-permissions.md index af7b14621..73fcfe72a 100644 --- a/settings/changelog/unreleased/add-endpoint-permissions.md +++ b/settings/changelog/unreleased/add-endpoint-permissions.md @@ -2,5 +2,5 @@ Change: Add filter option for bundle ids in ListBundles and ListRoles We added bundle ids as filter option for ListBundles and ListRoles and a new endpoint for fetching a permission by ID. -https://github.com/owncloud/ocis-settings/pull/59 +https://github.com/owncloud/ocis/settings/pull/59 diff --git a/settings/changelog/unreleased/fix-system-scope-values.md b/settings/changelog/unreleased/fix-system-scope-values.md index a85309904..55802451d 100644 --- a/settings/changelog/unreleased/fix-system-scope-values.md +++ b/settings/changelog/unreleased/fix-system-scope-values.md @@ -3,5 +3,5 @@ Bugfix: Fix loading and saving system scoped values We fixed loading and saving system scoped values. Those are now saved without an account uuid, so that the value can be loaded by other accounts as well. -https://github.com/owncloud/ocis-settings/pull/66 +https://github.com/owncloud/ocis/settings/pull/66 diff --git a/settings/changelog/unreleased/input-validation.md b/settings/changelog/unreleased/input-validation.md index 28801b9bf..e2e51a93a 100644 --- a/settings/changelog/unreleased/input-validation.md +++ b/settings/changelog/unreleased/input-validation.md @@ -2,5 +2,5 @@ Bugfix: Complete input validation There was one handler function without input validation. We implemented the input validation for `ValueService.ReadValueByUniqueIdentifiers`. -https://github.com/owncloud/ocis-settings/pull/66 +https://github.com/owncloud/ocis/settings/pull/66 diff --git a/settings/changelog/unreleased/role-ids-from-context.md b/settings/changelog/unreleased/role-ids-from-context.md index 32e903e0f..e3b73a8b5 100644 --- a/settings/changelog/unreleased/role-ids-from-context.md +++ b/settings/changelog/unreleased/role-ids-from-context.md @@ -2,5 +2,5 @@ Change: Reuse roleIDs from the metadata context The roleIDs of the authenticated user are coming in from the metadata context. Since we decided to move the role assignments over to the accounts service we need to start trusting those roleIDs from the metadata context instead of reloading them from disk on each request. -https://github.com/owncloud/ocis-settings/pull/69 +https://github.com/owncloud/ocis/settings/pull/69 diff --git a/settings/changelog/unreleased/roleids-helper-moved-package.md b/settings/changelog/unreleased/roleids-helper-moved-package.md index 0a4177ab6..94d974ae1 100644 --- a/settings/changelog/unreleased/roleids-helper-moved-package.md +++ b/settings/changelog/unreleased/roleids-helper-moved-package.md @@ -3,5 +3,5 @@ Change: Update ocis-pkg/v2 The helper we used from ocis-pkg for extracting roleIDs from the metadata context has moved to another package, so we needed to update as well. -https://github.com/owncloud/ocis-settings/pull/72 +https://github.com/owncloud/ocis/settings/pull/72 https://github.com/owncloud/ocis-pkg/pull/60 diff --git a/settings/cmd/ocis-settings/main.go b/settings/cmd/ocis-settings/main.go index 8f190c60a..03449298b 100644 --- a/settings/cmd/ocis-settings/main.go +++ b/settings/cmd/ocis-settings/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/ocis-settings/pkg/command" + "github.com/owncloud/ocis/settings/pkg/command" ) func main() { diff --git a/settings/docs/getting-started.md b/settings/docs/getting-started.md index b1a0f7c1d..b76a71873 100644 --- a/settings/docs/getting-started.md +++ b/settings/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-settings/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/settings.yml`, `${HOME}/.ocis/settings.yml` or `$(pwd)/config/settings.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/settings/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/settings.yml`, `${HOME}/.ocis/settings.yml` or `$(pwd)/config/settings.yml`. ## Usage diff --git a/settings/docs/license.md b/settings/docs/license.md index 319d426c2..bce5bddc4 100644 --- a/settings/docs/license.md +++ b/settings/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-settings/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/settings/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources. diff --git a/settings/go.mod b/settings/go.mod index c723e825f..cb90602de 100644 --- a/settings/go.mod +++ b/settings/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis-settings +module github.com/owncloud/ocis/settings go 1.13 diff --git a/settings/go.sum b/settings/go.sum index 5514070e5..88e108027 100644 --- a/settings/go.sum +++ b/settings/go.sum @@ -769,6 +769,7 @@ github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200828095914-d3b859484b2b h1:PRw0b4ab github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200828095914-d3b859484b2b/go.mod h1:WdcVM54z0X7aQzS8eyGl7S5sjEMVBtLpfpzsPX3Z+Pw= github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200902134813-1e87c6173ada h1:iVknnuT/z8QCAeBpHEcbI/AiQ9FOBvF5aOAFT3TIM+I= github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200902134813-1e87c6173ada/go.mod h1:WdcVM54z0X7aQzS8eyGl7S5sjEMVBtLpfpzsPX3Z+Pw= +github.com/owncloud/ocis-settings v0.3.2-0.20200828091056-47af10a0e872 h1:VGWM/eLIxXY6BJLDuzpdjSVa73Dj5S8pfUtT9Sb5Ono= github.com/owncloud/ocis-settings v0.3.2-0.20200828091056-47af10a0e872/go.mod h1:vRge9QDkOsc6j76gPBmZs1Z5uOPrV4DIkZCgZCEFwBA= 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= diff --git a/settings/package.json b/settings/package.json index 7c77ae7ce..3c8a142f2 100644 --- a/settings/package.json +++ b/settings/package.json @@ -8,7 +8,7 @@ "author": "ownCloud GmbH ", "repository": "https://github.com/owncloud/ocis-settings.git", "bugs": { - "url": "https://github.com/owncloud/ocis-settings/issues", + "url": "https://github.com/owncloud/ocis/settings/issues", "email": "support@owncloud.com" }, "scripts": { diff --git a/settings/pkg/assets/assets.go b/settings/pkg/assets/assets.go index 92f2d7e58..a9d972a36 100644 --- a/settings/pkg/assets/assets.go +++ b/settings/pkg/assets/assets.go @@ -6,7 +6,7 @@ import ( "path/filepath" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/config" // Fake the import to make the dep tree happy. _ "golang.org/x/net/context" diff --git a/settings/pkg/assets/option.go b/settings/pkg/assets/option.go index 7364010d4..4b1a86ffc 100644 --- a/settings/pkg/assets/option.go +++ b/settings/pkg/assets/option.go @@ -2,7 +2,7 @@ package assets import ( "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/config" ) // Option defines a single option function. diff --git a/settings/pkg/command/health.go b/settings/pkg/command/health.go index 4bfab0979..e4073e245 100644 --- a/settings/pkg/command/health.go +++ b/settings/pkg/command/health.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-settings/pkg/config" - "github.com/owncloud/ocis-settings/pkg/flagset" + "github.com/owncloud/ocis/settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/flagset" ) // Health is the entrypoint for the health command. diff --git a/settings/pkg/command/root.go b/settings/pkg/command/root.go index e58e313e9..f868b72cc 100644 --- a/settings/pkg/command/root.go +++ b/settings/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-settings/pkg/config" - "github.com/owncloud/ocis-settings/pkg/flagset" - "github.com/owncloud/ocis-settings/pkg/version" + "github.com/owncloud/ocis/settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/flagset" + "github.com/owncloud/ocis/settings/pkg/version" "github.com/spf13/viper" ) diff --git a/settings/pkg/command/server.go b/settings/pkg/command/server.go index 97fbe0189..f3b661aae 100644 --- a/settings/pkg/command/server.go +++ b/settings/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-settings/pkg/config" - "github.com/owncloud/ocis-settings/pkg/flagset" - "github.com/owncloud/ocis-settings/pkg/server/debug" - "github.com/owncloud/ocis-settings/pkg/server/grpc" - "github.com/owncloud/ocis-settings/pkg/server/http" + "github.com/owncloud/ocis/settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/flagset" + "github.com/owncloud/ocis/settings/pkg/server/debug" + "github.com/owncloud/ocis/settings/pkg/server/grpc" + "github.com/owncloud/ocis/settings/pkg/server/http" "go.opencensus.io/stats/view" "go.opencensus.io/trace" ) diff --git a/settings/pkg/flagset/flagset.go b/settings/pkg/flagset/flagset.go index 9b77e8418..5b9b09a93 100644 --- a/settings/pkg/flagset/flagset.go +++ b/settings/pkg/flagset/flagset.go @@ -2,7 +2,7 @@ package flagset import ( "github.com/micro/cli/v2" - "github.com/owncloud/ocis-settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/config" ) // RootWithConfig applies cfg to the root flagset diff --git a/settings/pkg/proto/v0/settings.pb.micro_test.go b/settings/pkg/proto/v0/settings.pb.micro_test.go index 079a44e3c..a752c5add 100644 --- a/settings/pkg/proto/v0/settings.pb.micro_test.go +++ b/settings/pkg/proto/v0/settings.pb.micro_test.go @@ -14,10 +14,10 @@ import ( ocislog "github.com/owncloud/ocis-pkg/v2/log" "github.com/owncloud/ocis-pkg/v2/middleware" "github.com/owncloud/ocis-pkg/v2/service/grpc" - "github.com/owncloud/ocis-settings/pkg/config" - "github.com/owncloud/ocis-settings/pkg/proto/v0" - svc "github.com/owncloud/ocis-settings/pkg/service/v0" - store "github.com/owncloud/ocis-settings/pkg/store/filesystem" + "github.com/owncloud/ocis/settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/proto/v0" + svc "github.com/owncloud/ocis/settings/pkg/service/v0" + store "github.com/owncloud/ocis/settings/pkg/store/filesystem" "github.com/stretchr/testify/assert" ) @@ -448,17 +448,17 @@ func TestSaveGetIntValue(t *testing.T) { { name: "negative", value: proto.Value_IntValue{IntValue: -42}, - // https://github.com/owncloud/ocis-settings/issues/57 + // https://github.com/owncloud/ocis/settings/issues/57 }, { name: "less than Min", value: proto.Value_IntValue{IntValue: 0}, - // https://github.com/owncloud/ocis-settings/issues/57 + // https://github.com/owncloud/ocis/settings/issues/57 }, { name: "more than Max", value: proto.Value_IntValue{IntValue: 128}, - // https://github.com/owncloud/ocis-settings/issues/57 + // https://github.com/owncloud/ocis/settings/issues/57 }, } for _, tt := range tests { @@ -500,7 +500,7 @@ func TestSaveGetIntValue(t *testing.T) { /** try to save a wrong type of the value -https://github.com/owncloud/ocis-settings/issues/57 +https://github.com/owncloud/ocis/settings/issues/57 */ func TestSaveGetIntValueIntoString(t *testing.T) { teardown := setup() @@ -536,7 +536,7 @@ func TestSaveGetIntValueIntoString(t *testing.T) { assert.Equal(t, "forty two", getValueResponse.Value.Value.GetStringValue()) } -// https://github.com/owncloud/ocis-settings/issues/18 +// https://github.com/owncloud/ocis/settings/issues/18 func TestSaveBundleWithInvalidSettings(t *testing.T) { var tests = []proto.Setting{ { @@ -745,7 +745,7 @@ func TestSaveBundleWithInvalidSettings(t *testing.T) { } } -// https://github.com/owncloud/ocis-settings/issues/19 +// https://github.com/owncloud/ocis/settings/issues/19 func TestGetBundleNoSideEffectsOnDisk(t *testing.T) { teardown := setup() defer teardown() diff --git a/settings/pkg/proto/v0/settings.proto b/settings/pkg/proto/v0/settings.proto index 1073b5567..9956a3c71 100644 --- a/settings/pkg/proto/v0/settings.proto +++ b/settings/pkg/proto/v0/settings.proto @@ -18,7 +18,7 @@ option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = { }; license: { name: "Apache-2.0"; - url: "https://github.com/owncloud/ocis-settings/blob/master/LICENSE"; + url: "https://github.com/owncloud/ocis/settings/blob/master/LICENSE"; }; }; schemes: HTTP; diff --git a/settings/pkg/proto/v0/settings.swagger.json b/settings/pkg/proto/v0/settings.swagger.json index 774dd0fef..8a3faa2ed 100644 --- a/settings/pkg/proto/v0/settings.swagger.json +++ b/settings/pkg/proto/v0/settings.swagger.json @@ -10,7 +10,7 @@ }, "license": { "name": "Apache-2.0", - "url": "https://github.com/owncloud/ocis-settings/blob/master/LICENSE" + "url": "https://github.com/owncloud/ocis/settings/blob/master/LICENSE" } }, "schemes": [ diff --git a/settings/pkg/server/debug/option.go b/settings/pkg/server/debug/option.go index 4a55a94c5..11ea1a332 100644 --- a/settings/pkg/server/debug/option.go +++ b/settings/pkg/server/debug/option.go @@ -4,7 +4,7 @@ import ( "context" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/config" ) // Option defines a single option function. diff --git a/settings/pkg/server/debug/server.go b/settings/pkg/server/debug/server.go index 411497bf7..05d4a2e3b 100644 --- a/settings/pkg/server/debug/server.go +++ b/settings/pkg/server/debug/server.go @@ -5,8 +5,8 @@ import ( "net/http" "github.com/owncloud/ocis-pkg/v2/service/debug" - "github.com/owncloud/ocis-settings/pkg/config" - "github.com/owncloud/ocis-settings/pkg/version" + "github.com/owncloud/ocis/settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/version" ) // Server initializes the debug service and server. diff --git a/settings/pkg/server/grpc/option.go b/settings/pkg/server/grpc/option.go index 7f4f03815..6fb7fbf89 100644 --- a/settings/pkg/server/grpc/option.go +++ b/settings/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-settings/pkg/config" - "github.com/owncloud/ocis-settings/pkg/metrics" + "github.com/owncloud/ocis/settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/metrics" ) // Option defines a single option function. diff --git a/settings/pkg/server/grpc/server.go b/settings/pkg/server/grpc/server.go index a008dde2c..2ff032d6e 100644 --- a/settings/pkg/server/grpc/server.go +++ b/settings/pkg/server/grpc/server.go @@ -2,9 +2,9 @@ package grpc import ( "github.com/owncloud/ocis-pkg/v2/service/grpc" - "github.com/owncloud/ocis-settings/pkg/proto/v0" - svc "github.com/owncloud/ocis-settings/pkg/service/v0" - "github.com/owncloud/ocis-settings/pkg/version" + "github.com/owncloud/ocis/settings/pkg/proto/v0" + svc "github.com/owncloud/ocis/settings/pkg/service/v0" + "github.com/owncloud/ocis/settings/pkg/version" ) // Server initializes a new go-micro service ready to run diff --git a/settings/pkg/server/http/option.go b/settings/pkg/server/http/option.go index cb8ed8883..299e95520 100644 --- a/settings/pkg/server/http/option.go +++ b/settings/pkg/server/http/option.go @@ -5,8 +5,8 @@ import ( "github.com/micro/cli/v2" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-settings/pkg/config" - "github.com/owncloud/ocis-settings/pkg/metrics" + "github.com/owncloud/ocis/settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/metrics" ) // Option defines a single option function. diff --git a/settings/pkg/server/http/server.go b/settings/pkg/server/http/server.go index 9f3d1d7e3..4e6c436c4 100644 --- a/settings/pkg/server/http/server.go +++ b/settings/pkg/server/http/server.go @@ -5,10 +5,10 @@ import ( "github.com/owncloud/ocis-pkg/v2/account" "github.com/owncloud/ocis-pkg/v2/middleware" "github.com/owncloud/ocis-pkg/v2/service/http" - "github.com/owncloud/ocis-settings/pkg/assets" - "github.com/owncloud/ocis-settings/pkg/proto/v0" - svc "github.com/owncloud/ocis-settings/pkg/service/v0" - "github.com/owncloud/ocis-settings/pkg/version" + "github.com/owncloud/ocis/settings/pkg/assets" + "github.com/owncloud/ocis/settings/pkg/proto/v0" + svc "github.com/owncloud/ocis/settings/pkg/service/v0" + "github.com/owncloud/ocis/settings/pkg/version" ) // Server initializes the http service and server. diff --git a/settings/pkg/service/v0/instrument.go b/settings/pkg/service/v0/instrument.go index ce0f5de1e..41fef8b7d 100644 --- a/settings/pkg/service/v0/instrument.go +++ b/settings/pkg/service/v0/instrument.go @@ -1,7 +1,7 @@ package svc import ( - "github.com/owncloud/ocis-settings/pkg/metrics" + "github.com/owncloud/ocis/settings/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/settings/pkg/service/v0/option.go b/settings/pkg/service/v0/option.go index d0753227f..403a07058 100644 --- a/settings/pkg/service/v0/option.go +++ b/settings/pkg/service/v0/option.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/config" ) // Option defines a single option function. diff --git a/settings/pkg/service/v0/permissions.go b/settings/pkg/service/v0/permissions.go index 74637677e..72bfe282b 100644 --- a/settings/pkg/service/v0/permissions.go +++ b/settings/pkg/service/v0/permissions.go @@ -1,6 +1,6 @@ package svc -import "github.com/owncloud/ocis-settings/pkg/proto/v0" +import "github.com/owncloud/ocis/settings/pkg/proto/v0" func (g Service) hasPermission( roleIDs []string, diff --git a/settings/pkg/service/v0/service.go b/settings/pkg/service/v0/service.go index cbba22c3c..26c514b97 100644 --- a/settings/pkg/service/v0/service.go +++ b/settings/pkg/service/v0/service.go @@ -10,10 +10,10 @@ import ( "github.com/owncloud/ocis-pkg/v2/log" "github.com/owncloud/ocis-pkg/v2/middleware" "github.com/owncloud/ocis-pkg/v2/roles" - "github.com/owncloud/ocis-settings/pkg/config" - "github.com/owncloud/ocis-settings/pkg/proto/v0" - "github.com/owncloud/ocis-settings/pkg/settings" - store "github.com/owncloud/ocis-settings/pkg/store/filesystem" + "github.com/owncloud/ocis/settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/proto/v0" + "github.com/owncloud/ocis/settings/pkg/settings" + store "github.com/owncloud/ocis/settings/pkg/store/filesystem" ) // Service represents a service. diff --git a/settings/pkg/service/v0/settings.go b/settings/pkg/service/v0/settings.go index dad4093e1..9a63159bb 100644 --- a/settings/pkg/service/v0/settings.go +++ b/settings/pkg/service/v0/settings.go @@ -1,6 +1,6 @@ package svc -import settings "github.com/owncloud/ocis-settings/pkg/proto/v0" +import settings "github.com/owncloud/ocis/settings/pkg/proto/v0" const ( // BundleUUIDRoleAdmin represents the admin role diff --git a/settings/pkg/service/v0/validator.go b/settings/pkg/service/v0/validator.go index 6020949ed..f5d35685f 100644 --- a/settings/pkg/service/v0/validator.go +++ b/settings/pkg/service/v0/validator.go @@ -5,7 +5,7 @@ import ( validation "github.com/go-ozzo/ozzo-validation/v4" "github.com/go-ozzo/ozzo-validation/v4/is" - "github.com/owncloud/ocis-settings/pkg/proto/v0" + "github.com/owncloud/ocis/settings/pkg/proto/v0" ) var ( diff --git a/settings/pkg/settings/settings.go b/settings/pkg/settings/settings.go index 47f6ef451..830ebc8ff 100644 --- a/settings/pkg/settings/settings.go +++ b/settings/pkg/settings/settings.go @@ -1,8 +1,8 @@ package settings import ( - "github.com/owncloud/ocis-settings/pkg/config" - "github.com/owncloud/ocis-settings/pkg/proto/v0" + "github.com/owncloud/ocis/settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/proto/v0" ) var ( diff --git a/settings/pkg/store/filesystem/assignments.go b/settings/pkg/store/filesystem/assignments.go index 19f7a7e6b..c1e458c71 100644 --- a/settings/pkg/store/filesystem/assignments.go +++ b/settings/pkg/store/filesystem/assignments.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/gofrs/uuid" - "github.com/owncloud/ocis-settings/pkg/proto/v0" + "github.com/owncloud/ocis/settings/pkg/proto/v0" ) // ListRoleAssignments loads and returns all role assignments matching the given assignment identifier. diff --git a/settings/pkg/store/filesystem/assignments_test.go b/settings/pkg/store/filesystem/assignments_test.go index e9aa387e2..9f7f00512 100644 --- a/settings/pkg/store/filesystem/assignments_test.go +++ b/settings/pkg/store/filesystem/assignments_test.go @@ -8,7 +8,7 @@ import ( "testing" olog "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-settings/pkg/proto/v0" + "github.com/owncloud/ocis/settings/pkg/proto/v0" "github.com/stretchr/testify/assert" ) diff --git a/settings/pkg/store/filesystem/bundles.go b/settings/pkg/store/filesystem/bundles.go index 63c4e6ad3..e15776e02 100644 --- a/settings/pkg/store/filesystem/bundles.go +++ b/settings/pkg/store/filesystem/bundles.go @@ -8,7 +8,7 @@ import ( "sync" "github.com/gofrs/uuid" - "github.com/owncloud/ocis-settings/pkg/proto/v0" + "github.com/owncloud/ocis/settings/pkg/proto/v0" ) var m = &sync.RWMutex{} diff --git a/settings/pkg/store/filesystem/bundles_test.go b/settings/pkg/store/filesystem/bundles_test.go index f788d5ff0..c1a02b6b9 100644 --- a/settings/pkg/store/filesystem/bundles_test.go +++ b/settings/pkg/store/filesystem/bundles_test.go @@ -4,7 +4,7 @@ import ( "testing" olog "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-settings/pkg/proto/v0" + "github.com/owncloud/ocis/settings/pkg/proto/v0" "github.com/stretchr/testify/assert" ) diff --git a/settings/pkg/store/filesystem/permissions.go b/settings/pkg/store/filesystem/permissions.go index 570182114..63b6a6e76 100644 --- a/settings/pkg/store/filesystem/permissions.go +++ b/settings/pkg/store/filesystem/permissions.go @@ -1,8 +1,8 @@ package store import ( - "github.com/owncloud/ocis-settings/pkg/proto/v0" - "github.com/owncloud/ocis-settings/pkg/util" + "github.com/owncloud/ocis/settings/pkg/proto/v0" + "github.com/owncloud/ocis/settings/pkg/util" ) // ListPermissionsByResource collects all permissions from the provided roleIDs that match the requested resource diff --git a/settings/pkg/store/filesystem/store.go b/settings/pkg/store/filesystem/store.go index 8e0e2e105..aeb7abea5 100644 --- a/settings/pkg/store/filesystem/store.go +++ b/settings/pkg/store/filesystem/store.go @@ -5,8 +5,8 @@ import ( "os" olog "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-settings/pkg/config" - "github.com/owncloud/ocis-settings/pkg/settings" + "github.com/owncloud/ocis/settings/pkg/config" + "github.com/owncloud/ocis/settings/pkg/settings" ) var ( diff --git a/settings/pkg/store/filesystem/values.go b/settings/pkg/store/filesystem/values.go index da293283f..38b5ba182 100644 --- a/settings/pkg/store/filesystem/values.go +++ b/settings/pkg/store/filesystem/values.go @@ -7,7 +7,7 @@ import ( "path/filepath" "github.com/gofrs/uuid" - "github.com/owncloud/ocis-settings/pkg/proto/v0" + "github.com/owncloud/ocis/settings/pkg/proto/v0" ) // ListValues reads all values that match the given bundleId and accountUUID. diff --git a/settings/pkg/store/filesystem/values_test.go b/settings/pkg/store/filesystem/values_test.go index d121fc70d..eaadbb6ac 100644 --- a/settings/pkg/store/filesystem/values_test.go +++ b/settings/pkg/store/filesystem/values_test.go @@ -4,7 +4,7 @@ import ( "testing" olog "github.com/owncloud/ocis-pkg/v2/log" - "github.com/owncloud/ocis-settings/pkg/proto/v0" + "github.com/owncloud/ocis/settings/pkg/proto/v0" "github.com/stretchr/testify/assert" ) diff --git a/settings/pkg/store/registry.go b/settings/pkg/store/registry.go index 03fa3840a..29186466e 100644 --- a/settings/pkg/store/registry.go +++ b/settings/pkg/store/registry.go @@ -2,5 +2,5 @@ package store import ( // init filesystem store - _ "github.com/owncloud/ocis-settings/pkg/store/filesystem" + _ "github.com/owncloud/ocis/settings/pkg/store/filesystem" ) diff --git a/settings/pkg/util/resource_helper.go b/settings/pkg/util/resource_helper.go index d444183ee..37ec35e34 100644 --- a/settings/pkg/util/resource_helper.go +++ b/settings/pkg/util/resource_helper.go @@ -1,6 +1,6 @@ package util -import "github.com/owncloud/ocis-settings/pkg/proto/v0" +import "github.com/owncloud/ocis/settings/pkg/proto/v0" const ( // ResourceIDAll declares on a resource that it matches any id diff --git a/settings/pkg/util/resource_helper_test.go b/settings/pkg/util/resource_helper_test.go index 93423c39d..093947a5f 100644 --- a/settings/pkg/util/resource_helper_test.go +++ b/settings/pkg/util/resource_helper_test.go @@ -3,7 +3,7 @@ package util import ( "testing" - "github.com/owncloud/ocis-settings/pkg/proto/v0" + "github.com/owncloud/ocis/settings/pkg/proto/v0" "gotest.tools/assert" ) diff --git a/settings/ui/components/SettingsApp.vue b/settings/ui/components/SettingsApp.vue index 57b273759..441a7d3f3 100644 --- a/settings/ui/components/SettingsApp.vue +++ b/settings/ui/components/SettingsApp.vue @@ -86,7 +86,7 @@ export default { * TODO: * a) set up a map with possible extensions and icons? * or b) let extensions register app info like displayName + icon? - * https://github.com/owncloud/ocis-settings/issues/27 + * https://github.com/owncloud/ocis/settings/issues/27 */ const navItem = { name: this.getExtensionName(extension),