From b07b5a1149a04cf8cc2a2b63069ceb9ca741b26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 13 Jan 2025 15:54:00 +0100 Subject: [PATCH] use plain pkg module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- docs/helpers/markdowncreation.go | 2 +- opencloud/pkg/command/backup.go | 6 +++--- opencloud/pkg/command/benchmark.go | 4 ++-- opencloud/pkg/command/decomposedfs.go | 2 +- opencloud/pkg/command/init.go | 4 ++-- opencloud/pkg/command/list.go | 2 +- opencloud/pkg/command/migrate.go | 10 +++++----- opencloud/pkg/command/revisions.go | 6 +++--- opencloud/pkg/command/root.go | 4 ++-- opencloud/pkg/command/server.go | 6 +++--- opencloud/pkg/command/services.go | 6 +++--- opencloud/pkg/command/shares.go | 8 ++++---- opencloud/pkg/command/trash.go | 6 +++--- opencloud/pkg/command/version.go | 6 +++--- opencloud/pkg/init/init.go | 2 +- opencloud/pkg/register/command.go | 2 +- opencloud/pkg/runtime/options.go | 2 +- opencloud/pkg/runtime/runtime.go | 2 +- opencloud/pkg/runtime/service/option.go | 2 +- opencloud/pkg/runtime/service/service.go | 8 ++++---- opencloud/pkg/runtime/service/sutureservice.go | 2 +- {ocis-pkg => pkg}/.gitignore | 0 {ocis-pkg => pkg}/.mockery.yaml | 0 {ocis-pkg => pkg}/Makefile | 0 {ocis-pkg => pkg}/account/option.go | 2 +- {ocis-pkg => pkg}/ast/ast.go | 0 {ocis-pkg => pkg}/ast/test/test.go | 2 +- {ocis-pkg => pkg}/broker/noop.go | 0 {ocis-pkg => pkg}/capabilities/defaults.go | 0 {ocis-pkg => pkg}/checks/checkgrpc.go | 2 +- {ocis-pkg => pkg}/checks/checkhttp.go | 2 +- {ocis-pkg => pkg}/checks/checknats.go | 0 {ocis-pkg => pkg}/checks/checktcp.go | 2 +- {ocis-pkg => pkg}/clihelper/app.go | 2 +- {ocis-pkg => pkg}/config/config.go | 2 +- {ocis-pkg => pkg}/config/config_suite_test.go | 0 {ocis-pkg => pkg}/config/config_test.go | 2 +- {ocis-pkg => pkg}/config/configlog/log.go | 0 {ocis-pkg => pkg}/config/defaultconfig.go | 2 +- {ocis-pkg => pkg}/config/defaults/paths.go | 0 {ocis-pkg => pkg}/config/envdecode/LICENSE | 0 {ocis-pkg => pkg}/config/envdecode/README.md | 0 {ocis-pkg => pkg}/config/envdecode/envdecode.go | 0 .../config/envdecode/envdecode_test.go | 0 {ocis-pkg => pkg}/config/helpers.go | 2 +- {ocis-pkg => pkg}/config/helpers_test.go | 0 {ocis-pkg => pkg}/config/parser/parse.go | 8 ++++---- {ocis-pkg => pkg}/conversions/ptr.go | 0 {ocis-pkg => pkg}/conversions/ptr_test.go | 2 +- {ocis-pkg => pkg}/conversions/strings.go | 0 {ocis-pkg => pkg}/conversions/strings_test.go | 0 {ocis-pkg => pkg}/cors/option.go | 2 +- {ocis-pkg => pkg}/crypto/crypto.go | 0 {ocis-pkg => pkg}/crypto/crypto_suite_test.go | 0 {ocis-pkg => pkg}/crypto/crypto_test.go | 6 +++--- {ocis-pkg => pkg}/crypto/gencert.go | 2 +- {ocis-pkg => pkg}/crypto/gencert_test.go | 2 +- {ocis-pkg => pkg}/crypto/templates.go | 0 {ocis-pkg => pkg}/flags/overrides.go | 0 {ocis-pkg => pkg}/generators/password.go | 0 {ocis-pkg => pkg}/handlers/checker.go | 2 +- {ocis-pkg => pkg}/handlers/checker_test.go | 4 ++-- {ocis-pkg => pkg}/keycloak/client.go | 0 {ocis-pkg => pkg}/keycloak/gocloak.go | 0 {ocis-pkg => pkg}/keycloak/types.go | 0 {ocis-pkg => pkg}/kql/cast.go | 2 +- {ocis-pkg => pkg}/kql/connect.go | 2 +- {ocis-pkg => pkg}/kql/dictionary.peg | 0 {ocis-pkg => pkg}/kql/dictionary_gen.go | 0 {ocis-pkg => pkg}/kql/dictionary_test.go | 6 +++--- {ocis-pkg => pkg}/kql/doc.go | 0 {ocis-pkg => pkg}/kql/engine_suite_test.go | 0 {ocis-pkg => pkg}/kql/factory.go | 2 +- {ocis-pkg => pkg}/kql/gen.go | 0 {ocis-pkg => pkg}/kql/kql.go | 2 +- {ocis-pkg => pkg}/kql/kql_test.go | 4 ++-- {ocis-pkg => pkg}/kql/validate.go | 2 +- {ocis-pkg => pkg}/l10n/l10n.go | 2 +- {ocis-pkg => pkg}/l10n/l10n_test.go | 0 {ocis-pkg => pkg}/ldap/ldap.go | 2 +- {ocis-pkg => pkg}/ldap/ldap_suite_test.go | 0 {ocis-pkg => pkg}/log/log.go | 0 {ocis-pkg => pkg}/log/log_test.go | 2 +- {ocis-pkg => pkg}/log/logrus_wrapper.go | 0 {ocis-pkg => pkg}/log/option.go | 0 {ocis-pkg => pkg}/markdown/markdown.go | 0 .../markdown/markdown_suite_test.go | 0 {ocis-pkg => pkg}/markdown/markdown_test.go | 0 {ocis-pkg => pkg}/middleware/account.go | 2 +- {ocis-pkg => pkg}/middleware/header.go | 2 +- {ocis-pkg => pkg}/middleware/logger.go | 2 +- {ocis-pkg => pkg}/middleware/oidc.go | 2 +- {ocis-pkg => pkg}/middleware/options.go | 2 +- {ocis-pkg => pkg}/middleware/static.go | 0 {ocis-pkg => pkg}/middleware/throttle.go | 0 {ocis-pkg => pkg}/middleware/tracing.go | 0 {ocis-pkg => pkg}/middleware/version.go | 0 {ocis-pkg => pkg}/natsjsregistry/options.go | 0 {ocis-pkg => pkg}/natsjsregistry/registry.go | 0 {ocis-pkg => pkg}/natsjsregistry/watcher.go | 0 {ocis-pkg => pkg}/oidc/claims.go | 0 {ocis-pkg => pkg}/oidc/claims_test.go | 2 +- {ocis-pkg => pkg}/oidc/client.go | 2 +- {ocis-pkg => pkg}/oidc/client_test.go | 2 +- {ocis-pkg => pkg}/oidc/context.go | 0 {ocis-pkg => pkg}/oidc/jose.go | 0 {ocis-pkg => pkg}/oidc/metadata.go | 2 +- {ocis-pkg => pkg}/oidc/mocks/oidc_client.go | 2 +- {ocis-pkg => pkg}/oidc/options.go | 2 +- {ocis-pkg => pkg}/registry/expiry.go | 0 {ocis-pkg => pkg}/registry/register.go | 2 +- {ocis-pkg => pkg}/registry/register_test.go | 2 +- {ocis-pkg => pkg}/registry/registry.go | 2 +- {ocis-pkg => pkg}/registry/service.go | 0 {ocis-pkg => pkg}/roles/manager.go | 2 +- {ocis-pkg => pkg}/roles/option.go | 2 +- {ocis-pkg => pkg}/roles/util.go | 2 +- {ocis-pkg => pkg}/runner/grouprunner.go | 0 {ocis-pkg => pkg}/runner/grouprunner_test.go | 2 +- {ocis-pkg => pkg}/runner/option.go | 0 {ocis-pkg => pkg}/runner/runner.go | 0 {ocis-pkg => pkg}/runner/runner_suite_test.go | 0 {ocis-pkg => pkg}/runner/runner_test.go | 2 +- {ocis-pkg => pkg}/runner/types.go | 0 {ocis-pkg => pkg}/service/debug/option.go | 2 +- {ocis-pkg => pkg}/service/debug/service.go | 8 ++++---- {ocis-pkg => pkg}/service/grpc/client.go | 4 ++-- .../grpc/handler/ratelimiter/ratelimiter.go | 0 {ocis-pkg => pkg}/service/grpc/keepalive.go | 0 {ocis-pkg => pkg}/service/grpc/option.go | 2 +- {ocis-pkg => pkg}/service/grpc/service.go | 6 +++--- {ocis-pkg => pkg}/service/http/option.go | 4 ++-- {ocis-pkg => pkg}/service/http/service.go | 6 +++--- {ocis-pkg => pkg}/shared/errors.go | 2 +- {ocis-pkg => pkg}/shared/memlimit.go | 0 {ocis-pkg => pkg}/shared/reva.go | 0 {ocis-pkg => pkg}/shared/shared_types.go | 0 {ocis-pkg => pkg}/structs/structs.go | 0 {ocis-pkg => pkg}/structs/structs_test.go | 0 {ocis-pkg => pkg}/sync/cache.go | 0 {ocis-pkg => pkg}/sync/cache_test.go | 0 {ocis-pkg => pkg}/sync/mutex.go | 0 {ocis-pkg => pkg}/sync/mutex_test.go | 0 {ocis-pkg => pkg}/sync/sync.go | 0 {ocis-pkg => pkg}/tools/tools.go | 0 {ocis-pkg => pkg}/tracing/config.go | 0 {ocis-pkg => pkg}/tracing/tracing.go | 0 {ocis-pkg => pkg}/tracing/tracing_test.go | 0 {ocis-pkg => pkg}/version/version.go | 0 {ocis-pkg => pkg}/x/io/fsx/fallback.go | 0 {ocis-pkg => pkg}/x/io/fsx/fallback_test.go | 2 +- {ocis-pkg => pkg}/x/io/fsx/fsx.go | 0 {ocis-pkg => pkg}/x/io/fsx/fsx_test.go | 2 +- {ocis-pkg => pkg}/x/path/filepathx/path.go | 0 {ocis-pkg => pkg}/x/path/filepathx/path_test.go | 2 +- services/activitylog/pkg/command/root.go | 2 +- services/activitylog/pkg/command/server.go | 10 +++++----- services/activitylog/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- services/activitylog/pkg/config/parser/parse.go | 4 ++-- services/activitylog/pkg/config/tracing.go | 2 +- services/activitylog/pkg/logging/logging.go | 2 +- services/activitylog/pkg/server/debug/option.go | 2 +- services/activitylog/pkg/server/debug/server.go | 8 ++++---- services/activitylog/pkg/server/http/option.go | 2 +- services/activitylog/pkg/server/http/server.go | 12 ++++++------ services/activitylog/pkg/service/http.go | 8 ++++---- services/activitylog/pkg/service/options.go | 2 +- services/activitylog/pkg/service/response.go | 2 +- services/activitylog/pkg/service/service.go | 2 +- services/antivirus/pkg/command/health.go | 4 ++-- services/antivirus/pkg/command/root.go | 2 +- services/antivirus/pkg/command/server.go | 6 +++--- services/antivirus/pkg/command/version.go | 2 +- services/antivirus/pkg/config/parser/parse.go | 4 ++-- services/antivirus/pkg/config/tracing.go | 2 +- services/antivirus/pkg/server/debug/option.go | 2 +- services/antivirus/pkg/server/debug/server.go | 8 ++++---- services/antivirus/pkg/service/service.go | 2 +- services/app-provider/pkg/command/health.go | 2 +- services/app-provider/pkg/command/root.go | 2 +- services/app-provider/pkg/command/server.go | 8 ++++---- services/app-provider/pkg/command/version.go | 4 ++-- services/app-provider/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- services/app-provider/pkg/config/parser/parse.go | 6 +++--- services/app-provider/pkg/config/tracing.go | 2 +- services/app-provider/pkg/logging/logging.go | 2 +- services/app-provider/pkg/server/debug/option.go | 2 +- services/app-provider/pkg/server/debug/server.go | 4 ++-- services/app-registry/pkg/command/health.go | 2 +- services/app-registry/pkg/command/root.go | 2 +- services/app-registry/pkg/command/server.go | 8 ++++---- services/app-registry/pkg/command/version.go | 4 ++-- services/app-registry/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- services/app-registry/pkg/config/parser/parse.go | 6 +++--- services/app-registry/pkg/config/tracing.go | 2 +- services/app-registry/pkg/logging/logging.go | 2 +- services/app-registry/pkg/revaconfig/config.go | 2 +- services/app-registry/pkg/server/debug/option.go | 2 +- services/app-registry/pkg/server/debug/server.go | 4 ++-- services/audit/pkg/command/root.go | 2 +- services/audit/pkg/command/server.go | 2 +- services/audit/pkg/config/config.go | 2 +- services/audit/pkg/config/parser/parse.go | 4 ++-- services/audit/pkg/logging/logging.go | 2 +- services/audit/pkg/server/debug/option.go | 2 +- services/audit/pkg/server/debug/server.go | 8 ++++---- services/audit/pkg/service/service.go | 2 +- services/audit/pkg/service/service_test.go | 2 +- services/auth-app/pkg/command/create.go | 6 +++--- services/auth-app/pkg/command/health.go | 2 +- services/auth-app/pkg/command/root.go | 2 +- services/auth-app/pkg/command/server.go | 10 +++++----- services/auth-app/pkg/command/version.go | 4 ++-- services/auth-app/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- services/auth-app/pkg/config/parser/parse.go | 6 +++--- services/auth-app/pkg/config/tracing.go | 2 +- services/auth-app/pkg/logging/logging.go | 2 +- services/auth-app/pkg/revaconfig/config.go | 2 +- services/auth-app/pkg/server/debug/option.go | 2 +- services/auth-app/pkg/server/debug/server.go | 4 ++-- services/auth-app/pkg/server/http/option.go | 2 +- services/auth-app/pkg/server/http/server.go | 12 ++++++------ services/auth-app/pkg/service/option.go | 2 +- services/auth-app/pkg/service/service.go | 4 ++-- services/auth-basic/pkg/command/health.go | 2 +- services/auth-basic/pkg/command/root.go | 2 +- services/auth-basic/pkg/command/server.go | 10 +++++----- services/auth-basic/pkg/command/version.go | 4 ++-- services/auth-basic/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +++--- services/auth-basic/pkg/config/parser/parse.go | 6 +++--- services/auth-basic/pkg/config/tracing.go | 2 +- services/auth-basic/pkg/logging/logging.go | 2 +- services/auth-basic/pkg/server/debug/option.go | 2 +- services/auth-basic/pkg/server/debug/server.go | 4 ++-- services/auth-bearer/pkg/command/health.go | 2 +- services/auth-bearer/pkg/command/root.go | 4 ++-- services/auth-bearer/pkg/command/server.go | 8 ++++---- services/auth-bearer/pkg/command/version.go | 4 ++-- services/auth-bearer/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- services/auth-bearer/pkg/config/parser/parse.go | 6 +++--- services/auth-bearer/pkg/config/tracing.go | 2 +- services/auth-bearer/pkg/logging/logging.go | 2 +- services/auth-bearer/pkg/server/debug/option.go | 2 +- services/auth-bearer/pkg/server/debug/server.go | 4 ++-- services/auth-machine/pkg/command/health.go | 2 +- services/auth-machine/pkg/command/root.go | 2 +- services/auth-machine/pkg/command/server.go | 8 ++++---- services/auth-machine/pkg/command/version.go | 4 ++-- services/auth-machine/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- services/auth-machine/pkg/config/parser/parse.go | 6 +++--- services/auth-machine/pkg/config/tracing.go | 2 +- services/auth-machine/pkg/logging/logging.go | 2 +- services/auth-machine/pkg/server/debug/option.go | 2 +- services/auth-machine/pkg/server/debug/server.go | 4 ++-- services/auth-service/pkg/command/health.go | 2 +- services/auth-service/pkg/command/root.go | 2 +- services/auth-service/pkg/command/server.go | 8 ++++---- services/auth-service/pkg/command/version.go | 4 ++-- services/auth-service/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- services/auth-service/pkg/config/parser/parse.go | 6 +++--- services/auth-service/pkg/config/tracing.go | 2 +- services/auth-service/pkg/logging/logging.go | 2 +- services/auth-service/pkg/server/debug/option.go | 2 +- services/auth-service/pkg/server/debug/server.go | 4 ++-- services/clientlog/pkg/command/root.go | 2 +- services/clientlog/pkg/command/server.go | 8 ++++---- services/clientlog/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- services/clientlog/pkg/config/parser/parse.go | 6 +++--- services/clientlog/pkg/config/tracing.go | 2 +- services/clientlog/pkg/logging/logging.go | 2 +- services/clientlog/pkg/server/debug/option.go | 2 +- services/clientlog/pkg/server/debug/server.go | 8 ++++---- services/clientlog/pkg/service/options.go | 2 +- services/clientlog/pkg/service/service.go | 2 +- services/collaboration/pkg/command/health.go | 2 +- services/collaboration/pkg/command/root.go | 2 +- services/collaboration/pkg/command/server.go | 6 +++--- services/collaboration/pkg/command/version.go | 4 ++-- services/collaboration/pkg/config/config.go | 4 ++-- services/collaboration/pkg/config/cs3api.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- services/collaboration/pkg/config/http.go | 2 +- .../collaboration/pkg/config/parser/parse.go | 8 ++++---- .../pkg/connector/contentconnector.go | 2 +- .../pkg/connector/fileconnector_test.go | 2 +- services/collaboration/pkg/helpers/discovery.go | 2 +- .../collaboration/pkg/helpers/discovery_test.go | 2 +- .../collaboration/pkg/helpers/registration.go | 6 +++--- services/collaboration/pkg/logging/logging.go | 2 +- .../collaboration/pkg/middleware/accesslog.go | 2 +- .../collaboration/pkg/server/debug/option.go | 2 +- .../collaboration/pkg/server/debug/server.go | 8 ++++---- services/collaboration/pkg/server/grpc/option.go | 2 +- services/collaboration/pkg/server/grpc/server.go | 2 +- services/collaboration/pkg/server/http/option.go | 2 +- services/collaboration/pkg/server/http/server.go | 12 ++++++------ .../collaboration/pkg/service/grpc/v0/option.go | 2 +- .../collaboration/pkg/service/grpc/v0/service.go | 2 +- .../pkg/service/grpc/v0/service_test.go | 2 +- services/eventhistory/pkg/command/root.go | 2 +- services/eventhistory/pkg/command/server.go | 8 ++++---- services/eventhistory/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 2 +- services/eventhistory/pkg/config/parser/parse.go | 4 ++-- services/eventhistory/pkg/config/tracing.go | 2 +- services/eventhistory/pkg/logging/logging.go | 2 +- services/eventhistory/pkg/server/debug/option.go | 2 +- services/eventhistory/pkg/server/debug/server.go | 8 ++++---- services/eventhistory/pkg/server/grpc/option.go | 2 +- services/eventhistory/pkg/server/grpc/server.go | 4 ++-- services/eventhistory/pkg/service/service.go | 2 +- .../eventhistory/pkg/service/service_test.go | 2 +- services/frontend/pkg/command/events.go | 10 +++++----- services/frontend/pkg/command/health.go | 2 +- services/frontend/pkg/command/root.go | 2 +- services/frontend/pkg/command/server.go | 8 ++++---- services/frontend/pkg/command/version.go | 4 ++-- services/frontend/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- services/frontend/pkg/config/parser/parse.go | 8 ++++---- services/frontend/pkg/config/tracing.go | 2 +- services/frontend/pkg/logging/logging.go | 2 +- services/frontend/pkg/revaconfig/config.go | 8 ++++---- services/frontend/pkg/server/debug/option.go | 2 +- services/frontend/pkg/server/debug/server.go | 8 ++++---- services/gateway/pkg/command/health.go | 2 +- services/gateway/pkg/command/root.go | 2 +- services/gateway/pkg/command/server.go | 8 ++++---- services/gateway/pkg/command/version.go | 4 ++-- services/gateway/pkg/config/config.go | 2 +- .../gateway/pkg/config/defaults/defaultconfig.go | 4 ++-- services/gateway/pkg/config/parser/parse.go | 8 ++++---- services/gateway/pkg/config/tracing.go | 2 +- services/gateway/pkg/logging/logging.go | 2 +- services/gateway/pkg/revaconfig/config.go | 4 ++-- services/gateway/pkg/server/debug/option.go | 2 +- services/gateway/pkg/server/debug/server.go | 8 ++++---- services/graph/pkg/command/health.go | 2 +- services/graph/pkg/command/root.go | 2 +- services/graph/pkg/command/server.go | 6 +++--- services/graph/pkg/command/unified_roles.go | 2 +- services/graph/pkg/command/version.go | 4 ++-- services/graph/pkg/config/config.go | 2 +- .../graph/pkg/config/defaults/defaultconfig.go | 6 +++--- services/graph/pkg/config/http.go | 2 +- services/graph/pkg/config/parser/parse.go | 8 ++++---- services/graph/pkg/config/tracing.go | 2 +- services/graph/pkg/identity/cs3.go | 6 +++--- services/graph/pkg/identity/ldap.go | 2 +- services/graph/pkg/identity/ldap/reconnect.go | 2 +- .../graph/pkg/identity/ldap_education_school.go | 4 ++-- services/graph/pkg/identity/ldap_test.go | 4 ++-- services/graph/pkg/l10n/translation.go | 2 +- services/graph/pkg/logging/logging.go | 2 +- services/graph/pkg/middleware/auth.go | 6 +++--- services/graph/pkg/middleware/requireadmin.go | 4 ++-- services/graph/pkg/server/debug/option.go | 2 +- services/graph/pkg/server/debug/server.go | 8 ++++---- services/graph/pkg/server/http/option.go | 2 +- services/graph/pkg/server/http/server.go | 16 ++++++++-------- .../pkg/service/v0/api_driveitem_permissions.go | 6 +++--- .../v0/api_driveitem_permissions_links_test.go | 4 ++-- .../service/v0/api_driveitem_permissions_test.go | 4 ++-- .../pkg/service/v0/api_drives_drive_item.go | 2 +- .../pkg/service/v0/api_drives_drive_item_test.go | 4 ++-- .../graph/pkg/service/v0/application_test.go | 4 ++-- .../pkg/service/v0/approleassignments_test.go | 4 ++-- services/graph/pkg/service/v0/base.go | 2 +- services/graph/pkg/service/v0/driveitems.go | 2 +- services/graph/pkg/service/v0/driveitems_test.go | 2 +- services/graph/pkg/service/v0/drives.go | 2 +- .../pkg/service/v0/educationclasses_test.go | 4 ++-- .../pkg/service/v0/educationschools_test.go | 4 ++-- .../graph/pkg/service/v0/educationuser_test.go | 4 ++-- services/graph/pkg/service/v0/graph.go | 2 +- .../graph/pkg/service/v0/graph_suite_test.go | 2 +- services/graph/pkg/service/v0/graph_test.go | 2 +- services/graph/pkg/service/v0/groups_test.go | 4 ++-- services/graph/pkg/service/v0/option.go | 6 +++--- services/graph/pkg/service/v0/password_test.go | 6 +++--- services/graph/pkg/service/v0/service.go | 10 +++++----- services/graph/pkg/service/v0/sharedbyme_test.go | 4 ++-- .../graph/pkg/service/v0/sharedwithme_test.go | 4 ++-- services/graph/pkg/service/v0/spacetemplates.go | 2 +- services/graph/pkg/service/v0/users_test.go | 2 +- services/graph/pkg/service/v0/utils.go | 2 +- services/graph/pkg/service/v0/utils_test.go | 4 ++-- .../graph/pkg/unifiedrole/conversion_test.go | 2 +- services/graph/pkg/unifiedrole/roles.go | 2 +- services/graph/pkg/validate/libregraph_test.go | 2 +- services/groups/pkg/command/health.go | 2 +- services/groups/pkg/command/root.go | 2 +- services/groups/pkg/command/server.go | 10 +++++----- services/groups/pkg/command/version.go | 4 ++-- services/groups/pkg/config/config.go | 2 +- .../groups/pkg/config/defaults/defaultconfig.go | 6 +++--- services/groups/pkg/config/parser/parse.go | 6 +++--- services/groups/pkg/config/tracing.go | 2 +- services/groups/pkg/logging/logging.go | 2 +- services/groups/pkg/server/debug/option.go | 2 +- services/groups/pkg/server/debug/server.go | 4 ++-- services/idm/pkg/command/health.go | 2 +- services/idm/pkg/command/resetpw.go | 4 ++-- services/idm/pkg/command/root.go | 2 +- services/idm/pkg/command/server.go | 6 +++--- services/idm/pkg/config/config.go | 2 +- .../idm/pkg/config/defaults/defaultconfig.go | 2 +- services/idm/pkg/config/parser/parse.go | 6 +++--- services/idm/pkg/logging/logging.go | 2 +- services/idm/pkg/server/debug/option.go | 2 +- services/idm/pkg/server/debug/server.go | 4 ++-- services/idp/pkg/assets/option.go | 4 ++-- services/idp/pkg/command/health.go | 2 +- services/idp/pkg/command/root.go | 2 +- services/idp/pkg/command/server.go | 6 +++--- services/idp/pkg/command/version.go | 4 ++-- services/idp/pkg/config/config.go | 2 +- .../idp/pkg/config/defaults/defaultconfig.go | 6 +++--- services/idp/pkg/config/parser/parse.go | 6 +++--- services/idp/pkg/config/tracing.go | 2 +- services/idp/pkg/logging/logging.go | 2 +- services/idp/pkg/server/debug/option.go | 2 +- services/idp/pkg/server/debug/server.go | 8 ++++---- services/idp/pkg/server/http/option.go | 2 +- services/idp/pkg/server/http/server.go | 10 +++++----- services/idp/pkg/service/v0/logging.go | 2 +- services/idp/pkg/service/v0/option.go | 2 +- services/idp/pkg/service/v0/service.go | 6 +++--- .../invitations/pkg/backends/keycloak/backend.go | 6 +++--- .../pkg/backends/keycloak/backend_test.go | 4 ++-- .../pkg/backends/keycloak/mocks/client.go | 2 +- services/invitations/pkg/command/health.go | 2 +- services/invitations/pkg/command/root.go | 2 +- services/invitations/pkg/command/server.go | 6 +++--- services/invitations/pkg/command/version.go | 4 ++-- services/invitations/pkg/config/config.go | 2 +- services/invitations/pkg/config/http.go | 2 +- services/invitations/pkg/config/parser/parse.go | 4 ++-- services/invitations/pkg/config/tracing.go | 2 +- services/invitations/pkg/logging/logging.go | 2 +- services/invitations/pkg/metrics/options.go | 2 +- services/invitations/pkg/server/debug/option.go | 2 +- services/invitations/pkg/server/debug/server.go | 8 ++++---- services/invitations/pkg/server/http/option.go | 2 +- services/invitations/pkg/server/http/server.go | 10 +++++----- services/invitations/pkg/service/v0/logging.go | 2 +- services/invitations/pkg/service/v0/option.go | 2 +- services/invitations/pkg/service/v0/service.go | 2 +- services/nats/pkg/command/root.go | 2 +- services/nats/pkg/command/server.go | 4 ++-- services/nats/pkg/config/config.go | 2 +- .../nats/pkg/config/defaults/defaultconfig.go | 2 +- services/nats/pkg/config/parser/parse.go | 4 ++-- services/nats/pkg/logging/logging.go | 2 +- services/nats/pkg/logging/nats.go | 2 +- services/nats/pkg/server/debug/option.go | 2 +- services/nats/pkg/server/debug/server.go | 8 ++++---- services/notifications/pkg/channels/channels.go | 2 +- services/notifications/pkg/command/root.go | 2 +- services/notifications/pkg/command/server.go | 11 ++++++----- services/notifications/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 7 ++++--- .../notifications/pkg/config/parser/parse.go | 6 +++--- services/notifications/pkg/config/tracing.go | 2 +- services/notifications/pkg/email/composer.go | 5 +++-- services/notifications/pkg/email/templates.go | 2 +- services/notifications/pkg/logging/logging.go | 2 +- .../notifications/pkg/server/debug/option.go | 2 +- .../notifications/pkg/server/debug/server.go | 8 ++++---- services/notifications/pkg/service/filter.go | 5 +++-- .../notifications/pkg/service/filter_test.go | 5 +++-- services/notifications/pkg/service/job.go | 3 ++- .../pkg/service/notification_suite_test.go | 2 +- .../notifications/pkg/service/persistence.go | 3 ++- services/notifications/pkg/service/service.go | 11 ++++++----- .../notifications/pkg/service/service_test.go | 7 ++++--- services/notifications/pkg/service/splitter.go | 5 +++-- .../notifications/pkg/service/splitter_test.go | 7 ++++--- services/ocdav/pkg/command/health.go | 2 +- services/ocdav/pkg/command/root.go | 2 +- services/ocdav/pkg/command/server.go | 10 +++++----- services/ocdav/pkg/command/version.go | 4 ++-- services/ocdav/pkg/config/config.go | 2 +- .../ocdav/pkg/config/defaults/defaultconfig.go | 6 +++--- services/ocdav/pkg/config/parser/parse.go | 6 +++--- services/ocdav/pkg/config/tracing.go | 2 +- services/ocdav/pkg/logging/logging.go | 2 +- services/ocdav/pkg/server/debug/option.go | 2 +- services/ocdav/pkg/server/debug/server.go | 4 ++-- services/ocm/pkg/command/root.go | 2 +- services/ocm/pkg/command/server.go | 8 ++++---- services/ocm/pkg/config/config.go | 2 +- .../ocm/pkg/config/defaults/defaultconfig.go | 6 +++--- services/ocm/pkg/config/parser/parse.go | 8 ++++---- services/ocm/pkg/config/tracing.go | 2 +- services/ocm/pkg/logging/logging.go | 2 +- services/ocm/pkg/revaconfig/config.go | 2 +- services/ocm/pkg/server/debug/option.go | 2 +- services/ocm/pkg/server/debug/server.go | 8 ++++---- services/ocs/pkg/command/health.go | 2 +- services/ocs/pkg/command/root.go | 2 +- services/ocs/pkg/command/server.go | 8 ++++---- services/ocs/pkg/command/version.go | 4 ++-- services/ocs/pkg/config/config.go | 2 +- .../ocs/pkg/config/defaults/defaultconfig.go | 2 +- services/ocs/pkg/config/http.go | 2 +- services/ocs/pkg/config/parser/parse.go | 6 +++--- services/ocs/pkg/config/tracing.go | 2 +- services/ocs/pkg/logging/logging.go | 2 +- services/ocs/pkg/server/debug/option.go | 2 +- services/ocs/pkg/server/debug/server.go | 8 ++++---- services/ocs/pkg/server/http/option.go | 2 +- services/ocs/pkg/server/http/server.go | 9 +++++---- services/ocs/pkg/service/v0/logging.go | 2 +- services/ocs/pkg/service/v0/option.go | 2 +- services/ocs/pkg/service/v0/service.go | 6 +++--- services/ocs/pkg/service/v0/tracing.go | 2 +- services/policies/pkg/command/health.go | 5 +++-- services/policies/pkg/command/root.go | 2 +- services/policies/pkg/command/server.go | 10 +++++----- services/policies/pkg/command/version.go | 4 ++-- services/policies/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 2 +- services/policies/pkg/config/parser/parse.go | 4 ++-- services/policies/pkg/config/tracing.go | 2 +- services/policies/pkg/engine/opa/engine.go | 2 +- services/policies/pkg/engine/opa/opa.go | 2 +- services/policies/pkg/server/debug/option.go | 2 +- services/policies/pkg/server/debug/server.go | 8 ++++---- services/policies/pkg/service/event/service.go | 2 +- .../postprocessing/pkg/command/postprocessing.go | 2 +- services/postprocessing/pkg/command/root.go | 2 +- services/postprocessing/pkg/command/server.go | 2 +- services/postprocessing/pkg/config/config.go | 2 +- .../postprocessing/pkg/config/parser/parse.go | 4 ++-- services/postprocessing/pkg/config/tracing.go | 2 +- services/postprocessing/pkg/logging/logging.go | 2 +- .../postprocessing/pkg/server/debug/option.go | 2 +- .../postprocessing/pkg/server/debug/server.go | 8 ++++---- services/postprocessing/pkg/service/service.go | 2 +- services/proxy/pkg/command/health.go | 2 +- services/proxy/pkg/command/root.go | 2 +- services/proxy/pkg/command/server.go | 16 ++++++++-------- services/proxy/pkg/command/version.go | 4 ++-- services/proxy/pkg/config/config.go | 2 +- .../proxy/pkg/config/defaults/defaultconfig.go | 6 +++--- services/proxy/pkg/config/parser/parse.go | 6 +++--- services/proxy/pkg/config/tracing.go | 2 +- services/proxy/pkg/logging/logging.go | 2 +- services/proxy/pkg/middleware/accesslog.go | 2 +- .../proxy/pkg/middleware/account_resolver.go | 4 ++-- .../pkg/middleware/account_resolver_test.go | 4 ++-- services/proxy/pkg/middleware/app_auth.go | 2 +- services/proxy/pkg/middleware/app_auth_test.go | 2 +- .../proxy/pkg/middleware/authentication_test.go | 6 +++--- services/proxy/pkg/middleware/basic_auth.go | 4 ++-- services/proxy/pkg/middleware/basic_auth_test.go | 4 ++-- services/proxy/pkg/middleware/context_logger.go | 2 +- services/proxy/pkg/middleware/create_home.go | 2 +- services/proxy/pkg/middleware/oidc_auth.go | 4 ++-- services/proxy/pkg/middleware/oidc_auth_test.go | 6 +++--- services/proxy/pkg/middleware/options.go | 4 ++-- .../proxy/pkg/middleware/public_share_auth.go | 2 +- .../pkg/middleware/public_share_auth_test.go | 2 +- services/proxy/pkg/middleware/selector_cookie.go | 4 ++-- services/proxy/pkg/middleware/signed_url_auth.go | 2 +- services/proxy/pkg/middleware/tracing.go | 2 +- services/proxy/pkg/proxy/option.go | 2 +- services/proxy/pkg/proxy/policy/selector.go | 2 +- services/proxy/pkg/proxy/policy/selector_test.go | 2 +- services/proxy/pkg/proxy/proxy.go | 2 +- .../proxy/pkg/proxy/proxy_integration_test.go | 4 ++-- services/proxy/pkg/router/router.go | 2 +- services/proxy/pkg/router/router_test.go | 4 ++-- services/proxy/pkg/server/debug/option.go | 2 +- services/proxy/pkg/server/debug/server.go | 8 ++++---- services/proxy/pkg/server/http/option.go | 2 +- services/proxy/pkg/server/http/server.go | 8 ++++---- .../proxy/pkg/staticroutes/backchannellogout.go | 2 +- services/proxy/pkg/staticroutes/staticroutes.go | 4 ++-- services/proxy/pkg/user/backend/cs3.go | 6 +++--- services/proxy/pkg/userroles/defaultrole.go | 2 +- services/proxy/pkg/userroles/oidcroles.go | 4 ++-- services/proxy/pkg/userroles/userroles.go | 2 +- services/search/pkg/command/index.go | 6 +++--- services/search/pkg/command/root.go | 2 +- services/search/pkg/command/server.go | 8 ++++---- services/search/pkg/command/version.go | 4 ++-- services/search/pkg/config/config.go | 2 +- .../search/pkg/config/defaults/defaultconfig.go | 6 +++--- services/search/pkg/config/grpc.go | 2 +- services/search/pkg/config/parser/parse.go | 6 +++--- services/search/pkg/config/tracing.go | 2 +- services/search/pkg/content/basic.go | 2 +- services/search/pkg/content/basic_test.go | 2 +- services/search/pkg/content/cs3.go | 2 +- services/search/pkg/content/tika.go | 4 ++-- services/search/pkg/content/tika_test.go | 4 ++-- services/search/pkg/logging/logging.go | 2 +- services/search/pkg/query/bleve/bleve.go | 2 +- services/search/pkg/query/bleve/compiler.go | 4 ++-- services/search/pkg/query/bleve/compiler_test.go | 2 +- services/search/pkg/query/error.go | 2 +- services/search/pkg/query/query.go | 2 +- services/search/pkg/search/events.go | 2 +- services/search/pkg/search/events_test.go | 2 +- services/search/pkg/search/search.go | 2 +- services/search/pkg/search/search_suite_test.go | 2 +- services/search/pkg/search/service.go | 4 ++-- services/search/pkg/search/service_test.go | 2 +- services/search/pkg/server/debug/option.go | 2 +- services/search/pkg/server/debug/server.go | 8 ++++---- services/search/pkg/server/grpc/option.go | 2 +- services/search/pkg/server/grpc/server.go | 4 ++-- services/search/pkg/service/grpc/v0/option.go | 2 +- services/search/pkg/service/grpc/v0/service.go | 4 ++-- services/settings/pkg/command/health.go | 2 +- services/settings/pkg/command/root.go | 2 +- services/settings/pkg/command/server.go | 8 ++++---- services/settings/pkg/command/version.go | 4 ++-- services/settings/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 2 +- services/settings/pkg/config/grpc.go | 2 +- services/settings/pkg/config/http.go | 2 +- services/settings/pkg/config/parser/parse.go | 6 +++--- services/settings/pkg/config/tracing.go | 2 +- services/settings/pkg/logging/logging.go | 2 +- services/settings/pkg/server/debug/option.go | 2 +- services/settings/pkg/server/debug/server.go | 8 ++++---- services/settings/pkg/server/grpc/option.go | 2 +- services/settings/pkg/server/grpc/server.go | 4 ++-- services/settings/pkg/server/http/option.go | 2 +- services/settings/pkg/server/http/server.go | 12 ++++++------ services/settings/pkg/service/v0/option.go | 2 +- services/settings/pkg/service/v0/service.go | 8 ++++---- services/settings/pkg/service/v0/service_test.go | 2 +- .../settings/pkg/store/defaults/templates.go | 2 +- .../pkg/store/metadata/assignments_test.go | 4 ++-- services/settings/pkg/store/metadata/cache.go | 2 +- services/settings/pkg/store/metadata/store.go | 2 +- services/sharing/pkg/command/health.go | 2 +- services/sharing/pkg/command/root.go | 2 +- services/sharing/pkg/command/server.go | 8 ++++---- services/sharing/pkg/command/version.go | 4 ++-- services/sharing/pkg/config/config.go | 2 +- .../sharing/pkg/config/defaults/defaultconfig.go | 6 +++--- services/sharing/pkg/config/parser/parse.go | 6 +++--- services/sharing/pkg/config/tracing.go | 2 +- services/sharing/pkg/logging/logging.go | 2 +- services/sharing/pkg/revaconfig/config.go | 4 ++-- services/sharing/pkg/server/debug/option.go | 2 +- services/sharing/pkg/server/debug/server.go | 8 ++++---- services/sse/pkg/command/health.go | 4 ++-- services/sse/pkg/command/root.go | 2 +- services/sse/pkg/command/server.go | 6 +++--- services/sse/pkg/command/version.go | 2 +- services/sse/pkg/config/config.go | 2 +- services/sse/pkg/config/parser/parse.go | 4 ++-- services/sse/pkg/config/tracing.go | 2 +- services/sse/pkg/server/debug/option.go | 2 +- services/sse/pkg/server/debug/server.go | 8 ++++---- services/sse/pkg/server/http/option.go | 2 +- services/sse/pkg/server/http/server.go | 12 ++++++------ services/sse/pkg/service/service.go | 2 +- .../storage-publiclink/pkg/command/health.go | 2 +- services/storage-publiclink/pkg/command/root.go | 2 +- .../storage-publiclink/pkg/command/server.go | 8 ++++---- .../storage-publiclink/pkg/command/version.go | 4 ++-- services/storage-publiclink/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- .../pkg/config/parser/parse.go | 6 +++--- .../storage-publiclink/pkg/config/tracing.go | 2 +- .../storage-publiclink/pkg/logging/logging.go | 2 +- .../pkg/server/debug/option.go | 2 +- .../pkg/server/debug/server.go | 4 ++-- services/storage-shares/pkg/command/health.go | 2 +- services/storage-shares/pkg/command/root.go | 2 +- services/storage-shares/pkg/command/server.go | 8 ++++---- services/storage-shares/pkg/command/version.go | 4 ++-- services/storage-shares/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 ++-- .../storage-shares/pkg/config/parser/parse.go | 6 +++--- services/storage-shares/pkg/config/tracing.go | 2 +- services/storage-shares/pkg/logging/logging.go | 2 +- .../storage-shares/pkg/server/debug/option.go | 2 +- .../storage-shares/pkg/server/debug/server.go | 4 ++-- services/storage-system/pkg/command/health.go | 2 +- services/storage-system/pkg/command/root.go | 2 +- services/storage-system/pkg/command/server.go | 8 ++++---- services/storage-system/pkg/command/version.go | 4 ++-- services/storage-system/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +++--- .../storage-system/pkg/config/parser/parse.go | 6 +++--- services/storage-system/pkg/config/tracing.go | 2 +- services/storage-system/pkg/logging/logging.go | 2 +- services/storage-system/pkg/revaconfig/config.go | 2 +- .../storage-system/pkg/server/debug/option.go | 2 +- .../storage-system/pkg/server/debug/server.go | 4 ++-- services/storage-users/pkg/command/health.go | 2 +- services/storage-users/pkg/command/root.go | 2 +- services/storage-users/pkg/command/server.go | 8 ++++---- services/storage-users/pkg/command/trash_bin.go | 4 ++-- services/storage-users/pkg/command/uploads.go | 2 +- services/storage-users/pkg/command/version.go | 4 ++-- services/storage-users/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +++--- .../storage-users/pkg/config/parser/parse.go | 8 ++++---- services/storage-users/pkg/config/tracing.go | 2 +- services/storage-users/pkg/event/service.go | 2 +- services/storage-users/pkg/logging/logging.go | 2 +- .../storage-users/pkg/server/debug/option.go | 2 +- .../storage-users/pkg/server/debug/server.go | 8 ++++---- .../storage-users/pkg/task/task_suite_test.go | 2 +- services/thumbnails/pkg/command/health.go | 2 +- services/thumbnails/pkg/command/root.go | 2 +- services/thumbnails/pkg/command/server.go | 8 ++++---- services/thumbnails/pkg/command/version.go | 4 ++-- services/thumbnails/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +++--- services/thumbnails/pkg/config/grpc.go | 2 +- services/thumbnails/pkg/config/http.go | 2 +- services/thumbnails/pkg/config/parser/parse.go | 4 ++-- services/thumbnails/pkg/config/tracing.go | 2 +- services/thumbnails/pkg/logging/logging.go | 2 +- .../thumbnails/pkg/preprocessor/fontloader.go | 2 +- services/thumbnails/pkg/server/debug/option.go | 2 +- services/thumbnails/pkg/server/debug/server.go | 8 ++++---- services/thumbnails/pkg/server/grpc/option.go | 2 +- services/thumbnails/pkg/server/grpc/server.go | 8 ++++---- services/thumbnails/pkg/server/http/option.go | 2 +- services/thumbnails/pkg/server/http/server.go | 8 ++++---- .../pkg/service/grpc/v0/decorators/logging.go | 2 +- .../thumbnails/pkg/service/grpc/v0/option.go | 2 +- .../thumbnails/pkg/service/grpc/v0/service.go | 2 +- .../thumbnails/pkg/service/http/v0/logging.go | 2 +- .../thumbnails/pkg/service/http/v0/option.go | 2 +- .../thumbnails/pkg/service/http/v0/service.go | 4 ++-- .../pkg/thumbnail/storage/filesystem.go | 2 +- services/thumbnails/pkg/thumbnail/thumbnail.go | 2 +- .../thumbnails/pkg/thumbnail/thumbnail_test.go | 2 +- services/userlog/pkg/command/root.go | 2 +- services/userlog/pkg/command/server.go | 10 +++++----- services/userlog/pkg/config/config.go | 2 +- .../userlog/pkg/config/defaults/defaultconfig.go | 4 ++-- services/userlog/pkg/config/parser/parse.go | 6 +++--- services/userlog/pkg/config/tracing.go | 2 +- services/userlog/pkg/logging/logging.go | 2 +- services/userlog/pkg/server/debug/option.go | 2 +- services/userlog/pkg/server/debug/server.go | 8 ++++---- services/userlog/pkg/server/http/option.go | 2 +- services/userlog/pkg/server/http/server.go | 12 ++++++------ services/userlog/pkg/service/conversion.go | 2 +- services/userlog/pkg/service/filter.go | 5 +++-- services/userlog/pkg/service/filter_test.go | 5 +++-- services/userlog/pkg/service/http.go | 2 +- services/userlog/pkg/service/options.go | 2 +- services/userlog/pkg/service/service.go | 6 +++--- .../userlog/pkg/service/service_suit_test.go | 2 +- services/userlog/pkg/service/service_test.go | 5 +++-- services/userlog/pkg/service/templates.go | 2 +- services/users/pkg/command/health.go | 2 +- services/users/pkg/command/root.go | 2 +- services/users/pkg/command/server.go | 10 +++++----- services/users/pkg/command/version.go | 4 ++-- services/users/pkg/config/config.go | 2 +- .../users/pkg/config/defaults/defaultconfig.go | 6 +++--- services/users/pkg/config/parser/parse.go | 6 +++--- services/users/pkg/config/tracing.go | 2 +- services/users/pkg/logging/logging.go | 2 +- services/users/pkg/server/debug/option.go | 2 +- services/users/pkg/server/debug/server.go | 4 ++-- services/web/pkg/apps/apps.go | 4 ++-- services/web/pkg/apps/apps_test.go | 2 +- services/web/pkg/command/health.go | 2 +- services/web/pkg/command/root.go | 2 +- services/web/pkg/command/server.go | 4 ++-- services/web/pkg/command/version.go | 4 ++-- services/web/pkg/config/config.go | 2 +- .../web/pkg/config/defaults/defaultconfig.go | 2 +- services/web/pkg/config/http.go | 2 +- services/web/pkg/config/parser/parse.go | 6 +++--- services/web/pkg/config/tracing.go | 2 +- services/web/pkg/logging/logging.go | 2 +- services/web/pkg/server/debug/option.go | 2 +- services/web/pkg/server/debug/server.go | 8 ++++---- services/web/pkg/server/http/option.go | 2 +- services/web/pkg/server/http/server.go | 12 ++++++------ services/web/pkg/service/v0/logging.go | 2 +- services/web/pkg/service/v0/option.go | 4 ++-- services/web/pkg/service/v0/service.go | 10 +++++----- services/web/pkg/theme/kv_test.go | 2 +- services/web/pkg/theme/service.go | 4 ++-- services/web/pkg/theme/service_test.go | 2 +- services/web/pkg/theme/theme.go | 2 +- services/webdav/pkg/command/health.go | 2 +- services/webdav/pkg/command/root.go | 2 +- services/webdav/pkg/command/server.go | 8 ++++---- services/webdav/pkg/command/version.go | 4 ++-- services/webdav/pkg/config/config.go | 2 +- .../webdav/pkg/config/defaults/defaultconfig.go | 4 ++-- services/webdav/pkg/config/http.go | 2 +- services/webdav/pkg/config/parser/parse.go | 4 ++-- services/webdav/pkg/config/tracing.go | 2 +- services/webdav/pkg/logging/logging.go | 2 +- services/webdav/pkg/server/debug/option.go | 2 +- services/webdav/pkg/server/debug/server.go | 8 ++++---- services/webdav/pkg/server/http/option.go | 2 +- services/webdav/pkg/server/http/server.go | 8 ++++---- services/webdav/pkg/service/v0/logging.go | 2 +- services/webdav/pkg/service/v0/option.go | 2 +- services/webdav/pkg/service/v0/service.go | 6 +++--- services/webfinger/pkg/command/health.go | 2 +- services/webfinger/pkg/command/root.go | 2 +- services/webfinger/pkg/command/server.go | 6 +++--- services/webfinger/pkg/command/version.go | 4 ++-- services/webfinger/pkg/config/config.go | 2 +- services/webfinger/pkg/config/http.go | 2 +- services/webfinger/pkg/config/parser/parse.go | 4 ++-- services/webfinger/pkg/config/tracing.go | 2 +- services/webfinger/pkg/logging/logging.go | 2 +- services/webfinger/pkg/metrics/options.go | 2 +- .../webfinger/pkg/relations/owncloud_instance.go | 2 +- .../pkg/relations/owncloud_instance_test.go | 2 +- services/webfinger/pkg/server/debug/option.go | 2 +- services/webfinger/pkg/server/debug/server.go | 8 ++++---- services/webfinger/pkg/server/http/option.go | 3 ++- services/webfinger/pkg/server/http/server.go | 10 +++++----- services/webfinger/pkg/service/v0/logging.go | 2 +- services/webfinger/pkg/service/v0/option.go | 2 +- services/webfinger/pkg/service/v0/service.go | 2 +- .../reva/v2/pkg/app/registry/micro/manager.go | 2 +- .../cs3org/reva/v2/pkg/micro/ocdav/service.go | 2 +- 841 files changed, 1383 insertions(+), 1366 deletions(-) rename {ocis-pkg => pkg}/.gitignore (100%) rename {ocis-pkg => pkg}/.mockery.yaml (100%) rename {ocis-pkg => pkg}/Makefile (100%) rename {ocis-pkg => pkg}/account/option.go (92%) rename {ocis-pkg => pkg}/ast/ast.go (100%) rename {ocis-pkg => pkg}/ast/test/test.go (93%) rename {ocis-pkg => pkg}/broker/noop.go (100%) rename {ocis-pkg => pkg}/capabilities/defaults.go (100%) rename {ocis-pkg => pkg}/checks/checkgrpc.go (91%) rename {ocis-pkg => pkg}/checks/checkhttp.go (92%) rename {ocis-pkg => pkg}/checks/checknats.go (100%) rename {ocis-pkg => pkg}/checks/checktcp.go (89%) rename {ocis-pkg => pkg}/clihelper/app.go (88%) rename {ocis-pkg => pkg}/config/config.go (99%) rename {ocis-pkg => pkg}/config/config_suite_test.go (100%) rename {ocis-pkg => pkg}/config/config_test.go (84%) rename {ocis-pkg => pkg}/config/configlog/log.go (100%) rename {ocis-pkg => pkg}/config/defaultconfig.go (99%) rename {ocis-pkg => pkg}/config/defaults/paths.go (100%) rename {ocis-pkg => pkg}/config/envdecode/LICENSE (100%) rename {ocis-pkg => pkg}/config/envdecode/README.md (100%) rename {ocis-pkg => pkg}/config/envdecode/envdecode.go (100%) rename {ocis-pkg => pkg}/config/envdecode/envdecode_test.go (100%) rename {ocis-pkg => pkg}/config/helpers.go (96%) rename {ocis-pkg => pkg}/config/helpers_test.go (100%) rename {ocis-pkg => pkg}/config/parser/parse.go (93%) rename {ocis-pkg => pkg}/conversions/ptr.go (100%) rename {ocis-pkg => pkg}/conversions/ptr_test.go (99%) rename {ocis-pkg => pkg}/conversions/strings.go (100%) rename {ocis-pkg => pkg}/conversions/strings_test.go (100%) rename {ocis-pkg => pkg}/cors/option.go (97%) rename {ocis-pkg => pkg}/crypto/crypto.go (100%) rename {ocis-pkg => pkg}/crypto/crypto_suite_test.go (100%) rename {ocis-pkg => pkg}/crypto/crypto_test.go (94%) rename {ocis-pkg => pkg}/crypto/gencert.go (98%) rename {ocis-pkg => pkg}/crypto/gencert_test.go (98%) rename {ocis-pkg => pkg}/crypto/templates.go (100%) rename {ocis-pkg => pkg}/flags/overrides.go (100%) rename {ocis-pkg => pkg}/generators/password.go (100%) rename {ocis-pkg => pkg}/handlers/checker.go (98%) rename {ocis-pkg => pkg}/handlers/checker_test.go (97%) rename {ocis-pkg => pkg}/keycloak/client.go (100%) rename {ocis-pkg => pkg}/keycloak/gocloak.go (100%) rename {ocis-pkg => pkg}/keycloak/types.go (100%) rename {ocis-pkg => pkg}/kql/cast.go (98%) rename {ocis-pkg => pkg}/kql/connect.go (98%) rename {ocis-pkg => pkg}/kql/dictionary.peg (100%) rename {ocis-pkg => pkg}/kql/dictionary_gen.go (100%) rename {ocis-pkg => pkg}/kql/dictionary_test.go (99%) rename {ocis-pkg => pkg}/kql/doc.go (100%) rename {ocis-pkg => pkg}/kql/engine_suite_test.go (100%) rename {ocis-pkg => pkg}/kql/factory.go (98%) rename {ocis-pkg => pkg}/kql/gen.go (100%) rename {ocis-pkg => pkg}/kql/kql.go (95%) rename {ocis-pkg => pkg}/kql/kql_test.go (90%) rename {ocis-pkg => pkg}/kql/validate.go (93%) rename {ocis-pkg => pkg}/l10n/l10n.go (99%) rename {ocis-pkg => pkg}/l10n/l10n_test.go (100%) rename {ocis-pkg => pkg}/ldap/ldap.go (95%) rename {ocis-pkg => pkg}/ldap/ldap_suite_test.go (100%) rename {ocis-pkg => pkg}/log/log.go (100%) rename {ocis-pkg => pkg}/log/log_test.go (90%) rename {ocis-pkg => pkg}/log/logrus_wrapper.go (100%) rename {ocis-pkg => pkg}/log/option.go (100%) rename {ocis-pkg => pkg}/markdown/markdown.go (100%) rename {ocis-pkg => pkg}/markdown/markdown_suite_test.go (100%) rename {ocis-pkg => pkg}/markdown/markdown_test.go (100%) rename {ocis-pkg => pkg}/middleware/account.go (97%) rename {ocis-pkg => pkg}/middleware/header.go (96%) rename {ocis-pkg => pkg}/middleware/logger.go (94%) rename {ocis-pkg => pkg}/middleware/oidc.go (98%) rename {ocis-pkg => pkg}/middleware/options.go (96%) rename {ocis-pkg => pkg}/middleware/static.go (100%) rename {ocis-pkg => pkg}/middleware/throttle.go (100%) rename {ocis-pkg => pkg}/middleware/tracing.go (100%) rename {ocis-pkg => pkg}/middleware/version.go (100%) rename {ocis-pkg => pkg}/natsjsregistry/options.go (100%) rename {ocis-pkg => pkg}/natsjsregistry/registry.go (100%) rename {ocis-pkg => pkg}/natsjsregistry/watcher.go (100%) rename {ocis-pkg => pkg}/oidc/claims.go (100%) rename {ocis-pkg => pkg}/oidc/claims_test.go (98%) rename {ocis-pkg => pkg}/oidc/client.go (99%) rename {ocis-pkg => pkg}/oidc/client_test.go (98%) rename {ocis-pkg => pkg}/oidc/context.go (100%) rename {ocis-pkg => pkg}/oidc/jose.go (100%) rename {ocis-pkg => pkg}/oidc/metadata.go (98%) rename {ocis-pkg => pkg}/oidc/mocks/oidc_client.go (99%) rename {ocis-pkg => pkg}/oidc/options.go (98%) rename {ocis-pkg => pkg}/registry/expiry.go (100%) rename {ocis-pkg => pkg}/registry/register.go (97%) rename {ocis-pkg => pkg}/registry/register_test.go (97%) rename {ocis-pkg => pkg}/registry/registry.go (97%) rename {ocis-pkg => pkg}/registry/service.go (100%) rename {ocis-pkg => pkg}/roles/manager.go (98%) rename {ocis-pkg => pkg}/roles/option.go (94%) rename {ocis-pkg => pkg}/roles/util.go (89%) rename {ocis-pkg => pkg}/runner/grouprunner.go (100%) rename {ocis-pkg => pkg}/runner/grouprunner_test.go (99%) rename {ocis-pkg => pkg}/runner/option.go (100%) rename {ocis-pkg => pkg}/runner/runner.go (100%) rename {ocis-pkg => pkg}/runner/runner_suite_test.go (100%) rename {ocis-pkg => pkg}/runner/runner_test.go (99%) rename {ocis-pkg => pkg}/runner/types.go (100%) rename {ocis-pkg => pkg}/service/debug/option.go (98%) rename {ocis-pkg => pkg}/service/debug/service.go (91%) rename {ocis-pkg => pkg}/service/grpc/client.go (95%) rename {ocis-pkg => pkg}/service/grpc/handler/ratelimiter/ratelimiter.go (100%) rename {ocis-pkg => pkg}/service/grpc/keepalive.go (100%) rename {ocis-pkg => pkg}/service/grpc/option.go (97%) rename {ocis-pkg => pkg}/service/grpc/service.go (95%) rename {ocis-pkg => pkg}/service/http/option.go (95%) rename {ocis-pkg => pkg}/service/http/service.go (93%) rename {ocis-pkg => pkg}/shared/errors.go (98%) rename {ocis-pkg => pkg}/shared/memlimit.go (100%) rename {ocis-pkg => pkg}/shared/reva.go (100%) rename {ocis-pkg => pkg}/shared/shared_types.go (100%) rename {ocis-pkg => pkg}/structs/structs.go (100%) rename {ocis-pkg => pkg}/structs/structs_test.go (100%) rename {ocis-pkg => pkg}/sync/cache.go (100%) rename {ocis-pkg => pkg}/sync/cache_test.go (100%) rename {ocis-pkg => pkg}/sync/mutex.go (100%) rename {ocis-pkg => pkg}/sync/mutex_test.go (100%) rename {ocis-pkg => pkg}/sync/sync.go (100%) rename {ocis-pkg => pkg}/tools/tools.go (100%) rename {ocis-pkg => pkg}/tracing/config.go (100%) rename {ocis-pkg => pkg}/tracing/tracing.go (100%) rename {ocis-pkg => pkg}/tracing/tracing_test.go (100%) rename {ocis-pkg => pkg}/version/version.go (100%) rename {ocis-pkg => pkg}/x/io/fsx/fallback.go (100%) rename {ocis-pkg => pkg}/x/io/fsx/fallback_test.go (97%) rename {ocis-pkg => pkg}/x/io/fsx/fsx.go (100%) rename {ocis-pkg => pkg}/x/io/fsx/fsx_test.go (96%) rename {ocis-pkg => pkg}/x/path/filepathx/path.go (100%) rename {ocis-pkg => pkg}/x/path/filepathx/path_test.go (94%) diff --git a/docs/helpers/markdowncreation.go b/docs/helpers/markdowncreation.go index c77f373b15..87aace4831 100644 --- a/docs/helpers/markdowncreation.go +++ b/docs/helpers/markdowncreation.go @@ -10,7 +10,7 @@ import ( "text/template" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/markdown" + "github.com/opencloud-eu/opencloud/pkg/markdown" ) var _configMarkdown = `{{< include file="services/_includes/%s-config-example.yaml" language="yaml" >}} diff --git a/opencloud/pkg/command/backup.go b/opencloud/pkg/command/backup.go index cb5cfa8e0c..a29e52234b 100644 --- a/opencloud/pkg/command/backup.go +++ b/opencloud/pkg/command/backup.go @@ -6,11 +6,11 @@ import ( ocisbs "github.com/cs3org/reva/v2/pkg/storage/fs/ocis/blobstore" s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/opencloud/pkg/backup" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" + "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/parser" "github.com/urfave/cli/v2" ) diff --git a/opencloud/pkg/command/benchmark.go b/opencloud/pkg/command/benchmark.go index 233dcf85be..954e6f4b59 100644 --- a/opencloud/pkg/command/benchmark.go +++ b/opencloud/pkg/command/benchmark.go @@ -15,9 +15,9 @@ import ( "time" tw "github.com/olekukonko/tablewriter" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" + "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/pkg/xattr" "github.com/rogpeppe/go-internal/lockedfile" "github.com/urfave/cli/v2" diff --git a/opencloud/pkg/command/decomposedfs.go b/opencloud/pkg/command/decomposedfs.go index 7b344a0a99..b9f60d7da0 100644 --- a/opencloud/pkg/command/decomposedfs.go +++ b/opencloud/pkg/command/decomposedfs.go @@ -22,8 +22,8 @@ import ( "github.com/cs3org/reva/v2/pkg/storage/utils/decomposedfs/tree" "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/store" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" + "github.com/opencloud-eu/opencloud/pkg/config" "github.com/rs/zerolog" "github.com/urfave/cli/v2" ) diff --git a/opencloud/pkg/command/init.go b/opencloud/pkg/command/init.go index f711a4d953..adafaea3b5 100644 --- a/opencloud/pkg/command/init.go +++ b/opencloud/pkg/command/init.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" ocisinit "github.com/opencloud-eu/opencloud/opencloud/pkg/init" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" + "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" cli "github.com/urfave/cli/v2" ) diff --git a/opencloud/pkg/command/list.go b/opencloud/pkg/command/list.go index 72d0fd706d..08d29bf5be 100644 --- a/opencloud/pkg/command/list.go +++ b/opencloud/pkg/command/list.go @@ -6,8 +6,8 @@ import ( "net" "net/rpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" + "github.com/opencloud-eu/opencloud/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/opencloud/pkg/command/migrate.go b/opencloud/pkg/command/migrate.go index 2fbf1bfca7..cd8a897fb3 100644 --- a/opencloud/pkg/command/migrate.go +++ b/opencloud/pkg/command/migrate.go @@ -30,12 +30,12 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser" - oclog "github.com/opencloud-eu/opencloud/ocis-pkg/log" - mregistry "github.com/opencloud-eu/opencloud/ocis-pkg/registry" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" + "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/parser" + oclog "github.com/opencloud-eu/opencloud/pkg/log" + mregistry "github.com/opencloud-eu/opencloud/pkg/registry" sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" sharingparser "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/parser" "github.com/urfave/cli/v2" diff --git a/opencloud/pkg/command/revisions.go b/opencloud/pkg/command/revisions.go index 9de667aab6..66f6b43830 100644 --- a/opencloud/pkg/command/revisions.go +++ b/opencloud/pkg/command/revisions.go @@ -10,11 +10,11 @@ import ( "github.com/cs3org/reva/v2/pkg/storage/fs/posix/lookup" s3bs "github.com/cs3org/reva/v2/pkg/storage/fs/s3ng/blobstore" "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" "github.com/opencloud-eu/opencloud/opencloud/pkg/revisions" + "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/parser" "github.com/urfave/cli/v2" ) diff --git a/opencloud/pkg/command/root.go b/opencloud/pkg/command/root.go index 4e195ce29c..a5091359f5 100644 --- a/opencloud/pkg/command/root.go +++ b/opencloud/pkg/command/root.go @@ -6,9 +6,9 @@ import ( "os/signal" "syscall" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" + "github.com/opencloud-eu/opencloud/pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/opencloud/pkg/command/server.go b/opencloud/pkg/command/server.go index b5ca3da3eb..8ed88f065f 100644 --- a/opencloud/pkg/command/server.go +++ b/opencloud/pkg/command/server.go @@ -1,11 +1,11 @@ package command import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" "github.com/opencloud-eu/opencloud/opencloud/pkg/runtime" + "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/parser" "github.com/urfave/cli/v2" ) diff --git a/opencloud/pkg/command/services.go b/opencloud/pkg/command/services.go index 141f9da80c..e87548979c 100644 --- a/opencloud/pkg/command/services.go +++ b/opencloud/pkg/command/services.go @@ -3,11 +3,11 @@ package command import ( "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/opencloud/pkg/command/helper" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" + "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/parser" activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/command" antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/command" appprovider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/command" diff --git a/opencloud/pkg/command/shares.go b/opencloud/pkg/command/shares.go index 124181a510..498a595f58 100644 --- a/opencloud/pkg/command/shares.go +++ b/opencloud/pkg/command/shares.go @@ -11,11 +11,11 @@ import ( "github.com/cs3org/reva/v2/pkg/share/manager/registry" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser" - mregistry "github.com/opencloud-eu/opencloud/ocis-pkg/registry" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" + "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/parser" + mregistry "github.com/opencloud-eu/opencloud/pkg/registry" sharingparser "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/parser" ) diff --git a/opencloud/pkg/command/trash.go b/opencloud/pkg/command/trash.go index 586f136597..251629c574 100644 --- a/opencloud/pkg/command/trash.go +++ b/opencloud/pkg/command/trash.go @@ -5,10 +5,10 @@ import ( "github.com/opencloud-eu/opencloud/opencloud/pkg/trash" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/parser" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" + "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/parser" "github.com/urfave/cli/v2" ) diff --git a/opencloud/pkg/command/version.go b/opencloud/pkg/command/version.go index 8e2511a501..3c8ac1de2a 100644 --- a/opencloud/pkg/command/version.go +++ b/opencloud/pkg/command/version.go @@ -8,10 +8,10 @@ import ( "github.com/urfave/cli/v2" mreg "go-micro.dev/v4/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" "github.com/opencloud-eu/opencloud/opencloud/pkg/register" + "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" ) const ( diff --git a/opencloud/pkg/init/init.go b/opencloud/pkg/init/init.go index 1221a2d41b..b8315901e1 100644 --- a/opencloud/pkg/init/init.go +++ b/opencloud/pkg/init/init.go @@ -6,7 +6,7 @@ import ( "path" "github.com/gofrs/uuid" - "github.com/opencloud-eu/opencloud/ocis-pkg/generators" + "github.com/opencloud-eu/opencloud/pkg/generators" "gopkg.in/yaml.v2" ) diff --git a/opencloud/pkg/register/command.go b/opencloud/pkg/register/command.go index 7b17201435..e65745aa4a 100644 --- a/opencloud/pkg/register/command.go +++ b/opencloud/pkg/register/command.go @@ -1,7 +1,7 @@ package register import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/opencloud/pkg/runtime/options.go b/opencloud/pkg/runtime/options.go index bbe8b12e9e..cfebd47f94 100644 --- a/opencloud/pkg/runtime/options.go +++ b/opencloud/pkg/runtime/options.go @@ -1,7 +1,7 @@ package runtime import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/urfave/cli/v2" ) diff --git a/opencloud/pkg/runtime/runtime.go b/opencloud/pkg/runtime/runtime.go index 8f2ef64ccb..dca58bd583 100644 --- a/opencloud/pkg/runtime/runtime.go +++ b/opencloud/pkg/runtime/runtime.go @@ -3,8 +3,8 @@ package runtime import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" "github.com/opencloud-eu/opencloud/opencloud/pkg/runtime/service" + "github.com/opencloud-eu/opencloud/pkg/config" ) // Runtime represents an oCIS runtime environment. diff --git a/opencloud/pkg/runtime/service/option.go b/opencloud/pkg/runtime/service/option.go index 44d300247c..c6cf0a9985 100644 --- a/opencloud/pkg/runtime/service/option.go +++ b/opencloud/pkg/runtime/service/option.go @@ -1,7 +1,7 @@ package service import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config" ) // Log configures a structure logger. diff --git a/opencloud/pkg/runtime/service/service.go b/opencloud/pkg/runtime/service/service.go index 5e0e4aa7ab..4569c0308c 100644 --- a/opencloud/pkg/runtime/service/service.go +++ b/opencloud/pkg/runtime/service/service.go @@ -22,10 +22,10 @@ import ( notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/command" "github.com/thejerf/suture/v4" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/log" + ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/shared" activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/command" antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/command" appProvider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/command" diff --git a/opencloud/pkg/runtime/service/sutureservice.go b/opencloud/pkg/runtime/service/sutureservice.go index 822f3d159e..15700e6e72 100644 --- a/opencloud/pkg/runtime/service/sutureservice.go +++ b/opencloud/pkg/runtime/service/sutureservice.go @@ -3,7 +3,7 @@ package service import ( "context" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/thejerf/suture/v4" ) diff --git a/ocis-pkg/.gitignore b/pkg/.gitignore similarity index 100% rename from ocis-pkg/.gitignore rename to pkg/.gitignore diff --git a/ocis-pkg/.mockery.yaml b/pkg/.mockery.yaml similarity index 100% rename from ocis-pkg/.mockery.yaml rename to pkg/.mockery.yaml diff --git a/ocis-pkg/Makefile b/pkg/Makefile similarity index 100% rename from ocis-pkg/Makefile rename to pkg/Makefile diff --git a/ocis-pkg/account/option.go b/pkg/account/option.go similarity index 92% rename from ocis-pkg/account/option.go rename to pkg/account/option.go index dff192ccfd..c9f7be3ef8 100644 --- a/ocis-pkg/account/option.go +++ b/pkg/account/option.go @@ -1,7 +1,7 @@ package account import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/ast/ast.go b/pkg/ast/ast.go similarity index 100% rename from ocis-pkg/ast/ast.go rename to pkg/ast/ast.go diff --git a/ocis-pkg/ast/test/test.go b/pkg/ast/test/test.go similarity index 93% rename from ocis-pkg/ast/test/test.go rename to pkg/ast/test/test.go index 4f9644ba06..f7613edb6a 100644 --- a/ocis-pkg/ast/test/test.go +++ b/pkg/ast/test/test.go @@ -4,7 +4,7 @@ package test import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/ast" ) // DiffAst returns a human-readable report of the differences between two values diff --git a/ocis-pkg/broker/noop.go b/pkg/broker/noop.go similarity index 100% rename from ocis-pkg/broker/noop.go rename to pkg/broker/noop.go diff --git a/ocis-pkg/capabilities/defaults.go b/pkg/capabilities/defaults.go similarity index 100% rename from ocis-pkg/capabilities/defaults.go rename to pkg/capabilities/defaults.go diff --git a/ocis-pkg/checks/checkgrpc.go b/pkg/checks/checkgrpc.go similarity index 91% rename from ocis-pkg/checks/checkgrpc.go rename to pkg/checks/checkgrpc.go index 6af211de6a..c67c6f7853 100644 --- a/ocis-pkg/checks/checkgrpc.go +++ b/pkg/checks/checkgrpc.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/handlers" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/ocis-pkg/checks/checkhttp.go b/pkg/checks/checkhttp.go similarity index 92% rename from ocis-pkg/checks/checkhttp.go rename to pkg/checks/checkhttp.go index 8d34747189..d40e272d9c 100644 --- a/ocis-pkg/checks/checkhttp.go +++ b/pkg/checks/checkhttp.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/handlers" ) // NewHTTPCheck checks the reachability of a http server. diff --git a/ocis-pkg/checks/checknats.go b/pkg/checks/checknats.go similarity index 100% rename from ocis-pkg/checks/checknats.go rename to pkg/checks/checknats.go diff --git a/ocis-pkg/checks/checktcp.go b/pkg/checks/checktcp.go similarity index 89% rename from ocis-pkg/checks/checktcp.go rename to pkg/checks/checktcp.go index 939cde157b..1bff842bd3 100644 --- a/ocis-pkg/checks/checktcp.go +++ b/pkg/checks/checktcp.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/handlers" ) // NewTCPCheck returns a check that connects to a given tcp endpoint. diff --git a/ocis-pkg/clihelper/app.go b/pkg/clihelper/app.go similarity index 88% rename from ocis-pkg/clihelper/app.go rename to pkg/clihelper/app.go index 135b2648a6..c706b1d140 100644 --- a/ocis-pkg/clihelper/app.go +++ b/pkg/clihelper/app.go @@ -1,7 +1,7 @@ package clihelper import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/urfave/cli/v2" ) diff --git a/ocis-pkg/config/config.go b/pkg/config/config.go similarity index 99% rename from ocis-pkg/config/config.go rename to pkg/config/config.go index 19c5d34d73..5659d623f5 100644 --- a/ocis-pkg/config/config.go +++ b/pkg/config/config.go @@ -1,7 +1,7 @@ package config import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" appProvider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" diff --git a/ocis-pkg/config/config_suite_test.go b/pkg/config/config_suite_test.go similarity index 100% rename from ocis-pkg/config/config_suite_test.go rename to pkg/config/config_suite_test.go diff --git a/ocis-pkg/config/config_test.go b/pkg/config/config_test.go similarity index 84% rename from ocis-pkg/config/config_test.go rename to pkg/config/config_test.go index 9da021fc06..a03d97b86c 100644 --- a/ocis-pkg/config/config_test.go +++ b/pkg/config/config_test.go @@ -3,7 +3,7 @@ package config_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config" "gopkg.in/yaml.v2" ) diff --git a/ocis-pkg/config/configlog/log.go b/pkg/config/configlog/log.go similarity index 100% rename from ocis-pkg/config/configlog/log.go rename to pkg/config/configlog/log.go diff --git a/ocis-pkg/config/defaultconfig.go b/pkg/config/defaultconfig.go similarity index 99% rename from ocis-pkg/config/defaultconfig.go rename to pkg/config/defaultconfig.go index b532571e64..33d049f72e 100644 --- a/ocis-pkg/config/defaultconfig.go +++ b/pkg/config/defaultconfig.go @@ -1,7 +1,7 @@ package config import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" activitylog "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults" antivirus "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/defaults" appProvider "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/defaults" diff --git a/ocis-pkg/config/defaults/paths.go b/pkg/config/defaults/paths.go similarity index 100% rename from ocis-pkg/config/defaults/paths.go rename to pkg/config/defaults/paths.go diff --git a/ocis-pkg/config/envdecode/LICENSE b/pkg/config/envdecode/LICENSE similarity index 100% rename from ocis-pkg/config/envdecode/LICENSE rename to pkg/config/envdecode/LICENSE diff --git a/ocis-pkg/config/envdecode/README.md b/pkg/config/envdecode/README.md similarity index 100% rename from ocis-pkg/config/envdecode/README.md rename to pkg/config/envdecode/README.md diff --git a/ocis-pkg/config/envdecode/envdecode.go b/pkg/config/envdecode/envdecode.go similarity index 100% rename from ocis-pkg/config/envdecode/envdecode.go rename to pkg/config/envdecode/envdecode.go diff --git a/ocis-pkg/config/envdecode/envdecode_test.go b/pkg/config/envdecode/envdecode_test.go similarity index 100% rename from ocis-pkg/config/envdecode/envdecode_test.go rename to pkg/config/envdecode/envdecode_test.go diff --git a/ocis-pkg/config/helpers.go b/pkg/config/helpers.go similarity index 96% rename from ocis-pkg/config/helpers.go rename to pkg/config/helpers.go index 249ce0fd86..4ff7d2da42 100644 --- a/ocis-pkg/config/helpers.go +++ b/pkg/config/helpers.go @@ -8,7 +8,7 @@ import ( gofig "github.com/gookit/config/v2" gooyaml "github.com/gookit/config/v2/yaml" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" ) var ( diff --git a/ocis-pkg/config/helpers_test.go b/pkg/config/helpers_test.go similarity index 100% rename from ocis-pkg/config/helpers_test.go rename to pkg/config/helpers_test.go diff --git a/ocis-pkg/config/parser/parse.go b/pkg/config/parser/parse.go similarity index 93% rename from ocis-pkg/config/parser/parse.go rename to pkg/config/parser/parse.go index b6ac7b61f4..bd68b12980 100644 --- a/ocis-pkg/config/parser/parse.go +++ b/pkg/config/parser/parse.go @@ -3,10 +3,10 @@ package parser import ( "errors" - "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" ) // ParseConfig loads the ocis configuration and diff --git a/ocis-pkg/conversions/ptr.go b/pkg/conversions/ptr.go similarity index 100% rename from ocis-pkg/conversions/ptr.go rename to pkg/conversions/ptr.go diff --git a/ocis-pkg/conversions/ptr_test.go b/pkg/conversions/ptr_test.go similarity index 99% rename from ocis-pkg/conversions/ptr_test.go rename to pkg/conversions/ptr_test.go index 26a710da17..34d6932eee 100644 --- a/ocis-pkg/conversions/ptr_test.go +++ b/pkg/conversions/ptr_test.go @@ -6,7 +6,7 @@ import ( libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" + "github.com/opencloud-eu/opencloud/pkg/conversions" ) func checkIdentical[T any](t *testing.T, p T, want string) { diff --git a/ocis-pkg/conversions/strings.go b/pkg/conversions/strings.go similarity index 100% rename from ocis-pkg/conversions/strings.go rename to pkg/conversions/strings.go diff --git a/ocis-pkg/conversions/strings_test.go b/pkg/conversions/strings_test.go similarity index 100% rename from ocis-pkg/conversions/strings_test.go rename to pkg/conversions/strings_test.go diff --git a/ocis-pkg/cors/option.go b/pkg/cors/option.go similarity index 97% rename from ocis-pkg/cors/option.go rename to pkg/cors/option.go index 5a12e82875..522708ecde 100644 --- a/ocis-pkg/cors/option.go +++ b/pkg/cors/option.go @@ -1,7 +1,7 @@ package cors import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/crypto/crypto.go b/pkg/crypto/crypto.go similarity index 100% rename from ocis-pkg/crypto/crypto.go rename to pkg/crypto/crypto.go diff --git a/ocis-pkg/crypto/crypto_suite_test.go b/pkg/crypto/crypto_suite_test.go similarity index 100% rename from ocis-pkg/crypto/crypto_suite_test.go rename to pkg/crypto/crypto_suite_test.go diff --git a/ocis-pkg/crypto/crypto_test.go b/pkg/crypto/crypto_test.go similarity index 94% rename from ocis-pkg/crypto/crypto_test.go rename to pkg/crypto/crypto_test.go index 3feb977430..fe5aaead9f 100644 --- a/ocis-pkg/crypto/crypto_test.go +++ b/pkg/crypto/crypto_test.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "github.com/opencloud-eu/opencloud/ocis-pkg/crypto" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/crypto" + "github.com/opencloud-eu/opencloud/pkg/log" . "github.com/onsi/ginkgo/v2" - cfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + cfg "github.com/opencloud-eu/opencloud/pkg/config" ) var _ = Describe("Crypto", func() { diff --git a/ocis-pkg/crypto/gencert.go b/pkg/crypto/gencert.go similarity index 98% rename from ocis-pkg/crypto/gencert.go rename to pkg/crypto/gencert.go index 29703ae88d..46a5d91ee3 100644 --- a/ocis-pkg/crypto/gencert.go +++ b/pkg/crypto/gencert.go @@ -12,7 +12,7 @@ import ( "os" "path/filepath" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" mtls "go-micro.dev/v4/util/tls" ) diff --git a/ocis-pkg/crypto/gencert_test.go b/pkg/crypto/gencert_test.go similarity index 98% rename from ocis-pkg/crypto/gencert_test.go rename to pkg/crypto/gencert_test.go index 62683d87b1..57abc308e5 100644 --- a/ocis-pkg/crypto/gencert_test.go +++ b/pkg/crypto/gencert_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) func TestEnsureExistsDir(t *testing.T) { diff --git a/ocis-pkg/crypto/templates.go b/pkg/crypto/templates.go similarity index 100% rename from ocis-pkg/crypto/templates.go rename to pkg/crypto/templates.go diff --git a/ocis-pkg/flags/overrides.go b/pkg/flags/overrides.go similarity index 100% rename from ocis-pkg/flags/overrides.go rename to pkg/flags/overrides.go diff --git a/ocis-pkg/generators/password.go b/pkg/generators/password.go similarity index 100% rename from ocis-pkg/generators/password.go rename to pkg/generators/password.go diff --git a/ocis-pkg/handlers/checker.go b/pkg/handlers/checker.go similarity index 98% rename from ocis-pkg/handlers/checker.go rename to pkg/handlers/checker.go index 3484c16ca8..b7319ffbf0 100644 --- a/ocis-pkg/handlers/checker.go +++ b/pkg/handlers/checker.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "golang.org/x/sync/errgroup" ) diff --git a/ocis-pkg/handlers/checker_test.go b/pkg/handlers/checker_test.go similarity index 97% rename from ocis-pkg/handlers/checker_test.go rename to pkg/handlers/checker_test.go index d9b7390a86..73065b3b97 100644 --- a/ocis-pkg/handlers/checker_test.go +++ b/pkg/handlers/checker_test.go @@ -12,8 +12,8 @@ import ( "github.com/test-go/testify/require" "github.com/tidwall/gjson" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/log" ) func TestCheckHandlerConfiguration(t *testing.T) { diff --git a/ocis-pkg/keycloak/client.go b/pkg/keycloak/client.go similarity index 100% rename from ocis-pkg/keycloak/client.go rename to pkg/keycloak/client.go diff --git a/ocis-pkg/keycloak/gocloak.go b/pkg/keycloak/gocloak.go similarity index 100% rename from ocis-pkg/keycloak/gocloak.go rename to pkg/keycloak/gocloak.go diff --git a/ocis-pkg/keycloak/types.go b/pkg/keycloak/types.go similarity index 100% rename from ocis-pkg/keycloak/types.go rename to pkg/keycloak/types.go diff --git a/ocis-pkg/kql/cast.go b/pkg/kql/cast.go similarity index 98% rename from ocis-pkg/kql/cast.go rename to pkg/kql/cast.go index ef0d82b619..b3d23fc344 100644 --- a/ocis-pkg/kql/cast.go +++ b/pkg/kql/cast.go @@ -5,7 +5,7 @@ import ( "time" "github.com/jinzhu/now" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/ast" "github.com/opencloud-eu/opencloud/services/search/pkg/query" ) diff --git a/ocis-pkg/kql/connect.go b/pkg/kql/connect.go similarity index 98% rename from ocis-pkg/kql/connect.go rename to pkg/kql/connect.go index 7a1e398e38..1d10e6d464 100644 --- a/ocis-pkg/kql/connect.go +++ b/pkg/kql/connect.go @@ -3,7 +3,7 @@ package kql import ( "strings" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/ast" ) // connectNodes connects given nodes diff --git a/ocis-pkg/kql/dictionary.peg b/pkg/kql/dictionary.peg similarity index 100% rename from ocis-pkg/kql/dictionary.peg rename to pkg/kql/dictionary.peg diff --git a/ocis-pkg/kql/dictionary_gen.go b/pkg/kql/dictionary_gen.go similarity index 100% rename from ocis-pkg/kql/dictionary_gen.go rename to pkg/kql/dictionary_gen.go diff --git a/ocis-pkg/kql/dictionary_test.go b/pkg/kql/dictionary_test.go similarity index 99% rename from ocis-pkg/kql/dictionary_test.go rename to pkg/kql/dictionary_test.go index 857fd89efa..169bd823d3 100644 --- a/ocis-pkg/kql/dictionary_test.go +++ b/pkg/kql/dictionary_test.go @@ -6,9 +6,9 @@ import ( "time" "github.com/jinzhu/now" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast/test" - "github.com/opencloud-eu/opencloud/ocis-pkg/kql" + "github.com/opencloud-eu/opencloud/pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/ast/test" + "github.com/opencloud-eu/opencloud/pkg/kql" "github.com/opencloud-eu/opencloud/services/search/pkg/query" tAssert "github.com/stretchr/testify/assert" ) diff --git a/ocis-pkg/kql/doc.go b/pkg/kql/doc.go similarity index 100% rename from ocis-pkg/kql/doc.go rename to pkg/kql/doc.go diff --git a/ocis-pkg/kql/engine_suite_test.go b/pkg/kql/engine_suite_test.go similarity index 100% rename from ocis-pkg/kql/engine_suite_test.go rename to pkg/kql/engine_suite_test.go diff --git a/ocis-pkg/kql/factory.go b/pkg/kql/factory.go similarity index 98% rename from ocis-pkg/kql/factory.go rename to pkg/kql/factory.go index 3e76a1443b..9a44cf5e61 100644 --- a/ocis-pkg/kql/factory.go +++ b/pkg/kql/factory.go @@ -3,7 +3,7 @@ package kql import ( "strings" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/ast" ) func base(text []byte, pos position) (*ast.Base, error) { diff --git a/ocis-pkg/kql/gen.go b/pkg/kql/gen.go similarity index 100% rename from ocis-pkg/kql/gen.go rename to pkg/kql/gen.go diff --git a/ocis-pkg/kql/kql.go b/pkg/kql/kql.go similarity index 95% rename from ocis-pkg/kql/kql.go rename to pkg/kql/kql.go index a39dc86735..4cba6c7b91 100644 --- a/ocis-pkg/kql/kql.go +++ b/pkg/kql/kql.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/ast" ) // The operator node value definition diff --git a/ocis-pkg/kql/kql_test.go b/pkg/kql/kql_test.go similarity index 90% rename from ocis-pkg/kql/kql_test.go rename to pkg/kql/kql_test.go index d6b03aa1cc..c92d6a780a 100644 --- a/ocis-pkg/kql/kql_test.go +++ b/pkg/kql/kql_test.go @@ -3,8 +3,8 @@ package kql_test import ( "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" - "github.com/opencloud-eu/opencloud/ocis-pkg/kql" + "github.com/opencloud-eu/opencloud/pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/kql" "github.com/opencloud-eu/opencloud/services/search/pkg/query" tAssert "github.com/stretchr/testify/assert" ) diff --git a/ocis-pkg/kql/validate.go b/pkg/kql/validate.go similarity index 93% rename from ocis-pkg/kql/validate.go rename to pkg/kql/validate.go index 8adc31827a..56bf681887 100644 --- a/ocis-pkg/kql/validate.go +++ b/pkg/kql/validate.go @@ -1,7 +1,7 @@ package kql import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/ast" "github.com/opencloud-eu/opencloud/services/search/pkg/query" ) diff --git a/ocis-pkg/l10n/l10n.go b/pkg/l10n/l10n.go similarity index 99% rename from ocis-pkg/l10n/l10n.go rename to pkg/l10n/l10n.go index 54acfab828..8e4528b7cb 100644 --- a/ocis-pkg/l10n/l10n.go +++ b/pkg/l10n/l10n.go @@ -9,7 +9,7 @@ import ( "reflect" "github.com/leonelquinteros/gotext" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/middleware" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" micrometadata "go-micro.dev/v4/metadata" ) diff --git a/ocis-pkg/l10n/l10n_test.go b/pkg/l10n/l10n_test.go similarity index 100% rename from ocis-pkg/l10n/l10n_test.go rename to pkg/l10n/l10n_test.go diff --git a/ocis-pkg/ldap/ldap.go b/pkg/ldap/ldap.go similarity index 95% rename from ocis-pkg/ldap/ldap.go rename to pkg/ldap/ldap.go index 3fe82a9f98..b14aaaad85 100644 --- a/ocis-pkg/ldap/ldap.go +++ b/pkg/ldap/ldap.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) const ( diff --git a/ocis-pkg/ldap/ldap_suite_test.go b/pkg/ldap/ldap_suite_test.go similarity index 100% rename from ocis-pkg/ldap/ldap_suite_test.go rename to pkg/ldap/ldap_suite_test.go diff --git a/ocis-pkg/log/log.go b/pkg/log/log.go similarity index 100% rename from ocis-pkg/log/log.go rename to pkg/log/log.go diff --git a/ocis-pkg/log/log_test.go b/pkg/log/log_test.go similarity index 90% rename from ocis-pkg/log/log_test.go rename to pkg/log/log_test.go index 9607e3dcdd..7dd969512b 100644 --- a/ocis-pkg/log/log_test.go +++ b/pkg/log/log_test.go @@ -6,7 +6,7 @@ import ( "github.com/onsi/gomega" "github.com/opencloud-eu/opencloud/internal/testenv" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) func TestDeprecation(t *testing.T) { diff --git a/ocis-pkg/log/logrus_wrapper.go b/pkg/log/logrus_wrapper.go similarity index 100% rename from ocis-pkg/log/logrus_wrapper.go rename to pkg/log/logrus_wrapper.go diff --git a/ocis-pkg/log/option.go b/pkg/log/option.go similarity index 100% rename from ocis-pkg/log/option.go rename to pkg/log/option.go diff --git a/ocis-pkg/markdown/markdown.go b/pkg/markdown/markdown.go similarity index 100% rename from ocis-pkg/markdown/markdown.go rename to pkg/markdown/markdown.go diff --git a/ocis-pkg/markdown/markdown_suite_test.go b/pkg/markdown/markdown_suite_test.go similarity index 100% rename from ocis-pkg/markdown/markdown_suite_test.go rename to pkg/markdown/markdown_suite_test.go diff --git a/ocis-pkg/markdown/markdown_test.go b/pkg/markdown/markdown_test.go similarity index 100% rename from ocis-pkg/markdown/markdown_test.go rename to pkg/markdown/markdown_test.go diff --git a/ocis-pkg/middleware/account.go b/pkg/middleware/account.go similarity index 97% rename from ocis-pkg/middleware/account.go rename to pkg/middleware/account.go index 908095a6f7..438a26fdcb 100644 --- a/ocis-pkg/middleware/account.go +++ b/pkg/middleware/account.go @@ -8,7 +8,7 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/token/manager/jwt" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" + "github.com/opencloud-eu/opencloud/pkg/account" "go-micro.dev/v4/metadata" ) diff --git a/ocis-pkg/middleware/header.go b/pkg/middleware/header.go similarity index 96% rename from ocis-pkg/middleware/header.go rename to pkg/middleware/header.go index de11d26a08..0f50a4e413 100644 --- a/ocis-pkg/middleware/header.go +++ b/pkg/middleware/header.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/cors" rscors "github.com/rs/cors" ) diff --git a/ocis-pkg/middleware/logger.go b/pkg/middleware/logger.go similarity index 94% rename from ocis-pkg/middleware/logger.go rename to pkg/middleware/logger.go index 4dde0f897e..3762214b97 100644 --- a/ocis-pkg/middleware/logger.go +++ b/pkg/middleware/logger.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-chi/chi/v5/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // Logger is a middleware to log http requests. It uses debug level logging and should be used by all services save the proxy (which uses info level logging). diff --git a/ocis-pkg/middleware/oidc.go b/pkg/middleware/oidc.go similarity index 98% rename from ocis-pkg/middleware/oidc.go rename to pkg/middleware/oidc.go index 3eb7954d05..627c27586e 100644 --- a/ocis-pkg/middleware/oidc.go +++ b/pkg/middleware/oidc.go @@ -7,7 +7,7 @@ import ( "sync" goidc "github.com/coreos/go-oidc/v3/oidc" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/oidc" "golang.org/x/oauth2" ) diff --git a/ocis-pkg/middleware/options.go b/pkg/middleware/options.go similarity index 96% rename from ocis-pkg/middleware/options.go rename to pkg/middleware/options.go index 01e6b3d2ee..90300d99a1 100644 --- a/ocis-pkg/middleware/options.go +++ b/pkg/middleware/options.go @@ -4,7 +4,7 @@ import ( "net/http" gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/middleware/static.go b/pkg/middleware/static.go similarity index 100% rename from ocis-pkg/middleware/static.go rename to pkg/middleware/static.go diff --git a/ocis-pkg/middleware/throttle.go b/pkg/middleware/throttle.go similarity index 100% rename from ocis-pkg/middleware/throttle.go rename to pkg/middleware/throttle.go diff --git a/ocis-pkg/middleware/tracing.go b/pkg/middleware/tracing.go similarity index 100% rename from ocis-pkg/middleware/tracing.go rename to pkg/middleware/tracing.go diff --git a/ocis-pkg/middleware/version.go b/pkg/middleware/version.go similarity index 100% rename from ocis-pkg/middleware/version.go rename to pkg/middleware/version.go diff --git a/ocis-pkg/natsjsregistry/options.go b/pkg/natsjsregistry/options.go similarity index 100% rename from ocis-pkg/natsjsregistry/options.go rename to pkg/natsjsregistry/options.go diff --git a/ocis-pkg/natsjsregistry/registry.go b/pkg/natsjsregistry/registry.go similarity index 100% rename from ocis-pkg/natsjsregistry/registry.go rename to pkg/natsjsregistry/registry.go diff --git a/ocis-pkg/natsjsregistry/watcher.go b/pkg/natsjsregistry/watcher.go similarity index 100% rename from ocis-pkg/natsjsregistry/watcher.go rename to pkg/natsjsregistry/watcher.go diff --git a/ocis-pkg/oidc/claims.go b/pkg/oidc/claims.go similarity index 100% rename from ocis-pkg/oidc/claims.go rename to pkg/oidc/claims.go diff --git a/ocis-pkg/oidc/claims_test.go b/pkg/oidc/claims_test.go similarity index 98% rename from ocis-pkg/oidc/claims_test.go rename to pkg/oidc/claims_test.go index 45a68f347f..3958fe83e2 100644 --- a/ocis-pkg/oidc/claims_test.go +++ b/pkg/oidc/claims_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/oidc" ) type splitWithEscapingTest struct { diff --git a/ocis-pkg/oidc/client.go b/pkg/oidc/client.go similarity index 99% rename from ocis-pkg/oidc/client.go rename to pkg/oidc/client.go index faa299743b..1e0be414db 100644 --- a/ocis-pkg/oidc/client.go +++ b/pkg/oidc/client.go @@ -16,7 +16,7 @@ import ( "github.com/MicahParks/keyfunc/v2" goidc "github.com/coreos/go-oidc/v3/oidc" "github.com/golang-jwt/jwt/v5" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "golang.org/x/oauth2" ) diff --git a/ocis-pkg/oidc/client_test.go b/pkg/oidc/client_test.go similarity index 98% rename from ocis-pkg/oidc/client_test.go rename to pkg/oidc/client_test.go index 22f8794d7d..16702a5816 100644 --- a/ocis-pkg/oidc/client_test.go +++ b/pkg/oidc/client_test.go @@ -8,7 +8,7 @@ import ( "github.com/MicahParks/keyfunc/v2" "github.com/golang-jwt/jwt/v5" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/oidc" ) type signingKey struct { diff --git a/ocis-pkg/oidc/context.go b/pkg/oidc/context.go similarity index 100% rename from ocis-pkg/oidc/context.go rename to pkg/oidc/context.go diff --git a/ocis-pkg/oidc/jose.go b/pkg/oidc/jose.go similarity index 100% rename from ocis-pkg/oidc/jose.go rename to pkg/oidc/jose.go diff --git a/ocis-pkg/oidc/metadata.go b/pkg/oidc/metadata.go similarity index 98% rename from ocis-pkg/oidc/metadata.go rename to pkg/oidc/metadata.go index b95a95edd6..002d0c32ee 100644 --- a/ocis-pkg/oidc/metadata.go +++ b/pkg/oidc/metadata.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/golang-jwt/jwt/v5" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) const wellknownPath = "/.well-known/openid-configuration" diff --git a/ocis-pkg/oidc/mocks/oidc_client.go b/pkg/oidc/mocks/oidc_client.go similarity index 99% rename from ocis-pkg/oidc/mocks/oidc_client.go rename to pkg/oidc/mocks/oidc_client.go index c27eb7dd7d..a4b073be25 100644 --- a/ocis-pkg/oidc/mocks/oidc_client.go +++ b/pkg/oidc/mocks/oidc_client.go @@ -10,7 +10,7 @@ import ( oauth2 "golang.org/x/oauth2" - oidc "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + oidc "github.com/opencloud-eu/opencloud/pkg/oidc" ) // OIDCClient is an autogenerated mock type for the OIDCClient type diff --git a/ocis-pkg/oidc/options.go b/pkg/oidc/options.go similarity index 98% rename from ocis-pkg/oidc/options.go rename to pkg/oidc/options.go index c76078327b..bf025e7670 100644 --- a/ocis-pkg/oidc/options.go +++ b/pkg/oidc/options.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/MicahParks/keyfunc/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" goidc "github.com/coreos/go-oidc/v3/oidc" diff --git a/ocis-pkg/registry/expiry.go b/pkg/registry/expiry.go similarity index 100% rename from ocis-pkg/registry/expiry.go rename to pkg/registry/expiry.go diff --git a/ocis-pkg/registry/register.go b/pkg/registry/register.go similarity index 97% rename from ocis-pkg/registry/register.go rename to pkg/registry/register.go index fef16c9f2b..2c84689659 100644 --- a/ocis-pkg/registry/register.go +++ b/pkg/registry/register.go @@ -7,7 +7,7 @@ import ( mRegistry "go-micro.dev/v4/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // RegisterService publishes an arbitrary endpoint to the service-registry. This allows querying nodes of diff --git a/ocis-pkg/registry/register_test.go b/pkg/registry/register_test.go similarity index 97% rename from ocis-pkg/registry/register_test.go rename to pkg/registry/register_test.go index d3ec4ca8fd..134fe8b413 100644 --- a/ocis-pkg/registry/register_test.go +++ b/pkg/registry/register_test.go @@ -6,7 +6,7 @@ package registry // "testing" // // "github.com/micro/go-micro/v2/registry" -// "github.com/opencloud-eu/opencloud/ocis-pkg/log" +// "github.com/opencloud-eu/opencloud/pkg/log" //) // //func TestRegisterGRPCEndpoint(t *testing.T) { diff --git a/ocis-pkg/registry/registry.go b/pkg/registry/registry.go similarity index 97% rename from ocis-pkg/registry/registry.go rename to pkg/registry/registry.go index 005aeaa471..cf178dc07c 100644 --- a/ocis-pkg/registry/registry.go +++ b/pkg/registry/registry.go @@ -9,7 +9,7 @@ import ( rRegistry "github.com/cs3org/reva/v2/pkg/registry" memr "github.com/go-micro/plugins/v4/registry/memory" - "github.com/opencloud-eu/opencloud/ocis-pkg/natsjsregistry" + "github.com/opencloud-eu/opencloud/pkg/natsjsregistry" mRegistry "go-micro.dev/v4/registry" "go-micro.dev/v4/registry/cache" ) diff --git a/ocis-pkg/registry/service.go b/pkg/registry/service.go similarity index 100% rename from ocis-pkg/registry/service.go rename to pkg/registry/service.go diff --git a/ocis-pkg/roles/manager.go b/pkg/roles/manager.go similarity index 98% rename from ocis-pkg/roles/manager.go rename to pkg/roles/manager.go index 10cdd7b87f..a03c5fc979 100644 --- a/ocis-pkg/roles/manager.go +++ b/pkg/roles/manager.go @@ -5,7 +5,7 @@ import ( "time" "github.com/cs3org/reva/v2/pkg/store" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" microstore "go-micro.dev/v4/store" diff --git a/ocis-pkg/roles/option.go b/pkg/roles/option.go similarity index 94% rename from ocis-pkg/roles/option.go rename to pkg/roles/option.go index d9bfc5d91b..3dfac02cd6 100644 --- a/ocis-pkg/roles/option.go +++ b/pkg/roles/option.go @@ -1,7 +1,7 @@ package roles import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "go-micro.dev/v4/store" ) diff --git a/ocis-pkg/roles/util.go b/pkg/roles/util.go similarity index 89% rename from ocis-pkg/roles/util.go rename to pkg/roles/util.go index 4c68a5c3ba..a962e37ed6 100644 --- a/ocis-pkg/roles/util.go +++ b/pkg/roles/util.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/middleware" "go-micro.dev/v4/metadata" ) diff --git a/ocis-pkg/runner/grouprunner.go b/pkg/runner/grouprunner.go similarity index 100% rename from ocis-pkg/runner/grouprunner.go rename to pkg/runner/grouprunner.go diff --git a/ocis-pkg/runner/grouprunner_test.go b/pkg/runner/grouprunner_test.go similarity index 99% rename from ocis-pkg/runner/grouprunner_test.go rename to pkg/runner/grouprunner_test.go index 16522f673f..18f76ff9d3 100644 --- a/ocis-pkg/runner/grouprunner_test.go +++ b/pkg/runner/grouprunner_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/runner" + "github.com/opencloud-eu/opencloud/pkg/runner" ) var _ = Describe("GroupRunner", func() { diff --git a/ocis-pkg/runner/option.go b/pkg/runner/option.go similarity index 100% rename from ocis-pkg/runner/option.go rename to pkg/runner/option.go diff --git a/ocis-pkg/runner/runner.go b/pkg/runner/runner.go similarity index 100% rename from ocis-pkg/runner/runner.go rename to pkg/runner/runner.go diff --git a/ocis-pkg/runner/runner_suite_test.go b/pkg/runner/runner_suite_test.go similarity index 100% rename from ocis-pkg/runner/runner_suite_test.go rename to pkg/runner/runner_suite_test.go diff --git a/ocis-pkg/runner/runner_test.go b/pkg/runner/runner_test.go similarity index 99% rename from ocis-pkg/runner/runner_test.go rename to pkg/runner/runner_test.go index 572def34ff..1a32eb44a5 100644 --- a/ocis-pkg/runner/runner_test.go +++ b/pkg/runner/runner_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/runner" + "github.com/opencloud-eu/opencloud/pkg/runner" ) // TimedTask will create a task with the specified duration diff --git a/ocis-pkg/runner/types.go b/pkg/runner/types.go similarity index 100% rename from ocis-pkg/runner/types.go rename to pkg/runner/types.go diff --git a/ocis-pkg/service/debug/option.go b/pkg/service/debug/option.go similarity index 98% rename from ocis-pkg/service/debug/option.go rename to pkg/service/debug/option.go index 23f634cb15..c2924614ac 100644 --- a/ocis-pkg/service/debug/option.go +++ b/pkg/service/debug/option.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/service/debug/service.go b/pkg/service/debug/service.go similarity index 91% rename from ocis-pkg/service/debug/service.go rename to pkg/service/debug/service.go index ccf75b70c0..0cf6b990e6 100644 --- a/ocis-pkg/service/debug/service.go +++ b/pkg/service/debug/service.go @@ -11,10 +11,10 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "go.opentelemetry.io/contrib/zpages" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/middleware" graphMiddleware "github.com/opencloud-eu/opencloud/services/graph/pkg/middleware" ) diff --git a/ocis-pkg/service/grpc/client.go b/pkg/service/grpc/client.go similarity index 95% rename from ocis-pkg/service/grpc/client.go rename to pkg/service/grpc/client.go index b62c58ba34..5db8e1b0bf 100644 --- a/ocis-pkg/service/grpc/client.go +++ b/pkg/service/grpc/client.go @@ -8,8 +8,8 @@ import ( mgrpcc "github.com/go-micro/plugins/v4/client/grpc" mtracer "github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/shared" "go-micro.dev/v4/client" "go.opentelemetry.io/otel/trace" "go.opentelemetry.io/otel/trace/noop" diff --git a/ocis-pkg/service/grpc/handler/ratelimiter/ratelimiter.go b/pkg/service/grpc/handler/ratelimiter/ratelimiter.go similarity index 100% rename from ocis-pkg/service/grpc/handler/ratelimiter/ratelimiter.go rename to pkg/service/grpc/handler/ratelimiter/ratelimiter.go diff --git a/ocis-pkg/service/grpc/keepalive.go b/pkg/service/grpc/keepalive.go similarity index 100% rename from ocis-pkg/service/grpc/keepalive.go rename to pkg/service/grpc/keepalive.go diff --git a/ocis-pkg/service/grpc/option.go b/pkg/service/grpc/option.go similarity index 97% rename from ocis-pkg/service/grpc/option.go rename to pkg/service/grpc/option.go index 333e505879..fe72cee70f 100644 --- a/ocis-pkg/service/grpc/option.go +++ b/pkg/service/grpc/option.go @@ -3,7 +3,7 @@ package grpc import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "go-micro.dev/v4/server" "go.opentelemetry.io/otel/trace" ) diff --git a/ocis-pkg/service/grpc/service.go b/pkg/service/grpc/service.go similarity index 95% rename from ocis-pkg/service/grpc/service.go rename to pkg/service/grpc/service.go index 5bd69ae452..b5f07fb558 100644 --- a/ocis-pkg/service/grpc/service.go +++ b/pkg/service/grpc/service.go @@ -18,9 +18,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" - ociscrypto "github.com/opencloud-eu/opencloud/ocis-pkg/crypto" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + ociscrypto "github.com/opencloud-eu/opencloud/pkg/crypto" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/registry" ) // Service simply wraps the go-micro grpc service. diff --git a/ocis-pkg/service/http/option.go b/pkg/service/http/option.go similarity index 95% rename from ocis-pkg/service/http/option.go rename to pkg/service/http/option.go index 8663b4e805..c495966e3c 100644 --- a/ocis-pkg/service/http/option.go +++ b/pkg/service/http/option.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/urfave/cli/v2" "go.opentelemetry.io/otel/trace" ) diff --git a/ocis-pkg/service/http/service.go b/pkg/service/http/service.go similarity index 93% rename from ocis-pkg/service/http/service.go rename to pkg/service/http/service.go index 53fb193e6d..b311cb1174 100644 --- a/ocis-pkg/service/http/service.go +++ b/pkg/service/http/service.go @@ -5,12 +5,12 @@ import ( "fmt" "strings" - "github.com/opencloud-eu/opencloud/ocis-pkg/broker" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/broker" + "github.com/opencloud-eu/opencloud/pkg/registry" mhttps "github.com/go-micro/plugins/v4/server/http" mtracer "github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry" - ociscrypto "github.com/opencloud-eu/opencloud/ocis-pkg/crypto" + ociscrypto "github.com/opencloud-eu/opencloud/pkg/crypto" "go-micro.dev/v4" "go-micro.dev/v4/server" ) diff --git a/ocis-pkg/shared/errors.go b/pkg/shared/errors.go similarity index 98% rename from ocis-pkg/shared/errors.go rename to pkg/shared/errors.go index 151c5f15c6..f21ace3911 100644 --- a/ocis-pkg/shared/errors.go +++ b/pkg/shared/errors.go @@ -3,7 +3,7 @@ package shared import ( "fmt" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" ) func MissingMachineAuthApiKeyError(service string) error { diff --git a/ocis-pkg/shared/memlimit.go b/pkg/shared/memlimit.go similarity index 100% rename from ocis-pkg/shared/memlimit.go rename to pkg/shared/memlimit.go diff --git a/ocis-pkg/shared/reva.go b/pkg/shared/reva.go similarity index 100% rename from ocis-pkg/shared/reva.go rename to pkg/shared/reva.go diff --git a/ocis-pkg/shared/shared_types.go b/pkg/shared/shared_types.go similarity index 100% rename from ocis-pkg/shared/shared_types.go rename to pkg/shared/shared_types.go diff --git a/ocis-pkg/structs/structs.go b/pkg/structs/structs.go similarity index 100% rename from ocis-pkg/structs/structs.go rename to pkg/structs/structs.go diff --git a/ocis-pkg/structs/structs_test.go b/pkg/structs/structs_test.go similarity index 100% rename from ocis-pkg/structs/structs_test.go rename to pkg/structs/structs_test.go diff --git a/ocis-pkg/sync/cache.go b/pkg/sync/cache.go similarity index 100% rename from ocis-pkg/sync/cache.go rename to pkg/sync/cache.go diff --git a/ocis-pkg/sync/cache_test.go b/pkg/sync/cache_test.go similarity index 100% rename from ocis-pkg/sync/cache_test.go rename to pkg/sync/cache_test.go diff --git a/ocis-pkg/sync/mutex.go b/pkg/sync/mutex.go similarity index 100% rename from ocis-pkg/sync/mutex.go rename to pkg/sync/mutex.go diff --git a/ocis-pkg/sync/mutex_test.go b/pkg/sync/mutex_test.go similarity index 100% rename from ocis-pkg/sync/mutex_test.go rename to pkg/sync/mutex_test.go diff --git a/ocis-pkg/sync/sync.go b/pkg/sync/sync.go similarity index 100% rename from ocis-pkg/sync/sync.go rename to pkg/sync/sync.go diff --git a/ocis-pkg/tools/tools.go b/pkg/tools/tools.go similarity index 100% rename from ocis-pkg/tools/tools.go rename to pkg/tools/tools.go diff --git a/ocis-pkg/tracing/config.go b/pkg/tracing/config.go similarity index 100% rename from ocis-pkg/tracing/config.go rename to pkg/tracing/config.go diff --git a/ocis-pkg/tracing/tracing.go b/pkg/tracing/tracing.go similarity index 100% rename from ocis-pkg/tracing/tracing.go rename to pkg/tracing/tracing.go diff --git a/ocis-pkg/tracing/tracing_test.go b/pkg/tracing/tracing_test.go similarity index 100% rename from ocis-pkg/tracing/tracing_test.go rename to pkg/tracing/tracing_test.go diff --git a/ocis-pkg/version/version.go b/pkg/version/version.go similarity index 100% rename from ocis-pkg/version/version.go rename to pkg/version/version.go diff --git a/ocis-pkg/x/io/fsx/fallback.go b/pkg/x/io/fsx/fallback.go similarity index 100% rename from ocis-pkg/x/io/fsx/fallback.go rename to pkg/x/io/fsx/fallback.go diff --git a/ocis-pkg/x/io/fsx/fallback_test.go b/pkg/x/io/fsx/fallback_test.go similarity index 97% rename from ocis-pkg/x/io/fsx/fallback_test.go rename to pkg/x/io/fsx/fallback_test.go index 8b78fb302e..99c82a5596 100644 --- a/ocis-pkg/x/io/fsx/fallback_test.go +++ b/pkg/x/io/fsx/fallback_test.go @@ -7,7 +7,7 @@ import ( "github.com/onsi/gomega" "github.com/spf13/afero" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/pkg/x/io/fsx" ) func TestLayeredFS(t *testing.T) { diff --git a/ocis-pkg/x/io/fsx/fsx.go b/pkg/x/io/fsx/fsx.go similarity index 100% rename from ocis-pkg/x/io/fsx/fsx.go rename to pkg/x/io/fsx/fsx.go diff --git a/ocis-pkg/x/io/fsx/fsx_test.go b/pkg/x/io/fsx/fsx_test.go similarity index 96% rename from ocis-pkg/x/io/fsx/fsx_test.go rename to pkg/x/io/fsx/fsx_test.go index 7ac4a2b460..5576284d38 100644 --- a/ocis-pkg/x/io/fsx/fsx_test.go +++ b/pkg/x/io/fsx/fsx_test.go @@ -7,7 +7,7 @@ import ( "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/pkg/x/io/fsx" ) func TestBase(t *testing.T) { diff --git a/ocis-pkg/x/path/filepathx/path.go b/pkg/x/path/filepathx/path.go similarity index 100% rename from ocis-pkg/x/path/filepathx/path.go rename to pkg/x/path/filepathx/path.go diff --git a/ocis-pkg/x/path/filepathx/path_test.go b/pkg/x/path/filepathx/path_test.go similarity index 94% rename from ocis-pkg/x/path/filepathx/path_test.go rename to pkg/x/path/filepathx/path_test.go index e9e363c822..adb773a6e0 100644 --- a/ocis-pkg/x/path/filepathx/path_test.go +++ b/pkg/x/path/filepathx/path_test.go @@ -3,7 +3,7 @@ package filepathx_test import ( "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/path/filepathx" + "github.com/opencloud-eu/opencloud/pkg/x/path/filepathx" ) func TestJailJoin(t *testing.T) { diff --git a/services/activitylog/pkg/command/root.go b/services/activitylog/pkg/command/root.go index 56fe63d699..0a4e2f822c 100644 --- a/services/activitylog/pkg/command/root.go +++ b/services/activitylog/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/activitylog/pkg/command/server.go b/services/activitylog/pkg/command/server.go index ec3b7d9bda..74dcb2f38f 100644 --- a/services/activitylog/pkg/command/server.go +++ b/services/activitylog/pkg/command/server.go @@ -12,11 +12,11 @@ import ( "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" diff --git a/services/activitylog/pkg/config/config.go b/services/activitylog/pkg/config/config.go index 0e05f8fb95..0529eb58ae 100644 --- a/services/activitylog/pkg/config/config.go +++ b/services/activitylog/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/activitylog/pkg/config/defaults/defaultconfig.go b/services/activitylog/pkg/config/defaults/defaultconfig.go index 038dd7155f..728d697f89 100644 --- a/services/activitylog/pkg/config/defaults/defaultconfig.go +++ b/services/activitylog/pkg/config/defaults/defaultconfig.go @@ -1,8 +1,8 @@ package defaults import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" ) diff --git a/services/activitylog/pkg/config/parser/parse.go b/services/activitylog/pkg/config/parser/parse.go index ad9b7bd992..1484df748d 100644 --- a/services/activitylog/pkg/config/parser/parse.go +++ b/services/activitylog/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/activitylog/pkg/config/tracing.go b/services/activitylog/pkg/config/tracing.go index 7c0780a888..5221ad2614 100644 --- a/services/activitylog/pkg/config/tracing.go +++ b/services/activitylog/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/activitylog/pkg/logging/logging.go b/services/activitylog/pkg/logging/logging.go index c735f47397..7994b741a4 100644 --- a/services/activitylog/pkg/logging/logging.go +++ b/services/activitylog/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" ) diff --git a/services/activitylog/pkg/server/debug/option.go b/services/activitylog/pkg/server/debug/option.go index 49e38a7feb..1501083f70 100644 --- a/services/activitylog/pkg/server/debug/option.go +++ b/services/activitylog/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" ) diff --git a/services/activitylog/pkg/server/debug/server.go b/services/activitylog/pkg/server/debug/server.go index cfe4aec00d..4d29a4480f 100644 --- a/services/activitylog/pkg/server/debug/server.go +++ b/services/activitylog/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/activitylog/pkg/server/http/option.go b/services/activitylog/pkg/server/http/option.go index eca7c74aeb..c834997182 100644 --- a/services/activitylog/pkg/server/http/option.go +++ b/services/activitylog/pkg/server/http/option.go @@ -6,7 +6,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" diff --git a/services/activitylog/pkg/server/http/server.go b/services/activitylog/pkg/server/http/server.go index 90da0bea10..1b0b914050 100644 --- a/services/activitylog/pkg/server/http/server.go +++ b/services/activitylog/pkg/server/http/server.go @@ -7,12 +7,12 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/account" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" svc "github.com/opencloud-eu/opencloud/services/activitylog/pkg/service" "github.com/riandyrn/otelchi" "go-micro.dev/v4" diff --git a/services/activitylog/pkg/service/http.go b/services/activitylog/pkg/service/http.go index e5aa50053d..de23257141 100644 --- a/services/activitylog/pkg/service/http.go +++ b/services/activitylog/pkg/service/http.go @@ -18,12 +18,12 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" "google.golang.org/grpc/metadata" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" - "github.com/opencloud-eu/opencloud/ocis-pkg/kql" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/kql" + "github.com/opencloud-eu/opencloud/pkg/l10n" ehmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" + libregraph "github.com/owncloud/libre-graph-api-go" ) var ( diff --git a/services/activitylog/pkg/service/options.go b/services/activitylog/pkg/service/options.go index df91229a96..704a08959f 100644 --- a/services/activitylog/pkg/service/options.go +++ b/services/activitylog/pkg/service/options.go @@ -5,7 +5,7 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/go-chi/chi/v5" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go index e74893b1ab..238a3ac2af 100644 --- a/services/activitylog/pkg/service/response.go +++ b/services/activitylog/pkg/service/response.go @@ -16,7 +16,7 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/l10n" ) // Translations diff --git a/services/activitylog/pkg/service/service.go b/services/activitylog/pkg/service/service.go index 2a40e64680..929bad6219 100644 --- a/services/activitylog/pkg/service/service.go +++ b/services/activitylog/pkg/service/service.go @@ -18,7 +18,7 @@ import ( "github.com/go-chi/chi/v5" microstore "go-micro.dev/v4/store" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" diff --git a/services/antivirus/pkg/command/health.go b/services/antivirus/pkg/command/health.go index d4b442d79c..909457ea0a 100644 --- a/services/antivirus/pkg/command/health.go +++ b/services/antivirus/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/parser" "github.com/urfave/cli/v2" diff --git a/services/antivirus/pkg/command/root.go b/services/antivirus/pkg/command/root.go index ae7c14929e..450cb9a4b9 100644 --- a/services/antivirus/pkg/command/root.go +++ b/services/antivirus/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/antivirus/pkg/command/server.go b/services/antivirus/pkg/command/server.go index 4cf17c8d1d..3b4c8b6051 100644 --- a/services/antivirus/pkg/command/server.go +++ b/services/antivirus/pkg/command/server.go @@ -7,9 +7,9 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/tracing" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/server/debug" diff --git a/services/antivirus/pkg/command/version.go b/services/antivirus/pkg/command/version.go index 678c6d8b52..d287fc3925 100644 --- a/services/antivirus/pkg/command/version.go +++ b/services/antivirus/pkg/command/version.go @@ -3,7 +3,7 @@ package command import ( "fmt" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" "github.com/urfave/cli/v2" diff --git a/services/antivirus/pkg/config/parser/parse.go b/services/antivirus/pkg/config/parser/parse.go index 3dbd81b8e7..30b46f7215 100644 --- a/services/antivirus/pkg/config/parser/parse.go +++ b/services/antivirus/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/antivirus/pkg/config/tracing.go b/services/antivirus/pkg/config/tracing.go index 0e32c4f002..5340d94657 100644 --- a/services/antivirus/pkg/config/tracing.go +++ b/services/antivirus/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/antivirus/pkg/server/debug/option.go b/services/antivirus/pkg/server/debug/option.go index 1abf1716bb..dec3e1ba07 100644 --- a/services/antivirus/pkg/server/debug/option.go +++ b/services/antivirus/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" ) diff --git a/services/antivirus/pkg/server/debug/server.go b/services/antivirus/pkg/server/debug/server.go index 9e7b5ac398..a1d84107ba 100644 --- a/services/antivirus/pkg/server/debug/server.go +++ b/services/antivirus/pkg/server/debug/server.go @@ -7,10 +7,10 @@ import ( "github.com/dutchcoders/go-clamd" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/antivirus/pkg/service/service.go b/services/antivirus/pkg/service/service.go index 049f4388b9..3b4b1bbca6 100644 --- a/services/antivirus/pkg/service/service.go +++ b/services/antivirus/pkg/service/service.go @@ -19,7 +19,7 @@ import ( "github.com/cs3org/reva/v2/pkg/rhttp" "go.opentelemetry.io/otel/trace" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" "github.com/opencloud-eu/opencloud/services/antivirus/pkg/scanners" ) diff --git a/services/app-provider/pkg/command/health.go b/services/app-provider/pkg/command/health.go index 20e042d144..3954f26db8 100644 --- a/services/app-provider/pkg/command/health.go +++ b/services/app-provider/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/logging" diff --git a/services/app-provider/pkg/command/root.go b/services/app-provider/pkg/command/root.go index f0e088fc2d..02ff4aa5e9 100644 --- a/services/app-provider/pkg/command/root.go +++ b/services/app-provider/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/app-provider/pkg/command/server.go b/services/app-provider/pkg/command/server.go index b7a128d073..ee1b326839 100644 --- a/services/app-provider/pkg/command/server.go +++ b/services/app-provider/pkg/command/server.go @@ -11,10 +11,10 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/logging" diff --git a/services/app-provider/pkg/command/version.go b/services/app-provider/pkg/command/version.go index 70b12ce800..8657434718 100644 --- a/services/app-provider/pkg/command/version.go +++ b/services/app-provider/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" diff --git a/services/app-provider/pkg/config/config.go b/services/app-provider/pkg/config/config.go index 3362fe894b..2e54c275d3 100644 --- a/services/app-provider/pkg/config/config.go +++ b/services/app-provider/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/app-provider/pkg/config/defaults/defaultconfig.go b/services/app-provider/pkg/config/defaults/defaultconfig.go index ad80ea5aeb..ae95100e54 100644 --- a/services/app-provider/pkg/config/defaults/defaultconfig.go +++ b/services/app-provider/pkg/config/defaults/defaultconfig.go @@ -1,8 +1,8 @@ package defaults import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" ) diff --git a/services/app-provider/pkg/config/parser/parse.go b/services/app-provider/pkg/config/parser/parse.go index 49a7108400..d16cd072e6 100644 --- a/services/app-provider/pkg/config/parser/parse.go +++ b/services/app-provider/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/app-provider/pkg/config/tracing.go b/services/app-provider/pkg/config/tracing.go index 5d3c8a8943..890c007829 100644 --- a/services/app-provider/pkg/config/tracing.go +++ b/services/app-provider/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the configuration options for tracing. type Tracing struct { diff --git a/services/app-provider/pkg/logging/logging.go b/services/app-provider/pkg/logging/logging.go index e01c4e94d1..c131825be2 100644 --- a/services/app-provider/pkg/logging/logging.go +++ b/services/app-provider/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" ) diff --git a/services/app-provider/pkg/server/debug/option.go b/services/app-provider/pkg/server/debug/option.go index 2545119c48..dc16d7c5f6 100644 --- a/services/app-provider/pkg/server/debug/option.go +++ b/services/app-provider/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" ) diff --git a/services/app-provider/pkg/server/debug/server.go b/services/app-provider/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/app-provider/pkg/server/debug/server.go +++ b/services/app-provider/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/app-registry/pkg/command/health.go b/services/app-registry/pkg/command/health.go index ec740ac589..88d87bdf15 100644 --- a/services/app-registry/pkg/command/health.go +++ b/services/app-registry/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/logging" diff --git a/services/app-registry/pkg/command/root.go b/services/app-registry/pkg/command/root.go index a54bb2161c..73be5b1752 100644 --- a/services/app-registry/pkg/command/root.go +++ b/services/app-registry/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/app-registry/pkg/command/server.go b/services/app-registry/pkg/command/server.go index 95f344fc8b..eec56c5d5a 100644 --- a/services/app-registry/pkg/command/server.go +++ b/services/app-registry/pkg/command/server.go @@ -9,10 +9,10 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/logging" diff --git a/services/app-registry/pkg/command/version.go b/services/app-registry/pkg/command/version.go index 8de6f03cd7..d41df027d8 100644 --- a/services/app-registry/pkg/command/version.go +++ b/services/app-registry/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" diff --git a/services/app-registry/pkg/config/config.go b/services/app-registry/pkg/config/config.go index 7e216b9278..ab3a837ffb 100644 --- a/services/app-registry/pkg/config/config.go +++ b/services/app-registry/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/app-registry/pkg/config/defaults/defaultconfig.go b/services/app-registry/pkg/config/defaults/defaultconfig.go index 251b7e3ca9..4ec76636b9 100644 --- a/services/app-registry/pkg/config/defaults/defaultconfig.go +++ b/services/app-registry/pkg/config/defaults/defaultconfig.go @@ -1,8 +1,8 @@ package defaults import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" ) diff --git a/services/app-registry/pkg/config/parser/parse.go b/services/app-registry/pkg/config/parser/parse.go index 27d3249575..8c91c476e3 100644 --- a/services/app-registry/pkg/config/parser/parse.go +++ b/services/app-registry/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/app-registry/pkg/config/tracing.go b/services/app-registry/pkg/config/tracing.go index 2df1b5845a..00d6418aa0 100644 --- a/services/app-registry/pkg/config/tracing.go +++ b/services/app-registry/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing contains the tracing config parameters. type Tracing struct { diff --git a/services/app-registry/pkg/logging/logging.go b/services/app-registry/pkg/logging/logging.go index 5312d9e66a..5431a66b82 100644 --- a/services/app-registry/pkg/logging/logging.go +++ b/services/app-registry/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" ) diff --git a/services/app-registry/pkg/revaconfig/config.go b/services/app-registry/pkg/revaconfig/config.go index 33a5586121..ae162d643f 100644 --- a/services/app-registry/pkg/revaconfig/config.go +++ b/services/app-registry/pkg/revaconfig/config.go @@ -2,7 +2,7 @@ package revaconfig import ( "github.com/mitchellh/mapstructure" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" ) diff --git a/services/app-registry/pkg/server/debug/option.go b/services/app-registry/pkg/server/debug/option.go index 95082da760..8d5dbe4832 100644 --- a/services/app-registry/pkg/server/debug/option.go +++ b/services/app-registry/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" ) diff --git a/services/app-registry/pkg/server/debug/server.go b/services/app-registry/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/app-registry/pkg/server/debug/server.go +++ b/services/app-registry/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/audit/pkg/command/root.go b/services/audit/pkg/command/root.go index d5b2d692fe..db06c145c5 100644 --- a/services/audit/pkg/command/root.go +++ b/services/audit/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/audit/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/audit/pkg/command/server.go b/services/audit/pkg/command/server.go index bf4e3beb5f..1143ad1436 100644 --- a/services/audit/pkg/command/server.go +++ b/services/audit/pkg/command/server.go @@ -9,7 +9,7 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/audit/pkg/config" "github.com/opencloud-eu/opencloud/services/audit/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/audit/pkg/logging" diff --git a/services/audit/pkg/config/config.go b/services/audit/pkg/config/config.go index 2b0c83f0ad..e630331888 100644 --- a/services/audit/pkg/config/config.go +++ b/services/audit/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/audit/pkg/config/parser/parse.go b/services/audit/pkg/config/parser/parse.go index d51644040b..077ee2c8cd 100644 --- a/services/audit/pkg/config/parser/parse.go +++ b/services/audit/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/audit/pkg/config" "github.com/opencloud-eu/opencloud/services/audit/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/audit/pkg/logging/logging.go b/services/audit/pkg/logging/logging.go index d7e88da87a..9387cf2c0d 100644 --- a/services/audit/pkg/logging/logging.go +++ b/services/audit/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/audit/pkg/config" ) diff --git a/services/audit/pkg/server/debug/option.go b/services/audit/pkg/server/debug/option.go index 5a688ca8d6..4f7ae77877 100644 --- a/services/audit/pkg/server/debug/option.go +++ b/services/audit/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/audit/pkg/config" ) diff --git a/services/audit/pkg/server/debug/server.go b/services/audit/pkg/server/debug/server.go index 991586f444..eb0f31b16c 100644 --- a/services/audit/pkg/server/debug/server.go +++ b/services/audit/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/audit/pkg/service/service.go b/services/audit/pkg/service/service.go index 6667f09b4d..7bd25f2f90 100644 --- a/services/audit/pkg/service/service.go +++ b/services/audit/pkg/service/service.go @@ -7,7 +7,7 @@ import ( "os" "github.com/cs3org/reva/v2/pkg/events" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/audit/pkg/config" "github.com/opencloud-eu/opencloud/services/audit/pkg/types" ) diff --git a/services/audit/pkg/service/service_test.go b/services/audit/pkg/service/service_test.go index 5032243e84..9a8533bb4f 100644 --- a/services/audit/pkg/service/service_test.go +++ b/services/audit/pkg/service/service_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "github.com/cs3org/reva/v2/pkg/events" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/audit/pkg/types" group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" diff --git a/services/auth-app/pkg/command/create.go b/services/auth-app/pkg/command/create.go index 6a18f4feb1..cc87a823f7 100644 --- a/services/auth-app/pkg/command/create.go +++ b/services/auth-app/pkg/command/create.go @@ -16,9 +16,9 @@ import ( typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/parser" "github.com/urfave/cli/v2" diff --git a/services/auth-app/pkg/command/health.go b/services/auth-app/pkg/command/health.go index e75c6a95da..627038b59a 100644 --- a/services/auth-app/pkg/command/health.go +++ b/services/auth-app/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/logging" diff --git a/services/auth-app/pkg/command/root.go b/services/auth-app/pkg/command/root.go index d7a1def3da..88f56b731b 100644 --- a/services/auth-app/pkg/command/root.go +++ b/services/auth-app/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/auth-app/pkg/command/server.go b/services/auth-app/pkg/command/server.go index ae92418d73..6d26f112fb 100644 --- a/services/auth-app/pkg/command/server.go +++ b/services/auth-app/pkg/command/server.go @@ -10,11 +10,11 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/parser" diff --git a/services/auth-app/pkg/command/version.go b/services/auth-app/pkg/command/version.go index 657e7672e1..9b6c2b3d26 100644 --- a/services/auth-app/pkg/command/version.go +++ b/services/auth-app/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" diff --git a/services/auth-app/pkg/config/config.go b/services/auth-app/pkg/config/config.go index dcc7789677..ca743cc7e7 100644 --- a/services/auth-app/pkg/config/config.go +++ b/services/auth-app/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config defines the root config structure diff --git a/services/auth-app/pkg/config/defaults/defaultconfig.go b/services/auth-app/pkg/config/defaults/defaultconfig.go index 34a4da9853..900f6ebe04 100644 --- a/services/auth-app/pkg/config/defaults/defaultconfig.go +++ b/services/auth-app/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "strings" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" ) diff --git a/services/auth-app/pkg/config/parser/parse.go b/services/auth-app/pkg/config/parser/parse.go index d30c05a4ec..92a53af5b6 100644 --- a/services/auth-app/pkg/config/parser/parse.go +++ b/services/auth-app/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/auth-app/pkg/config/tracing.go b/services/auth-app/pkg/config/tracing.go index 3cf445d0c7..e04a637843 100644 --- a/services/auth-app/pkg/config/tracing.go +++ b/services/auth-app/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the tracing configuration. type Tracing struct { diff --git a/services/auth-app/pkg/logging/logging.go b/services/auth-app/pkg/logging/logging.go index 949c0a4094..f9af2a136a 100644 --- a/services/auth-app/pkg/logging/logging.go +++ b/services/auth-app/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" ) diff --git a/services/auth-app/pkg/revaconfig/config.go b/services/auth-app/pkg/revaconfig/config.go index f7ac8ca3e0..fac6b61a71 100644 --- a/services/auth-app/pkg/revaconfig/config.go +++ b/services/auth-app/pkg/revaconfig/config.go @@ -3,7 +3,7 @@ package revaconfig import ( "path/filepath" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" ) diff --git a/services/auth-app/pkg/server/debug/option.go b/services/auth-app/pkg/server/debug/option.go index 4af9f19d26..77cb1b4f87 100644 --- a/services/auth-app/pkg/server/debug/option.go +++ b/services/auth-app/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" ) diff --git a/services/auth-app/pkg/server/debug/server.go b/services/auth-app/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/auth-app/pkg/server/debug/server.go +++ b/services/auth-app/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/auth-app/pkg/server/http/option.go b/services/auth-app/pkg/server/http/option.go index 54015fa2a6..83d0f697fa 100644 --- a/services/auth-app/pkg/server/http/option.go +++ b/services/auth-app/pkg/server/http/option.go @@ -5,7 +5,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" "github.com/urfave/cli/v2" diff --git a/services/auth-app/pkg/server/http/server.go b/services/auth-app/pkg/server/http/server.go index 18b8bd1900..cf5a6d26db 100644 --- a/services/auth-app/pkg/server/http/server.go +++ b/services/auth-app/pkg/server/http/server.go @@ -7,12 +7,12 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/account" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" svc "github.com/opencloud-eu/opencloud/services/auth-app/pkg/service" "github.com/riandyrn/otelchi" "go-micro.dev/v4" diff --git a/services/auth-app/pkg/service/option.go b/services/auth-app/pkg/service/option.go index b3561685b5..c4e86bc4d7 100644 --- a/services/auth-app/pkg/service/option.go +++ b/services/auth-app/pkg/service/option.go @@ -6,7 +6,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/go-chi/chi/v5" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" "go.opentelemetry.io/otel/trace" diff --git a/services/auth-app/pkg/service/service.go b/services/auth-app/pkg/service/service.go index 376d1c8361..fdee810be6 100644 --- a/services/auth-app/pkg/service/service.go +++ b/services/auth-app/pkg/service/service.go @@ -19,8 +19,8 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/roles" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/roles" "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" settings "github.com/opencloud-eu/opencloud/services/settings/pkg/service/v0" "google.golang.org/grpc/metadata" diff --git a/services/auth-basic/pkg/command/health.go b/services/auth-basic/pkg/command/health.go index 7369fdfadd..c75463dd97 100644 --- a/services/auth-basic/pkg/command/health.go +++ b/services/auth-basic/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/logging" diff --git a/services/auth-basic/pkg/command/root.go b/services/auth-basic/pkg/command/root.go index b529e6ef9d..cd4835b971 100644 --- a/services/auth-basic/pkg/command/root.go +++ b/services/auth-basic/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/auth-basic/pkg/command/server.go b/services/auth-basic/pkg/command/server.go index 9cb06159a8..7e8ad98320 100644 --- a/services/auth-basic/pkg/command/server.go +++ b/services/auth-basic/pkg/command/server.go @@ -9,11 +9,11 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/ldap" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/ldap" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/logging" diff --git a/services/auth-basic/pkg/command/version.go b/services/auth-basic/pkg/command/version.go index 9982f512c9..bc4185d898 100644 --- a/services/auth-basic/pkg/command/version.go +++ b/services/auth-basic/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" diff --git a/services/auth-basic/pkg/config/config.go b/services/auth-basic/pkg/config/config.go index cdc1c29c6c..acdbf74220 100644 --- a/services/auth-basic/pkg/config/config.go +++ b/services/auth-basic/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/auth-basic/pkg/config/defaults/defaultconfig.go b/services/auth-basic/pkg/config/defaults/defaultconfig.go index e2e07df9c0..80994cb51e 100644 --- a/services/auth-basic/pkg/config/defaults/defaultconfig.go +++ b/services/auth-basic/pkg/config/defaults/defaultconfig.go @@ -3,9 +3,9 @@ package defaults import ( "path/filepath" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" ) diff --git a/services/auth-basic/pkg/config/parser/parse.go b/services/auth-basic/pkg/config/parser/parse.go index 4770330ab5..aade530c6e 100644 --- a/services/auth-basic/pkg/config/parser/parse.go +++ b/services/auth-basic/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/auth-basic/pkg/config/tracing.go b/services/auth-basic/pkg/config/tracing.go index 64c409cf45..df9b379c1c 100644 --- a/services/auth-basic/pkg/config/tracing.go +++ b/services/auth-basic/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the tracing configuration. type Tracing struct { diff --git a/services/auth-basic/pkg/logging/logging.go b/services/auth-basic/pkg/logging/logging.go index 8460b2fb3a..61132103e0 100644 --- a/services/auth-basic/pkg/logging/logging.go +++ b/services/auth-basic/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" ) diff --git a/services/auth-basic/pkg/server/debug/option.go b/services/auth-basic/pkg/server/debug/option.go index ab7c1fac68..f7d5157f2e 100644 --- a/services/auth-basic/pkg/server/debug/option.go +++ b/services/auth-basic/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" ) diff --git a/services/auth-basic/pkg/server/debug/server.go b/services/auth-basic/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/auth-basic/pkg/server/debug/server.go +++ b/services/auth-basic/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/auth-bearer/pkg/command/health.go b/services/auth-bearer/pkg/command/health.go index f38a7848c1..8620c9e068 100644 --- a/services/auth-bearer/pkg/command/health.go +++ b/services/auth-bearer/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/logging" diff --git a/services/auth-bearer/pkg/command/root.go b/services/auth-bearer/pkg/command/root.go index bc5985abc8..2233d1b1b9 100644 --- a/services/auth-bearer/pkg/command/root.go +++ b/services/auth-bearer/pkg/command/root.go @@ -4,8 +4,8 @@ import ( "context" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/pkg/clihelper" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" "github.com/thejerf/suture/v4" "github.com/urfave/cli/v2" diff --git a/services/auth-bearer/pkg/command/server.go b/services/auth-bearer/pkg/command/server.go index 7f8970ea35..c53a8e0cc3 100644 --- a/services/auth-bearer/pkg/command/server.go +++ b/services/auth-bearer/pkg/command/server.go @@ -9,10 +9,10 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/logging" diff --git a/services/auth-bearer/pkg/command/version.go b/services/auth-bearer/pkg/command/version.go index a8146380f3..1ecc7e9ebe 100644 --- a/services/auth-bearer/pkg/command/version.go +++ b/services/auth-bearer/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" diff --git a/services/auth-bearer/pkg/config/config.go b/services/auth-bearer/pkg/config/config.go index 36ea451b06..d1e204c1af 100644 --- a/services/auth-bearer/pkg/config/config.go +++ b/services/auth-bearer/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/auth-bearer/pkg/config/defaults/defaultconfig.go b/services/auth-bearer/pkg/config/defaults/defaultconfig.go index 07d83d538d..66f6d722af 100644 --- a/services/auth-bearer/pkg/config/defaults/defaultconfig.go +++ b/services/auth-bearer/pkg/config/defaults/defaultconfig.go @@ -1,8 +1,8 @@ package defaults import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" ) diff --git a/services/auth-bearer/pkg/config/parser/parse.go b/services/auth-bearer/pkg/config/parser/parse.go index 6699d0d503..a2bdf29de9 100644 --- a/services/auth-bearer/pkg/config/parser/parse.go +++ b/services/auth-bearer/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/auth-bearer/pkg/config/tracing.go b/services/auth-bearer/pkg/config/tracing.go index f7fa6a6d52..061253b066 100644 --- a/services/auth-bearer/pkg/config/tracing.go +++ b/services/auth-bearer/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the tracing parameters. type Tracing struct { diff --git a/services/auth-bearer/pkg/logging/logging.go b/services/auth-bearer/pkg/logging/logging.go index 01996a5ea8..ed5c0f02c3 100644 --- a/services/auth-bearer/pkg/logging/logging.go +++ b/services/auth-bearer/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" ) diff --git a/services/auth-bearer/pkg/server/debug/option.go b/services/auth-bearer/pkg/server/debug/option.go index 92f79b6e15..4f28867029 100644 --- a/services/auth-bearer/pkg/server/debug/option.go +++ b/services/auth-bearer/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" ) diff --git a/services/auth-bearer/pkg/server/debug/server.go b/services/auth-bearer/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/auth-bearer/pkg/server/debug/server.go +++ b/services/auth-bearer/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/auth-machine/pkg/command/health.go b/services/auth-machine/pkg/command/health.go index bc67d69cb0..2f9f3f2a03 100644 --- a/services/auth-machine/pkg/command/health.go +++ b/services/auth-machine/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/logging" diff --git a/services/auth-machine/pkg/command/root.go b/services/auth-machine/pkg/command/root.go index b0dc4bb300..e2c5c0b749 100644 --- a/services/auth-machine/pkg/command/root.go +++ b/services/auth-machine/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/auth-machine/pkg/command/server.go b/services/auth-machine/pkg/command/server.go index 8d3b9e940a..e0475ba44f 100644 --- a/services/auth-machine/pkg/command/server.go +++ b/services/auth-machine/pkg/command/server.go @@ -9,10 +9,10 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/logging" diff --git a/services/auth-machine/pkg/command/version.go b/services/auth-machine/pkg/command/version.go index cadb60b34b..3f7eaf2c7d 100644 --- a/services/auth-machine/pkg/command/version.go +++ b/services/auth-machine/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" diff --git a/services/auth-machine/pkg/config/config.go b/services/auth-machine/pkg/config/config.go index 3a9cf69795..0ea0aabc5d 100644 --- a/services/auth-machine/pkg/config/config.go +++ b/services/auth-machine/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/auth-machine/pkg/config/defaults/defaultconfig.go b/services/auth-machine/pkg/config/defaults/defaultconfig.go index 1c759103ca..5f90dbe741 100644 --- a/services/auth-machine/pkg/config/defaults/defaultconfig.go +++ b/services/auth-machine/pkg/config/defaults/defaultconfig.go @@ -1,8 +1,8 @@ package defaults import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" ) diff --git a/services/auth-machine/pkg/config/parser/parse.go b/services/auth-machine/pkg/config/parser/parse.go index da5369b5b2..ae9bcea8e4 100644 --- a/services/auth-machine/pkg/config/parser/parse.go +++ b/services/auth-machine/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/auth-machine/pkg/config/tracing.go b/services/auth-machine/pkg/config/tracing.go index 5330531776..e64e23c2d2 100644 --- a/services/auth-machine/pkg/config/tracing.go +++ b/services/auth-machine/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing is the config for tracing parameters type Tracing struct { diff --git a/services/auth-machine/pkg/logging/logging.go b/services/auth-machine/pkg/logging/logging.go index 176567aaed..ec297533f3 100644 --- a/services/auth-machine/pkg/logging/logging.go +++ b/services/auth-machine/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" ) diff --git a/services/auth-machine/pkg/server/debug/option.go b/services/auth-machine/pkg/server/debug/option.go index 2e6ba2cf8c..3592684d36 100644 --- a/services/auth-machine/pkg/server/debug/option.go +++ b/services/auth-machine/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" ) diff --git a/services/auth-machine/pkg/server/debug/server.go b/services/auth-machine/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/auth-machine/pkg/server/debug/server.go +++ b/services/auth-machine/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/auth-service/pkg/command/health.go b/services/auth-service/pkg/command/health.go index ea14260af3..c2820d8230 100644 --- a/services/auth-service/pkg/command/health.go +++ b/services/auth-service/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/logging" diff --git a/services/auth-service/pkg/command/root.go b/services/auth-service/pkg/command/root.go index 305dcce621..4e2d35626f 100644 --- a/services/auth-service/pkg/command/root.go +++ b/services/auth-service/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/auth-service/pkg/command/server.go b/services/auth-service/pkg/command/server.go index 6be512854c..3de71b955f 100644 --- a/services/auth-service/pkg/command/server.go +++ b/services/auth-service/pkg/command/server.go @@ -9,10 +9,10 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/logging" diff --git a/services/auth-service/pkg/command/version.go b/services/auth-service/pkg/command/version.go index d6438d3a27..a6af596e72 100644 --- a/services/auth-service/pkg/command/version.go +++ b/services/auth-service/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" diff --git a/services/auth-service/pkg/config/config.go b/services/auth-service/pkg/config/config.go index b33af5218b..9cdd312219 100644 --- a/services/auth-service/pkg/config/config.go +++ b/services/auth-service/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/auth-service/pkg/config/defaults/defaultconfig.go b/services/auth-service/pkg/config/defaults/defaultconfig.go index 2de42059d1..14736a918b 100644 --- a/services/auth-service/pkg/config/defaults/defaultconfig.go +++ b/services/auth-service/pkg/config/defaults/defaultconfig.go @@ -1,8 +1,8 @@ package defaults import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" ) diff --git a/services/auth-service/pkg/config/parser/parse.go b/services/auth-service/pkg/config/parser/parse.go index 59d5405335..512986aaee 100644 --- a/services/auth-service/pkg/config/parser/parse.go +++ b/services/auth-service/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/auth-service/pkg/config/tracing.go b/services/auth-service/pkg/config/tracing.go index fb6d344d78..7791f406ad 100644 --- a/services/auth-service/pkg/config/tracing.go +++ b/services/auth-service/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing is the config for tracing parameters type Tracing struct { diff --git a/services/auth-service/pkg/logging/logging.go b/services/auth-service/pkg/logging/logging.go index fbaea8fe24..8098a5eb72 100644 --- a/services/auth-service/pkg/logging/logging.go +++ b/services/auth-service/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" ) diff --git a/services/auth-service/pkg/server/debug/option.go b/services/auth-service/pkg/server/debug/option.go index 561b2c0922..b48d5bd6e7 100644 --- a/services/auth-service/pkg/server/debug/option.go +++ b/services/auth-service/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" ) diff --git a/services/auth-service/pkg/server/debug/server.go b/services/auth-service/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/auth-service/pkg/server/debug/server.go +++ b/services/auth-service/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/clientlog/pkg/command/root.go b/services/clientlog/pkg/command/root.go index b9a995907b..8cfc0d1e57 100644 --- a/services/clientlog/pkg/command/root.go +++ b/services/clientlog/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/clientlog/pkg/command/server.go b/services/clientlog/pkg/command/server.go index 96f46d27c6..fae9150e0a 100644 --- a/services/clientlog/pkg/command/server.go +++ b/services/clientlog/pkg/command/server.go @@ -10,10 +10,10 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/logging" diff --git a/services/clientlog/pkg/config/config.go b/services/clientlog/pkg/config/config.go index 5002b2912c..bfabff249d 100644 --- a/services/clientlog/pkg/config/config.go +++ b/services/clientlog/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/clientlog/pkg/config/defaults/defaultconfig.go b/services/clientlog/pkg/config/defaults/defaultconfig.go index 5eeab2e1f5..d38b80cb27 100644 --- a/services/clientlog/pkg/config/defaults/defaultconfig.go +++ b/services/clientlog/pkg/config/defaults/defaultconfig.go @@ -1,8 +1,8 @@ package defaults import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" ) diff --git a/services/clientlog/pkg/config/parser/parse.go b/services/clientlog/pkg/config/parser/parse.go index 44acdbfdeb..85fcc4f802 100644 --- a/services/clientlog/pkg/config/parser/parse.go +++ b/services/clientlog/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/clientlog/pkg/config/tracing.go b/services/clientlog/pkg/config/tracing.go index 8918b0b9d6..0e8a1db56c 100644 --- a/services/clientlog/pkg/config/tracing.go +++ b/services/clientlog/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/clientlog/pkg/logging/logging.go b/services/clientlog/pkg/logging/logging.go index d9fe1bb834..b8d64c41aa 100644 --- a/services/clientlog/pkg/logging/logging.go +++ b/services/clientlog/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" ) diff --git a/services/clientlog/pkg/server/debug/option.go b/services/clientlog/pkg/server/debug/option.go index d9a1dede47..bd18990d51 100644 --- a/services/clientlog/pkg/server/debug/option.go +++ b/services/clientlog/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" ) diff --git a/services/clientlog/pkg/server/debug/server.go b/services/clientlog/pkg/server/debug/server.go index 991586f444..eb0f31b16c 100644 --- a/services/clientlog/pkg/server/debug/server.go +++ b/services/clientlog/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/clientlog/pkg/service/options.go b/services/clientlog/pkg/service/options.go index 451dfe7f8f..6af5ef0acc 100644 --- a/services/clientlog/pkg/service/options.go +++ b/services/clientlog/pkg/service/options.go @@ -4,7 +4,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" "go.opentelemetry.io/otel/trace" ) diff --git a/services/clientlog/pkg/service/service.go b/services/clientlog/pkg/service/service.go index 5a8daefa5f..4534db52c2 100644 --- a/services/clientlog/pkg/service/service.go +++ b/services/clientlog/pkg/service/service.go @@ -20,7 +20,7 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" ) diff --git a/services/collaboration/pkg/command/health.go b/services/collaboration/pkg/command/health.go index 3dce84d860..e85436ea0f 100644 --- a/services/collaboration/pkg/command/health.go +++ b/services/collaboration/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/logging" diff --git a/services/collaboration/pkg/command/root.go b/services/collaboration/pkg/command/root.go index d79f5f8d65..89c08266ae 100644 --- a/services/collaboration/pkg/command/root.go +++ b/services/collaboration/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/collaboration/pkg/command/server.go b/services/collaboration/pkg/command/server.go index 80e17a0bd1..735ec29678 100644 --- a/services/collaboration/pkg/command/server.go +++ b/services/collaboration/pkg/command/server.go @@ -8,9 +8,9 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/cs3org/reva/v2/pkg/store" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - registry "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + registry "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector" diff --git a/services/collaboration/pkg/command/version.go b/services/collaboration/pkg/command/version.go index 86d810723b..9ef93e179e 100644 --- a/services/collaboration/pkg/command/version.go +++ b/services/collaboration/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" diff --git a/services/collaboration/pkg/config/config.go b/services/collaboration/pkg/config/config.go index 670024f2fb..fbefe2bb1d 100644 --- a/services/collaboration/pkg/config/config.go +++ b/services/collaboration/pkg/config/config.go @@ -3,8 +3,8 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/tracing" ) // Config combines all available configuration parts. diff --git a/services/collaboration/pkg/config/cs3api.go b/services/collaboration/pkg/config/cs3api.go index 265b76420e..9f0a728d68 100644 --- a/services/collaboration/pkg/config/cs3api.go +++ b/services/collaboration/pkg/config/cs3api.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // CS3Api defines the available configuration in order to access to the CS3 gateway. type CS3Api struct { diff --git a/services/collaboration/pkg/config/defaults/defaultconfig.go b/services/collaboration/pkg/config/defaults/defaultconfig.go index c8ad824c5c..d0cec439d2 100644 --- a/services/collaboration/pkg/config/defaults/defaultconfig.go +++ b/services/collaboration/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" ) diff --git a/services/collaboration/pkg/config/http.go b/services/collaboration/pkg/config/http.go index b2f2ceeea8..a2e86ab138 100644 --- a/services/collaboration/pkg/config/http.go +++ b/services/collaboration/pkg/config/http.go @@ -1,7 +1,7 @@ package config import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // HTTP defines the available http configuration. diff --git a/services/collaboration/pkg/config/parser/parse.go b/services/collaboration/pkg/config/parser/parse.go index a1e7d15522..14388670cc 100644 --- a/services/collaboration/pkg/config/parser/parse.go +++ b/services/collaboration/pkg/config/parser/parse.go @@ -5,10 +5,10 @@ import ( "fmt" "net/url" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - ocisdefaults "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + ocisdefaults "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config/defaults" ) diff --git a/services/collaboration/pkg/connector/contentconnector.go b/services/collaboration/pkg/connector/contentconnector.go index e1f6a80f39..afeb5a64cb 100644 --- a/services/collaboration/pkg/connector/contentconnector.go +++ b/services/collaboration/pkg/connector/contentconnector.go @@ -17,7 +17,7 @@ import ( types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/tracing" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/middleware" "github.com/rs/zerolog" diff --git a/services/collaboration/pkg/connector/fileconnector_test.go b/services/collaboration/pkg/connector/fileconnector_test.go index f59f6e586b..ba5cd04bfc 100644 --- a/services/collaboration/pkg/connector/fileconnector_test.go +++ b/services/collaboration/pkg/connector/fileconnector_test.go @@ -22,7 +22,7 @@ import ( cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" collabmocks "github.com/opencloud-eu/opencloud/services/collaboration/mocks" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector" diff --git a/services/collaboration/pkg/helpers/discovery.go b/services/collaboration/pkg/helpers/discovery.go index 1abdd8f941..b7d3a93592 100644 --- a/services/collaboration/pkg/helpers/discovery.go +++ b/services/collaboration/pkg/helpers/discovery.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/beevik/etree" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/pkg/errors" ) diff --git a/services/collaboration/pkg/helpers/discovery_test.go b/services/collaboration/pkg/helpers/discovery_test.go index 0c57f01593..a9153bbec8 100644 --- a/services/collaboration/pkg/helpers/discovery_test.go +++ b/services/collaboration/pkg/helpers/discovery_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/helpers" ) diff --git a/services/collaboration/pkg/helpers/registration.go b/services/collaboration/pkg/helpers/registration.go index 1266bf4a67..18574ad68a 100644 --- a/services/collaboration/pkg/helpers/registration.go +++ b/services/collaboration/pkg/helpers/registration.go @@ -10,9 +10,9 @@ import ( "github.com/cs3org/reva/v2/pkg/mime" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" ) diff --git a/services/collaboration/pkg/logging/logging.go b/services/collaboration/pkg/logging/logging.go index d5dc1352aa..0048065e15 100644 --- a/services/collaboration/pkg/logging/logging.go +++ b/services/collaboration/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" ) diff --git a/services/collaboration/pkg/middleware/accesslog.go b/services/collaboration/pkg/middleware/accesslog.go index 6ec371d0a6..7b765ad24e 100644 --- a/services/collaboration/pkg/middleware/accesslog.go +++ b/services/collaboration/pkg/middleware/accesslog.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-chi/chi/v5/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "go.opentelemetry.io/otel/trace" ) diff --git a/services/collaboration/pkg/server/debug/option.go b/services/collaboration/pkg/server/debug/option.go index 1bc6eedd80..34fde830c2 100644 --- a/services/collaboration/pkg/server/debug/option.go +++ b/services/collaboration/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" ) diff --git a/services/collaboration/pkg/server/debug/server.go b/services/collaboration/pkg/server/debug/server.go index 7d1f382768..8704051053 100644 --- a/services/collaboration/pkg/server/debug/server.go +++ b/services/collaboration/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/collaboration/pkg/server/grpc/option.go b/services/collaboration/pkg/server/grpc/option.go index 33ff39589a..0ff72051f3 100644 --- a/services/collaboration/pkg/server/grpc/option.go +++ b/services/collaboration/pkg/server/grpc/option.go @@ -3,7 +3,7 @@ package grpc import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" microstore "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" diff --git a/services/collaboration/pkg/server/grpc/server.go b/services/collaboration/pkg/server/grpc/server.go index 4997086577..aaef1ad30c 100644 --- a/services/collaboration/pkg/server/grpc/server.go +++ b/services/collaboration/pkg/server/grpc/server.go @@ -2,7 +2,7 @@ package grpc import ( appproviderv1beta1 "github.com/cs3org/go-cs3apis/cs3/app/provider/v1beta1" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/tracing" svc "github.com/opencloud-eu/opencloud/services/collaboration/pkg/service/grpc/v0" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" diff --git a/services/collaboration/pkg/server/http/option.go b/services/collaboration/pkg/server/http/option.go index 73754b629b..ce7dd58ebc 100644 --- a/services/collaboration/pkg/server/http/option.go +++ b/services/collaboration/pkg/server/http/option.go @@ -3,7 +3,7 @@ package http import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector" microstore "go-micro.dev/v4/store" diff --git a/services/collaboration/pkg/server/http/server.go b/services/collaboration/pkg/server/http/server.go index bb0e0fecaf..839e25db4b 100644 --- a/services/collaboration/pkg/server/http/server.go +++ b/services/collaboration/pkg/server/http/server.go @@ -6,12 +6,12 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/account" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" colabmiddleware "github.com/opencloud-eu/opencloud/services/collaboration/pkg/middleware" "github.com/riandyrn/otelchi" "go-micro.dev/v4" diff --git a/services/collaboration/pkg/service/grpc/v0/option.go b/services/collaboration/pkg/service/grpc/v0/option.go index c87d43f7a3..6d65712c93 100644 --- a/services/collaboration/pkg/service/grpc/v0/option.go +++ b/services/collaboration/pkg/service/grpc/v0/option.go @@ -5,7 +5,7 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" microstore "go-micro.dev/v4/store" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" ) diff --git a/services/collaboration/pkg/service/grpc/v0/service.go b/services/collaboration/pkg/service/grpc/v0/service.go index f82bd747b0..7371e53cf1 100644 --- a/services/collaboration/pkg/service/grpc/v0/service.go +++ b/services/collaboration/pkg/service/grpc/v0/service.go @@ -18,7 +18,7 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" microstore "go-micro.dev/v4/store" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/helpers" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/middleware" diff --git a/services/collaboration/pkg/service/grpc/v0/service_test.go b/services/collaboration/pkg/service/grpc/v0/service_test.go index d04986feeb..61634f083b 100644 --- a/services/collaboration/pkg/service/grpc/v0/service_test.go +++ b/services/collaboration/pkg/service/grpc/v0/service_test.go @@ -20,7 +20,7 @@ import ( . "github.com/onsi/gomega" "github.com/stretchr/testify/mock" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/collaboration/mocks" "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" service "github.com/opencloud-eu/opencloud/services/collaboration/pkg/service/grpc/v0" diff --git a/services/eventhistory/pkg/command/root.go b/services/eventhistory/pkg/command/root.go index 5d3152189d..61e35da61b 100644 --- a/services/eventhistory/pkg/command/root.go +++ b/services/eventhistory/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/eventhistory/pkg/command/server.go b/services/eventhistory/pkg/command/server.go index 98cf738ddc..b0f141a3c6 100644 --- a/services/eventhistory/pkg/command/server.go +++ b/services/eventhistory/pkg/command/server.go @@ -10,10 +10,10 @@ import ( "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/logging" diff --git a/services/eventhistory/pkg/config/config.go b/services/eventhistory/pkg/config/config.go index 91fd6eecdd..db06f20fa9 100644 --- a/services/eventhistory/pkg/config/config.go +++ b/services/eventhistory/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" "go-micro.dev/v4/client" ) diff --git a/services/eventhistory/pkg/config/defaults/defaultconfig.go b/services/eventhistory/pkg/config/defaults/defaultconfig.go index 6cea21e836..4e2d0390ec 100644 --- a/services/eventhistory/pkg/config/defaults/defaultconfig.go +++ b/services/eventhistory/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" ) diff --git a/services/eventhistory/pkg/config/parser/parse.go b/services/eventhistory/pkg/config/parser/parse.go index 42b77aa8da..a241a80102 100644 --- a/services/eventhistory/pkg/config/parser/parse.go +++ b/services/eventhistory/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/eventhistory/pkg/config/tracing.go b/services/eventhistory/pkg/config/tracing.go index f0dde6845f..70f757b047 100644 --- a/services/eventhistory/pkg/config/tracing.go +++ b/services/eventhistory/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/eventhistory/pkg/logging/logging.go b/services/eventhistory/pkg/logging/logging.go index dea1fa04df..ce531795e1 100644 --- a/services/eventhistory/pkg/logging/logging.go +++ b/services/eventhistory/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" ) diff --git a/services/eventhistory/pkg/server/debug/option.go b/services/eventhistory/pkg/server/debug/option.go index 22e81d3302..b2569604ca 100644 --- a/services/eventhistory/pkg/server/debug/option.go +++ b/services/eventhistory/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" ) diff --git a/services/eventhistory/pkg/server/debug/server.go b/services/eventhistory/pkg/server/debug/server.go index ec4670a908..57a232dd05 100644 --- a/services/eventhistory/pkg/server/debug/server.go +++ b/services/eventhistory/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/eventhistory/pkg/server/grpc/option.go b/services/eventhistory/pkg/server/grpc/option.go index 67f17fe753..f0a29eb11a 100644 --- a/services/eventhistory/pkg/server/grpc/option.go +++ b/services/eventhistory/pkg/server/grpc/option.go @@ -4,7 +4,7 @@ import ( "context" "github.com/cs3org/reva/v2/pkg/events" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/metrics" "go-micro.dev/v4/store" diff --git a/services/eventhistory/pkg/server/grpc/server.go b/services/eventhistory/pkg/server/grpc/server.go index fbf816ad1f..fdeee7a8e2 100644 --- a/services/eventhistory/pkg/server/grpc/server.go +++ b/services/eventhistory/pkg/server/grpc/server.go @@ -1,8 +1,8 @@ package grpc import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/version" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" svc "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/service" ) diff --git a/services/eventhistory/pkg/service/service.go b/services/eventhistory/pkg/service/service.go index 59ff6bb1c9..1a7bd7548b 100644 --- a/services/eventhistory/pkg/service/service.go +++ b/services/eventhistory/pkg/service/service.go @@ -8,7 +8,7 @@ import ( "regexp" "github.com/cs3org/reva/v2/pkg/events" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ehmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" diff --git a/services/eventhistory/pkg/service/service_test.go b/services/eventhistory/pkg/service/service_test.go index 6965aab07a..6082d97879 100644 --- a/services/eventhistory/pkg/service/service_test.go +++ b/services/eventhistory/pkg/service/service_test.go @@ -14,7 +14,7 @@ import ( "github.com/google/uuid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/service" diff --git a/services/frontend/pkg/command/events.go b/services/frontend/pkg/command/events.go index f0e1fac152..010dd1f9f4 100644 --- a/services/frontend/pkg/command/events.go +++ b/services/frontend/pkg/command/events.go @@ -18,11 +18,11 @@ import ( "go-micro.dev/v4/metadata" "google.golang.org/protobuf/types/known/fieldmaskpb" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" "github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults" diff --git a/services/frontend/pkg/command/health.go b/services/frontend/pkg/command/health.go index 77b8c11487..537c977a76 100644 --- a/services/frontend/pkg/command/health.go +++ b/services/frontend/pkg/command/health.go @@ -7,7 +7,7 @@ import ( "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/frontend/pkg/logging" diff --git a/services/frontend/pkg/command/root.go b/services/frontend/pkg/command/root.go index 1f38bd393f..2f2e5aca88 100644 --- a/services/frontend/pkg/command/root.go +++ b/services/frontend/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/frontend/pkg/command/server.go b/services/frontend/pkg/command/server.go index 6229b81636..213f40aada 100644 --- a/services/frontend/pkg/command/server.go +++ b/services/frontend/pkg/command/server.go @@ -11,10 +11,10 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/frontend/pkg/logging" diff --git a/services/frontend/pkg/command/version.go b/services/frontend/pkg/command/version.go index 65df1c5680..9c320f0477 100644 --- a/services/frontend/pkg/command/version.go +++ b/services/frontend/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" diff --git a/services/frontend/pkg/config/config.go b/services/frontend/pkg/config/config.go index e0508ffcd0..80399485b7 100644 --- a/services/frontend/pkg/config/config.go +++ b/services/frontend/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/frontend/pkg/config/defaults/defaultconfig.go b/services/frontend/pkg/config/defaults/defaultconfig.go index 7f056d6fd3..624cff0904 100644 --- a/services/frontend/pkg/config/defaults/defaultconfig.go +++ b/services/frontend/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" ) diff --git a/services/frontend/pkg/config/parser/parse.go b/services/frontend/pkg/config/parser/parse.go index f90a9200fa..4df2b8d5a9 100644 --- a/services/frontend/pkg/config/parser/parse.go +++ b/services/frontend/pkg/config/parser/parse.go @@ -3,13 +3,13 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/frontend/pkg/config/tracing.go b/services/frontend/pkg/config/tracing.go index b5fb8ed4df..f0abb06d72 100644 --- a/services/frontend/pkg/config/tracing.go +++ b/services/frontend/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing sets the tracing parameters for the frontend service. type Tracing struct { diff --git a/services/frontend/pkg/logging/logging.go b/services/frontend/pkg/logging/logging.go index 081cea2632..dbd4c7baf8 100644 --- a/services/frontend/pkg/logging/logging.go +++ b/services/frontend/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" ) diff --git a/services/frontend/pkg/revaconfig/config.go b/services/frontend/pkg/revaconfig/config.go index 93662ff111..2fb036310b 100644 --- a/services/frontend/pkg/revaconfig/config.go +++ b/services/frontend/pkg/revaconfig/config.go @@ -10,10 +10,10 @@ import ( "slices" "strconv" - "github.com/opencloud-eu/opencloud/ocis-pkg/capabilities" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/capabilities" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" ) diff --git a/services/frontend/pkg/server/debug/option.go b/services/frontend/pkg/server/debug/option.go index 62ad7cee27..9212b1bb1f 100644 --- a/services/frontend/pkg/server/debug/option.go +++ b/services/frontend/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" ) diff --git a/services/frontend/pkg/server/debug/server.go b/services/frontend/pkg/server/debug/server.go index 835273dfcc..afdc2bc6aa 100644 --- a/services/frontend/pkg/server/debug/server.go +++ b/services/frontend/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/gateway/pkg/command/health.go b/services/gateway/pkg/command/health.go index 70cb2eefa7..1249bc18a5 100644 --- a/services/gateway/pkg/command/health.go +++ b/services/gateway/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/gateway/pkg/logging" diff --git a/services/gateway/pkg/command/root.go b/services/gateway/pkg/command/root.go index 8070b9b55d..7371513a95 100644 --- a/services/gateway/pkg/command/root.go +++ b/services/gateway/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/gateway/pkg/command/server.go b/services/gateway/pkg/command/server.go index bc84eef83a..3c19acc397 100644 --- a/services/gateway/pkg/command/server.go +++ b/services/gateway/pkg/command/server.go @@ -9,10 +9,10 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/gateway/pkg/logging" diff --git a/services/gateway/pkg/command/version.go b/services/gateway/pkg/command/version.go index e234d57675..0663f19117 100644 --- a/services/gateway/pkg/command/version.go +++ b/services/gateway/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" diff --git a/services/gateway/pkg/config/config.go b/services/gateway/pkg/config/config.go index 2586589cfc..174d5f2ce2 100644 --- a/services/gateway/pkg/config/config.go +++ b/services/gateway/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/gateway/pkg/config/defaults/defaultconfig.go b/services/gateway/pkg/config/defaults/defaultconfig.go index c2e039b0c4..84757c0c22 100644 --- a/services/gateway/pkg/config/defaults/defaultconfig.go +++ b/services/gateway/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" ) diff --git a/services/gateway/pkg/config/parser/parse.go b/services/gateway/pkg/config/parser/parse.go index 9ef434f256..fc0e72a84d 100644 --- a/services/gateway/pkg/config/parser/parse.go +++ b/services/gateway/pkg/config/parser/parse.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - defaults2 "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config/defaults" ) diff --git a/services/gateway/pkg/config/tracing.go b/services/gateway/pkg/config/tracing.go index cf6d9840ae..ec02df24ee 100644 --- a/services/gateway/pkg/config/tracing.go +++ b/services/gateway/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the configuration options for tracing. type Tracing struct { diff --git a/services/gateway/pkg/logging/logging.go b/services/gateway/pkg/logging/logging.go index 5fe717e63b..8095315eb9 100644 --- a/services/gateway/pkg/logging/logging.go +++ b/services/gateway/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" ) diff --git a/services/gateway/pkg/revaconfig/config.go b/services/gateway/pkg/revaconfig/config.go index e6ae1eb2b6..d6976ccbe1 100644 --- a/services/gateway/pkg/revaconfig/config.go +++ b/services/gateway/pkg/revaconfig/config.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/cs3org/reva/v2/pkg/utils" - pkgconfig "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + pkgconfig "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" ) diff --git a/services/gateway/pkg/server/debug/option.go b/services/gateway/pkg/server/debug/option.go index 1297ef2441..0380829f2a 100644 --- a/services/gateway/pkg/server/debug/option.go +++ b/services/gateway/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" ) diff --git a/services/gateway/pkg/server/debug/server.go b/services/gateway/pkg/server/debug/server.go index d91770cc4f..9827c3e9b2 100644 --- a/services/gateway/pkg/server/debug/server.go +++ b/services/gateway/pkg/server/debug/server.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/graph/pkg/command/health.go b/services/graph/pkg/command/health.go index b760538d60..06c3dd58da 100644 --- a/services/graph/pkg/command/health.go +++ b/services/graph/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/graph/pkg/logging" diff --git a/services/graph/pkg/command/root.go b/services/graph/pkg/command/root.go index 709b01637d..0ca13a0c2d 100644 --- a/services/graph/pkg/command/root.go +++ b/services/graph/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/urfave/cli/v2" diff --git a/services/graph/pkg/command/server.go b/services/graph/pkg/command/server.go index ab784ab644..9cf76e4add 100644 --- a/services/graph/pkg/command/server.go +++ b/services/graph/pkg/command/server.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/graph/pkg/logging" diff --git a/services/graph/pkg/command/unified_roles.go b/services/graph/pkg/command/unified_roles.go index ae2902bff8..140e16ab1a 100644 --- a/services/graph/pkg/command/unified_roles.go +++ b/services/graph/pkg/command/unified_roles.go @@ -8,7 +8,7 @@ import ( "github.com/olekukonko/tablewriter" "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" diff --git a/services/graph/pkg/command/version.go b/services/graph/pkg/command/version.go index 3afe916098..fca1bb8d38 100644 --- a/services/graph/pkg/command/version.go +++ b/services/graph/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" diff --git a/services/graph/pkg/config/config.go b/services/graph/pkg/config/config.go index ad4542b5e3..d68e5245a7 100644 --- a/services/graph/pkg/config/config.go +++ b/services/graph/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/graph/pkg/config/defaults/defaultconfig.go b/services/graph/pkg/config/defaults/defaultconfig.go index 5bd8edaac5..b578c74943 100644 --- a/services/graph/pkg/config/defaults/defaultconfig.go +++ b/services/graph/pkg/config/defaults/defaultconfig.go @@ -5,9 +5,9 @@ import ( "strings" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) diff --git a/services/graph/pkg/config/http.go b/services/graph/pkg/config/http.go index f74c665957..d32c5ca121 100644 --- a/services/graph/pkg/config/http.go +++ b/services/graph/pkg/config/http.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // HTTP defines the available http configuration. type HTTP struct { diff --git a/services/graph/pkg/config/parser/parse.go b/services/graph/pkg/config/parser/parse.go index d0fb1930bc..009f194d2b 100644 --- a/services/graph/pkg/config/parser/parse.go +++ b/services/graph/pkg/config/parser/parse.go @@ -6,10 +6,10 @@ import ( "github.com/go-ldap/ldap/v3" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - defaults2 "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" diff --git a/services/graph/pkg/config/tracing.go b/services/graph/pkg/config/tracing.go index 128be1ee23..4106b99076 100644 --- a/services/graph/pkg/config/tracing.go +++ b/services/graph/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/graph/pkg/identity/cs3.go b/services/graph/pkg/identity/cs3.go index 5a98592572..dcf59b3941 100644 --- a/services/graph/pkg/identity/cs3.go +++ b/services/graph/pkg/identity/cs3.go @@ -11,10 +11,10 @@ import ( cs3user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" + libregraph "github.com/owncloud/libre-graph-api-go" ) var ( diff --git a/services/graph/pkg/identity/ldap.go b/services/graph/pkg/identity/ldap.go index d40e6bab82..490d4ca426 100644 --- a/services/graph/pkg/identity/ldap.go +++ b/services/graph/pkg/identity/ldap.go @@ -16,7 +16,7 @@ import ( "github.com/libregraph/idm/pkg/ldapdn" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) diff --git a/services/graph/pkg/identity/ldap/reconnect.go b/services/graph/pkg/identity/ldap/reconnect.go index 9c2cc06911..b6ff000dbe 100644 --- a/services/graph/pkg/identity/ldap/reconnect.go +++ b/services/graph/pkg/identity/ldap/reconnect.go @@ -12,7 +12,7 @@ import ( "github.com/go-ldap/ldap/v3" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) var ( diff --git a/services/graph/pkg/identity/ldap_education_school.go b/services/graph/pkg/identity/ldap_education_school.go index ff0c361b8b..03e15825ab 100644 --- a/services/graph/pkg/identity/ldap_education_school.go +++ b/services/graph/pkg/identity/ldap_education_school.go @@ -8,10 +8,10 @@ import ( "github.com/go-ldap/ldap/v3" "github.com/gofrs/uuid" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" + libregraph "github.com/owncloud/libre-graph-api-go" ) type educationConfig struct { diff --git a/services/graph/pkg/identity/ldap_test.go b/services/graph/pkg/identity/ldap_test.go index 97c36f206c..911b354f4d 100644 --- a/services/graph/pkg/identity/ldap_test.go +++ b/services/graph/pkg/identity/ldap_test.go @@ -9,10 +9,10 @@ import ( "github.com/CiscoM31/godata" "github.com/go-ldap/ldap/v3" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" + libregraph "github.com/owncloud/libre-graph-api-go" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/services/graph/pkg/l10n/translation.go b/services/graph/pkg/l10n/translation.go index f2f4d38a4e..a2a10289fb 100644 --- a/services/graph/pkg/l10n/translation.go +++ b/services/graph/pkg/l10n/translation.go @@ -3,7 +3,7 @@ package l10n import ( "embed" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/l10n" ) var ( diff --git a/services/graph/pkg/logging/logging.go b/services/graph/pkg/logging/logging.go index 10a1707d9d..f957e44c6e 100644 --- a/services/graph/pkg/logging/logging.go +++ b/services/graph/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" ) diff --git a/services/graph/pkg/middleware/auth.go b/services/graph/pkg/middleware/auth.go index 0e50a47542..729ddb35ca 100644 --- a/services/graph/pkg/middleware/auth.go +++ b/services/graph/pkg/middleware/auth.go @@ -10,9 +10,9 @@ import ( ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/token/manager/jwt" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - opkgm "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/account" + "github.com/opencloud-eu/opencloud/pkg/log" + opkgm "github.com/opencloud-eu/opencloud/pkg/middleware" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) diff --git a/services/graph/pkg/middleware/requireadmin.go b/services/graph/pkg/middleware/requireadmin.go index 8299644de5..f2a8cf6177 100644 --- a/services/graph/pkg/middleware/requireadmin.go +++ b/services/graph/pkg/middleware/requireadmin.go @@ -4,8 +4,8 @@ import ( "net/http" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/roles" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/roles" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" settings "github.com/opencloud-eu/opencloud/services/settings/pkg/service/v0" ) diff --git a/services/graph/pkg/server/debug/option.go b/services/graph/pkg/server/debug/option.go index 1795ffd520..1c9518bec4 100644 --- a/services/graph/pkg/server/debug/option.go +++ b/services/graph/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" ) diff --git a/services/graph/pkg/server/debug/server.go b/services/graph/pkg/server/debug/server.go index f4d6de2df3..f6ec9cc9dd 100644 --- a/services/graph/pkg/server/debug/server.go +++ b/services/graph/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/graph/pkg/server/http/option.go b/services/graph/pkg/server/http/option.go index d1572c5469..e4151518aa 100644 --- a/services/graph/pkg/server/http/option.go +++ b/services/graph/pkg/server/http/option.go @@ -3,7 +3,7 @@ package http import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/metrics" "github.com/urfave/cli/v2" diff --git a/services/graph/pkg/server/http/server.go b/services/graph/pkg/server/http/server.go index de91d0cd1a..a93f2a83d1 100644 --- a/services/graph/pkg/server/http/server.go +++ b/services/graph/pkg/server/http/server.go @@ -12,14 +12,14 @@ import ( "go-micro.dev/v4" "go-micro.dev/v4/events" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/keycloak" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/account" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/keycloak" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/version" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions.go b/services/graph/pkg/service/v0/api_driveitem_permissions.go index e3954621c2..304351c0f1 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions.go @@ -27,11 +27,11 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/l10n" l10n_pkg "github.com/opencloud-eu/opencloud/services/graph/pkg/l10n" - "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/conversions" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" "github.com/opencloud-eu/opencloud/services/graph/pkg/identity" diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions_links_test.go b/services/graph/pkg/service/v0/api_driveitem_permissions_links_test.go index c4af159657..e81c8fe46b 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions_links_test.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions_links_test.go @@ -15,14 +15,14 @@ import ( cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/mocks" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" "github.com/opencloud-eu/opencloud/services/graph/pkg/identity" "github.com/opencloud-eu/opencloud/services/graph/pkg/linktype" service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" + libregraph "github.com/owncloud/libre-graph-api-go" "github.com/stretchr/testify/mock" ) diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions_test.go b/services/graph/pkg/service/v0/api_driveitem_permissions_test.go index 911800496d..712695e87b 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions_test.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions_test.go @@ -20,8 +20,8 @@ import ( "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - libregraph "github.com/owncloud/libre-graph-api-go" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" + libregraph "github.com/owncloud/libre-graph-api-go" "github.com/stretchr/testify/mock" "github.com/tidwall/gjson" "google.golang.org/grpc" @@ -33,7 +33,7 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/mocks" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" diff --git a/services/graph/pkg/service/v0/api_drives_drive_item.go b/services/graph/pkg/service/v0/api_drives_drive_item.go index 9ff30c142d..f72f431b9a 100644 --- a/services/graph/pkg/service/v0/api_drives_drive_item.go +++ b/services/graph/pkg/service/v0/api_drives_drive_item.go @@ -18,7 +18,7 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) diff --git a/services/graph/pkg/service/v0/api_drives_drive_item_test.go b/services/graph/pkg/service/v0/api_drives_drive_item_test.go index 990ec49e1e..60f6cf52d1 100644 --- a/services/graph/pkg/service/v0/api_drives_drive_item_test.go +++ b/services/graph/pkg/service/v0/api_drives_drive_item_test.go @@ -23,8 +23,8 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/status" cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" - "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/conversions" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/mocks" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" svc "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" diff --git a/services/graph/pkg/service/v0/application_test.go b/services/graph/pkg/service/v0/application_test.go index d4e36f156c..d292f399b5 100644 --- a/services/graph/pkg/service/v0/application_test.go +++ b/services/graph/pkg/service/v0/application_test.go @@ -13,8 +13,7 @@ import ( "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" settings "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/graph/mocks" @@ -22,6 +21,7 @@ import ( "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" + libregraph "github.com/owncloud/libre-graph-api-go" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/approleassignments_test.go b/services/graph/pkg/service/v0/approleassignments_test.go index 49124ba969..55e1ff4b21 100644 --- a/services/graph/pkg/service/v0/approleassignments_test.go +++ b/services/graph/pkg/service/v0/approleassignments_test.go @@ -17,8 +17,7 @@ import ( "github.com/golang/protobuf/ptypes/empty" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" settings "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/graph/mocks" @@ -26,6 +25,7 @@ import ( "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" + libregraph "github.com/owncloud/libre-graph-api-go" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/base.go b/services/graph/pkg/service/v0/base.go index ef2bae9b03..00b52156e8 100644 --- a/services/graph/pkg/service/v0/base.go +++ b/services/graph/pkg/service/v0/base.go @@ -25,7 +25,7 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" "github.com/opencloud-eu/opencloud/services/graph/pkg/identity" diff --git a/services/graph/pkg/service/v0/driveitems.go b/services/graph/pkg/service/v0/driveitems.go index f19812f27e..bdfddda3ea 100644 --- a/services/graph/pkg/service/v0/driveitems.go +++ b/services/graph/pkg/service/v0/driveitems.go @@ -28,7 +28,7 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) diff --git a/services/graph/pkg/service/v0/driveitems_test.go b/services/graph/pkg/service/v0/driveitems_test.go index 72e76765a1..b6772feb45 100644 --- a/services/graph/pkg/service/v0/driveitems_test.go +++ b/services/graph/pkg/service/v0/driveitems_test.go @@ -25,7 +25,7 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/graph/mocks" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" diff --git a/services/graph/pkg/service/v0/drives.go b/services/graph/pkg/service/v0/drives.go index 2038459d35..e895f985bd 100644 --- a/services/graph/pkg/service/v0/drives.go +++ b/services/graph/pkg/service/v0/drives.go @@ -28,7 +28,7 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/proto" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/l10n" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" diff --git a/services/graph/pkg/service/v0/educationclasses_test.go b/services/graph/pkg/service/v0/educationclasses_test.go index fba69ab06a..f15da82294 100644 --- a/services/graph/pkg/service/v0/educationclasses_test.go +++ b/services/graph/pkg/service/v0/educationclasses_test.go @@ -17,14 +17,14 @@ import ( "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/graph/mocks" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" + libregraph "github.com/owncloud/libre-graph-api-go" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/educationschools_test.go b/services/graph/pkg/service/v0/educationschools_test.go index c3efe195d5..4dbad389df 100644 --- a/services/graph/pkg/service/v0/educationschools_test.go +++ b/services/graph/pkg/service/v0/educationschools_test.go @@ -21,13 +21,13 @@ import ( "github.com/stretchr/testify/mock" "google.golang.org/grpc" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" + libregraph "github.com/owncloud/libre-graph-api-go" ) type schoolList struct { diff --git a/services/graph/pkg/service/v0/educationuser_test.go b/services/graph/pkg/service/v0/educationuser_test.go index a87096597f..31bf37f1d3 100644 --- a/services/graph/pkg/service/v0/educationuser_test.go +++ b/services/graph/pkg/service/v0/educationuser_test.go @@ -19,14 +19,14 @@ import ( "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/graph/mocks" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" + libregraph "github.com/owncloud/libre-graph-api-go" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/graph.go b/services/graph/pkg/service/v0/graph.go index 23c28bc942..ce739dfc80 100644 --- a/services/graph/pkg/service/v0/graph.go +++ b/services/graph/pkg/service/v0/graph.go @@ -19,7 +19,7 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/opencloud-eu/opencloud/ocis-pkg/keycloak" + "github.com/opencloud-eu/opencloud/pkg/keycloak" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" diff --git a/services/graph/pkg/service/v0/graph_suite_test.go b/services/graph/pkg/service/v0/graph_suite_test.go index b85850a41f..37e18501ac 100644 --- a/services/graph/pkg/service/v0/graph_suite_test.go +++ b/services/graph/pkg/service/v0/graph_suite_test.go @@ -3,7 +3,7 @@ package svc_test import ( "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/registry" mRegistry "go-micro.dev/v4/registry" . "github.com/onsi/ginkgo/v2" diff --git a/services/graph/pkg/service/v0/graph_test.go b/services/graph/pkg/service/v0/graph_test.go index 75d754d8af..c5474a2ad4 100644 --- a/services/graph/pkg/service/v0/graph_test.go +++ b/services/graph/pkg/service/v0/graph_test.go @@ -29,7 +29,7 @@ import ( "github.com/tidwall/gjson" "google.golang.org/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/graph/mocks" diff --git a/services/graph/pkg/service/v0/groups_test.go b/services/graph/pkg/service/v0/groups_test.go index 3407205eb9..a5601de56d 100644 --- a/services/graph/pkg/service/v0/groups_test.go +++ b/services/graph/pkg/service/v0/groups_test.go @@ -17,8 +17,7 @@ import ( "github.com/go-chi/chi/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" settings "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/graph/mocks" @@ -27,6 +26,7 @@ import ( "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" + libregraph "github.com/owncloud/libre-graph-api-go" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/option.go b/services/graph/pkg/service/v0/option.go index 289deb6b35..3b07fa7b8d 100644 --- a/services/graph/pkg/service/v0/option.go +++ b/services/graph/pkg/service/v0/option.go @@ -7,9 +7,9 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/keycloak" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/roles" + "github.com/opencloud-eu/opencloud/pkg/keycloak" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/roles" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" diff --git a/services/graph/pkg/service/v0/password_test.go b/services/graph/pkg/service/v0/password_test.go index 4cfc087492..eae4d5e35a 100644 --- a/services/graph/pkg/service/v0/password_test.go +++ b/services/graph/pkg/service/v0/password_test.go @@ -17,15 +17,15 @@ import ( "github.com/go-ldap/ldap/v3" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/graph/mocks" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/graph/pkg/identity" identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" + libregraph "github.com/owncloud/libre-graph-api-go" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/service.go b/services/graph/pkg/service/v0/service.go index 0bcccdda0c..fd83948aa2 100644 --- a/services/graph/pkg/service/v0/service.go +++ b/services/graph/pkg/service/v0/service.go @@ -22,11 +22,11 @@ import ( "github.com/cs3org/reva/v2/pkg/store" "github.com/cs3org/reva/v2/pkg/utils" - ocisldap "github.com/opencloud-eu/opencloud/ocis-pkg/ldap" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/roles" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" + ocisldap "github.com/opencloud-eu/opencloud/pkg/ldap" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/roles" + "github.com/opencloud-eu/opencloud/pkg/service/grpc" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/graph/pkg/identity" "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/ldap" diff --git a/services/graph/pkg/service/v0/sharedbyme_test.go b/services/graph/pkg/service/v0/sharedbyme_test.go index 3a9d2c52c5..2484b1a989 100644 --- a/services/graph/pkg/service/v0/sharedbyme_test.go +++ b/services/graph/pkg/service/v0/sharedbyme_test.go @@ -23,8 +23,7 @@ import ( cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/graph/mocks" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" @@ -32,6 +31,7 @@ import ( "github.com/opencloud-eu/opencloud/services/graph/pkg/linktype" service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" + libregraph "github.com/owncloud/libre-graph-api-go" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/sharedwithme_test.go b/services/graph/pkg/service/v0/sharedwithme_test.go index 0f6b136232..9ff404f54e 100644 --- a/services/graph/pkg/service/v0/sharedwithme_test.go +++ b/services/graph/pkg/service/v0/sharedwithme_test.go @@ -26,13 +26,13 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/proto" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" + libregraph "github.com/owncloud/libre-graph-api-go" // "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) diff --git a/services/graph/pkg/service/v0/spacetemplates.go b/services/graph/pkg/service/v0/spacetemplates.go index a441148766..c8275da3f4 100644 --- a/services/graph/pkg/service/v0/spacetemplates.go +++ b/services/graph/pkg/service/v0/spacetemplates.go @@ -14,7 +14,7 @@ import ( "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/l10n" l10n_pkg "github.com/opencloud-eu/opencloud/services/graph/pkg/l10n" ) diff --git a/services/graph/pkg/service/v0/users_test.go b/services/graph/pkg/service/v0/users_test.go index b69e373783..59f6c9673a 100644 --- a/services/graph/pkg/service/v0/users_test.go +++ b/services/graph/pkg/service/v0/users_test.go @@ -26,7 +26,7 @@ import ( "go-micro.dev/v4/client" "google.golang.org/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" settings "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" settingsmocks "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0/mocks" diff --git a/services/graph/pkg/service/v0/utils.go b/services/graph/pkg/service/v0/utils.go index 945900cdf1..cdb98d7550 100644 --- a/services/graph/pkg/service/v0/utils.go +++ b/services/graph/pkg/service/v0/utils.go @@ -18,7 +18,7 @@ import ( libregraph "github.com/owncloud/libre-graph-api-go" "golang.org/x/sync/errgroup" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" "github.com/opencloud-eu/opencloud/services/graph/pkg/identity" "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" diff --git a/services/graph/pkg/service/v0/utils_test.go b/services/graph/pkg/service/v0/utils_test.go index 8564afdc2e..03d522a8ee 100644 --- a/services/graph/pkg/service/v0/utils_test.go +++ b/services/graph/pkg/service/v0/utils_test.go @@ -17,8 +17,8 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "google.golang.org/protobuf/testing/protocmp" - "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/conversions" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/identity" service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" diff --git a/services/graph/pkg/unifiedrole/conversion_test.go b/services/graph/pkg/unifiedrole/conversion_test.go index ef92f78a5e..c59f11db17 100644 --- a/services/graph/pkg/unifiedrole/conversion_test.go +++ b/services/graph/pkg/unifiedrole/conversion_test.go @@ -9,7 +9,7 @@ import ( "github.com/onsi/gomega/types" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" + "github.com/opencloud-eu/opencloud/pkg/conversions" "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) diff --git a/services/graph/pkg/unifiedrole/roles.go b/services/graph/pkg/unifiedrole/roles.go index 53a14b234a..12d2dc4e26 100644 --- a/services/graph/pkg/unifiedrole/roles.go +++ b/services/graph/pkg/unifiedrole/roles.go @@ -10,7 +10,7 @@ import ( "github.com/cs3org/reva/v2/pkg/conversions" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/l10n" ) const ( diff --git a/services/graph/pkg/validate/libregraph_test.go b/services/graph/pkg/validate/libregraph_test.go index 8932848fe9..e5d356df99 100644 --- a/services/graph/pkg/validate/libregraph_test.go +++ b/services/graph/pkg/validate/libregraph_test.go @@ -8,7 +8,7 @@ import ( . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" + "github.com/opencloud-eu/opencloud/pkg/conversions" "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" "github.com/opencloud-eu/opencloud/services/graph/pkg/validate" ) diff --git a/services/groups/pkg/command/health.go b/services/groups/pkg/command/health.go index 475d71c31a..917dbbfb46 100644 --- a/services/groups/pkg/command/health.go +++ b/services/groups/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/groups/pkg/config" "github.com/opencloud-eu/opencloud/services/groups/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/groups/pkg/logging" diff --git a/services/groups/pkg/command/root.go b/services/groups/pkg/command/root.go index 0c6bbd4fac..bf2e7a0159 100644 --- a/services/groups/pkg/command/root.go +++ b/services/groups/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/groups/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/groups/pkg/command/server.go b/services/groups/pkg/command/server.go index 949476f9fb..d87a834106 100644 --- a/services/groups/pkg/command/server.go +++ b/services/groups/pkg/command/server.go @@ -9,11 +9,11 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/ldap" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/ldap" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/groups/pkg/config" "github.com/opencloud-eu/opencloud/services/groups/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/groups/pkg/logging" diff --git a/services/groups/pkg/command/version.go b/services/groups/pkg/command/version.go index 3499f77905..50f725c38e 100644 --- a/services/groups/pkg/command/version.go +++ b/services/groups/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/groups/pkg/config" diff --git a/services/groups/pkg/config/config.go b/services/groups/pkg/config/config.go index 7865793e84..a5ff5e2369 100644 --- a/services/groups/pkg/config/config.go +++ b/services/groups/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/groups/pkg/config/defaults/defaultconfig.go b/services/groups/pkg/config/defaults/defaultconfig.go index bef3e44ffd..3b9b95e846 100644 --- a/services/groups/pkg/config/defaults/defaultconfig.go +++ b/services/groups/pkg/config/defaults/defaultconfig.go @@ -3,9 +3,9 @@ package defaults import ( "path/filepath" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/groups/pkg/config" ) diff --git a/services/groups/pkg/config/parser/parse.go b/services/groups/pkg/config/parser/parse.go index 55c9ce5bd9..feafc0a8b8 100644 --- a/services/groups/pkg/config/parser/parse.go +++ b/services/groups/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/groups/pkg/config" "github.com/opencloud-eu/opencloud/services/groups/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/groups/pkg/config/tracing.go b/services/groups/pkg/config/tracing.go index dd585c16f8..1b328a7ff4 100644 --- a/services/groups/pkg/config/tracing.go +++ b/services/groups/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing contains the tracing configuration. type Tracing struct { diff --git a/services/groups/pkg/logging/logging.go b/services/groups/pkg/logging/logging.go index b36963a9d1..aec0df9935 100644 --- a/services/groups/pkg/logging/logging.go +++ b/services/groups/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/groups/pkg/config" ) diff --git a/services/groups/pkg/server/debug/option.go b/services/groups/pkg/server/debug/option.go index 4472a24b5f..4839af1db3 100644 --- a/services/groups/pkg/server/debug/option.go +++ b/services/groups/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/groups/pkg/config" ) diff --git a/services/groups/pkg/server/debug/server.go b/services/groups/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/groups/pkg/server/debug/server.go +++ b/services/groups/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/idm/pkg/command/health.go b/services/idm/pkg/command/health.go index f1694b699c..0283dc5f97 100644 --- a/services/idm/pkg/command/health.go +++ b/services/idm/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/idm/pkg/config" "github.com/opencloud-eu/opencloud/services/idm/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/idm/pkg/logging" diff --git a/services/idm/pkg/command/resetpw.go b/services/idm/pkg/command/resetpw.go index ee586da2d8..920c0254ba 100644 --- a/services/idm/pkg/command/resetpw.go +++ b/services/idm/pkg/command/resetpw.go @@ -11,8 +11,8 @@ import ( "github.com/go-ldap/ldap/v3" "github.com/libregraph/idm/pkg/ldbbolt" "github.com/libregraph/idm/server" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/idm/pkg/config" "github.com/opencloud-eu/opencloud/services/idm/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/idm/pkg/logging" diff --git a/services/idm/pkg/command/root.go b/services/idm/pkg/command/root.go index f24bfaf831..7e6b19f266 100644 --- a/services/idm/pkg/command/root.go +++ b/services/idm/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/idm/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/idm/pkg/command/server.go b/services/idm/pkg/command/server.go index 2e52e5e66d..678844214c 100644 --- a/services/idm/pkg/command/server.go +++ b/services/idm/pkg/command/server.go @@ -16,9 +16,9 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - pkgcrypto "github.com/opencloud-eu/opencloud/ocis-pkg/crypto" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + pkgcrypto "github.com/opencloud-eu/opencloud/pkg/crypto" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/idm" "github.com/opencloud-eu/opencloud/services/idm/pkg/config" "github.com/opencloud-eu/opencloud/services/idm/pkg/config/parser" diff --git a/services/idm/pkg/config/config.go b/services/idm/pkg/config/config.go index 9251794e28..0c5ff4f88a 100644 --- a/services/idm/pkg/config/config.go +++ b/services/idm/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/idm/pkg/config/defaults/defaultconfig.go b/services/idm/pkg/config/defaults/defaultconfig.go index dec1a79855..572b6ec290 100644 --- a/services/idm/pkg/config/defaults/defaultconfig.go +++ b/services/idm/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "path" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/idm/pkg/config" ) diff --git a/services/idm/pkg/config/parser/parse.go b/services/idm/pkg/config/parser/parse.go index eb15b05dac..6c5bcc89a6 100644 --- a/services/idm/pkg/config/parser/parse.go +++ b/services/idm/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/idm/pkg/config" "github.com/opencloud-eu/opencloud/services/idm/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/idm/pkg/logging/logging.go b/services/idm/pkg/logging/logging.go index f5fa0c5a69..e989ed807c 100644 --- a/services/idm/pkg/logging/logging.go +++ b/services/idm/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/idm/pkg/config" ) diff --git a/services/idm/pkg/server/debug/option.go b/services/idm/pkg/server/debug/option.go index 2388ebbba1..79bc97c497 100644 --- a/services/idm/pkg/server/debug/option.go +++ b/services/idm/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/idm/pkg/config" ) diff --git a/services/idm/pkg/server/debug/server.go b/services/idm/pkg/server/debug/server.go index df48a7a357..c30ecb7564 100644 --- a/services/idm/pkg/server/debug/server.go +++ b/services/idm/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/idp/pkg/assets/option.go b/services/idp/pkg/assets/option.go index 1cb430c39a..b7f83f688a 100644 --- a/services/idp/pkg/assets/option.go +++ b/services/idp/pkg/assets/option.go @@ -3,8 +3,8 @@ package assets import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/x/io/fsx" "github.com/opencloud-eu/opencloud/services/idp" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" ) diff --git a/services/idp/pkg/command/health.go b/services/idp/pkg/command/health.go index b7ea9d68a8..be007115f8 100644 --- a/services/idp/pkg/command/health.go +++ b/services/idp/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" "github.com/opencloud-eu/opencloud/services/idp/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/idp/pkg/logging" diff --git a/services/idp/pkg/command/root.go b/services/idp/pkg/command/root.go index 9f84c7b2cb..4ee670b0a8 100644 --- a/services/idp/pkg/command/root.go +++ b/services/idp/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/idp/pkg/command/server.go b/services/idp/pkg/command/server.go index 0e28eb1892..350d93fdfa 100644 --- a/services/idp/pkg/command/server.go +++ b/services/idp/pkg/command/server.go @@ -15,9 +15,9 @@ import ( "path/filepath" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" "github.com/opencloud-eu/opencloud/services/idp/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/idp/pkg/logging" diff --git a/services/idp/pkg/command/version.go b/services/idp/pkg/command/version.go index a3b6689910..97257a9f8b 100644 --- a/services/idp/pkg/command/version.go +++ b/services/idp/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" diff --git a/services/idp/pkg/config/config.go b/services/idp/pkg/config/config.go index d317c5b209..b30bfb9de0 100644 --- a/services/idp/pkg/config/config.go +++ b/services/idp/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/idp/pkg/config/defaults/defaultconfig.go b/services/idp/pkg/config/defaults/defaultconfig.go index 097be232e1..246a3d412c 100644 --- a/services/idp/pkg/config/defaults/defaultconfig.go +++ b/services/idp/pkg/config/defaults/defaultconfig.go @@ -5,9 +5,9 @@ import ( "path/filepath" "strings" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" ) diff --git a/services/idp/pkg/config/parser/parse.go b/services/idp/pkg/config/parser/parse.go index cbdd73827c..e423ecf19b 100644 --- a/services/idp/pkg/config/parser/parse.go +++ b/services/idp/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" "github.com/opencloud-eu/opencloud/services/idp/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/idp/pkg/config/tracing.go b/services/idp/pkg/config/tracing.go index babd807395..9ed8d828b9 100644 --- a/services/idp/pkg/config/tracing.go +++ b/services/idp/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/idp/pkg/logging/logging.go b/services/idp/pkg/logging/logging.go index 67311dc911..44172d88c2 100644 --- a/services/idp/pkg/logging/logging.go +++ b/services/idp/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" ) diff --git a/services/idp/pkg/server/debug/option.go b/services/idp/pkg/server/debug/option.go index 2b1a2a467d..389718005a 100644 --- a/services/idp/pkg/server/debug/option.go +++ b/services/idp/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" ) diff --git a/services/idp/pkg/server/debug/server.go b/services/idp/pkg/server/debug/server.go index b1c1345a8c..be95d4600c 100644 --- a/services/idp/pkg/server/debug/server.go +++ b/services/idp/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/idp/pkg/server/http/option.go b/services/idp/pkg/server/http/option.go index 9d68578ebf..1c1b60cdaa 100644 --- a/services/idp/pkg/server/http/option.go +++ b/services/idp/pkg/server/http/option.go @@ -3,7 +3,7 @@ package http import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" "github.com/opencloud-eu/opencloud/services/idp/pkg/metrics" "github.com/urfave/cli/v2" diff --git a/services/idp/pkg/server/http/server.go b/services/idp/pkg/server/http/server.go index e259a30dc6..4a74785943 100644 --- a/services/idp/pkg/server/http/server.go +++ b/services/idp/pkg/server/http/server.go @@ -5,11 +5,11 @@ import ( "os" chimiddleware "github.com/go-chi/chi/v5/middleware" - pkgcrypto "github.com/opencloud-eu/opencloud/ocis-pkg/crypto" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + pkgcrypto "github.com/opencloud-eu/opencloud/pkg/crypto" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/version" svc "github.com/opencloud-eu/opencloud/services/idp/pkg/service/v0" "go-micro.dev/v4" ) diff --git a/services/idp/pkg/service/v0/logging.go b/services/idp/pkg/service/v0/logging.go index e95ef180f8..cb635aae80 100644 --- a/services/idp/pkg/service/v0/logging.go +++ b/services/idp/pkg/service/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/services/idp/pkg/service/v0/option.go b/services/idp/pkg/service/v0/option.go index bf10005298..3a7ea2ba8b 100644 --- a/services/idp/pkg/service/v0/option.go +++ b/services/idp/pkg/service/v0/option.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" "go.opentelemetry.io/otel/trace" ) diff --git a/services/idp/pkg/service/v0/service.go b/services/idp/pkg/service/v0/service.go index 1ffe0df73a..fb5838850c 100644 --- a/services/idp/pkg/service/v0/service.go +++ b/services/idp/pkg/service/v0/service.go @@ -18,9 +18,9 @@ import ( libreGraphBackendSupport "github.com/libregraph/lico/bootstrap/backends/libregraph" licoconfig "github.com/libregraph/lico/config" "github.com/libregraph/lico/server" - "github.com/opencloud-eu/opencloud/ocis-pkg/ldap" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/ldap" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/tracing" "github.com/opencloud-eu/opencloud/services/idp/pkg/assets" cs3BackendSupport "github.com/opencloud-eu/opencloud/services/idp/pkg/backends/cs3/bootstrap" "github.com/opencloud-eu/opencloud/services/idp/pkg/config" diff --git a/services/invitations/pkg/backends/keycloak/backend.go b/services/invitations/pkg/backends/keycloak/backend.go index 88b567da46..9c2c946368 100644 --- a/services/invitations/pkg/backends/keycloak/backend.go +++ b/services/invitations/pkg/backends/keycloak/backend.go @@ -5,10 +5,10 @@ import ( "context" "github.com/google/uuid" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/keycloak" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/keycloak" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/invitations/pkg/invitations" + libregraph "github.com/owncloud/libre-graph-api-go" ) const ( diff --git a/services/invitations/pkg/backends/keycloak/backend_test.go b/services/invitations/pkg/backends/keycloak/backend_test.go index f24dc48656..f4cdf95066 100644 --- a/services/invitations/pkg/backends/keycloak/backend_test.go +++ b/services/invitations/pkg/backends/keycloak/backend_test.go @@ -7,8 +7,8 @@ import ( "context" "testing" - kcpkg "github.com/opencloud-eu/opencloud/ocis-pkg/keycloak" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + kcpkg "github.com/opencloud-eu/opencloud/pkg/keycloak" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/invitations/pkg/backends/keycloak" "github.com/opencloud-eu/opencloud/services/invitations/pkg/backends/keycloak/mocks" "github.com/opencloud-eu/opencloud/services/invitations/pkg/invitations" diff --git a/services/invitations/pkg/backends/keycloak/mocks/client.go b/services/invitations/pkg/backends/keycloak/mocks/client.go index 0e90bb022a..b18bbf6fe7 100644 --- a/services/invitations/pkg/backends/keycloak/mocks/client.go +++ b/services/invitations/pkg/backends/keycloak/mocks/client.go @@ -5,8 +5,8 @@ package mocks import ( context "context" - keycloak "github.com/opencloud-eu/opencloud/ocis-pkg/keycloak" libregraph "github.com/owncloud/libre-graph-api-go" + keycloak "github.com/opencloud-eu/opencloud/pkg/keycloak" mock "github.com/stretchr/testify/mock" ) diff --git a/services/invitations/pkg/command/health.go b/services/invitations/pkg/command/health.go index 8fd09aeb65..3a5c50cadd 100644 --- a/services/invitations/pkg/command/health.go +++ b/services/invitations/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/invitations/pkg/logging" diff --git a/services/invitations/pkg/command/root.go b/services/invitations/pkg/command/root.go index 3b27a3f689..d57a532c74 100644 --- a/services/invitations/pkg/command/root.go +++ b/services/invitations/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/invitations/pkg/command/server.go b/services/invitations/pkg/command/server.go index a4e2bf2c51..e4d8046fa3 100644 --- a/services/invitations/pkg/command/server.go +++ b/services/invitations/pkg/command/server.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/invitations/pkg/logging" diff --git a/services/invitations/pkg/command/version.go b/services/invitations/pkg/command/version.go index 51dc0abd93..3d79f476d7 100644 --- a/services/invitations/pkg/command/version.go +++ b/services/invitations/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" diff --git a/services/invitations/pkg/config/config.go b/services/invitations/pkg/config/config.go index 26088d53f3..cc0878f63b 100644 --- a/services/invitations/pkg/config/config.go +++ b/services/invitations/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/invitations/pkg/config/http.go b/services/invitations/pkg/config/http.go index babf9af25e..16c334808d 100644 --- a/services/invitations/pkg/config/http.go +++ b/services/invitations/pkg/config/http.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // CORS defines the available cors configuration. type CORS struct { diff --git a/services/invitations/pkg/config/parser/parse.go b/services/invitations/pkg/config/parser/parse.go index 322ef2e94a..50f826b6b4 100644 --- a/services/invitations/pkg/config/parser/parse.go +++ b/services/invitations/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/invitations/pkg/config/tracing.go b/services/invitations/pkg/config/tracing.go index 217db11aa3..eaf2a2afb3 100644 --- a/services/invitations/pkg/config/tracing.go +++ b/services/invitations/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/invitations/pkg/logging/logging.go b/services/invitations/pkg/logging/logging.go index affc9a12e9..f58d014aaa 100644 --- a/services/invitations/pkg/logging/logging.go +++ b/services/invitations/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" ) diff --git a/services/invitations/pkg/metrics/options.go b/services/invitations/pkg/metrics/options.go index 10ec24b6c3..304456e7d1 100644 --- a/services/invitations/pkg/metrics/options.go +++ b/services/invitations/pkg/metrics/options.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // Option defines a single option function. diff --git a/services/invitations/pkg/server/debug/option.go b/services/invitations/pkg/server/debug/option.go index 92b638ff6d..3fd99b19de 100644 --- a/services/invitations/pkg/server/debug/option.go +++ b/services/invitations/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" ) diff --git a/services/invitations/pkg/server/debug/server.go b/services/invitations/pkg/server/debug/server.go index e48ed33ac9..63fa005ad2 100644 --- a/services/invitations/pkg/server/debug/server.go +++ b/services/invitations/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/invitations/pkg/server/http/option.go b/services/invitations/pkg/server/http/option.go index 6ca6c09d77..3c3204f7f5 100644 --- a/services/invitations/pkg/server/http/option.go +++ b/services/invitations/pkg/server/http/option.go @@ -3,7 +3,7 @@ package http import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" svc "github.com/opencloud-eu/opencloud/services/invitations/pkg/service/v0" "github.com/urfave/cli/v2" diff --git a/services/invitations/pkg/server/http/server.go b/services/invitations/pkg/server/http/server.go index 595979a80f..cc60b27747 100644 --- a/services/invitations/pkg/server/http/server.go +++ b/services/invitations/pkg/server/http/server.go @@ -8,11 +8,11 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/go-chi/render" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - ohttp "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/account" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/middleware" + ohttp "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" "github.com/opencloud-eu/opencloud/services/invitations/pkg/invitations" svc "github.com/opencloud-eu/opencloud/services/invitations/pkg/service/v0" diff --git a/services/invitations/pkg/service/v0/logging.go b/services/invitations/pkg/service/v0/logging.go index 0394decae0..31f85dd743 100644 --- a/services/invitations/pkg/service/v0/logging.go +++ b/services/invitations/pkg/service/v0/logging.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/invitations/pkg/invitations" ) diff --git a/services/invitations/pkg/service/v0/option.go b/services/invitations/pkg/service/v0/option.go index c938930928..8be0cb1855 100644 --- a/services/invitations/pkg/service/v0/option.go +++ b/services/invitations/pkg/service/v0/option.go @@ -1,7 +1,7 @@ package service import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" ) diff --git a/services/invitations/pkg/service/v0/service.go b/services/invitations/pkg/service/v0/service.go index 49f68f20b6..fae81deb22 100644 --- a/services/invitations/pkg/service/v0/service.go +++ b/services/invitations/pkg/service/v0/service.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/invitations/pkg/backends/keycloak" "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" "github.com/opencloud-eu/opencloud/services/invitations/pkg/invitations" diff --git a/services/nats/pkg/command/root.go b/services/nats/pkg/command/root.go index ef9b83e321..2a03708e1e 100644 --- a/services/nats/pkg/command/root.go +++ b/services/nats/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/nats/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/nats/pkg/command/server.go b/services/nats/pkg/command/server.go index 18cc1fa8b0..18252a9a12 100644 --- a/services/nats/pkg/command/server.go +++ b/services/nats/pkg/command/server.go @@ -10,8 +10,8 @@ import ( "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - pkgcrypto "github.com/opencloud-eu/opencloud/ocis-pkg/crypto" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + pkgcrypto "github.com/opencloud-eu/opencloud/pkg/crypto" "github.com/opencloud-eu/opencloud/services/nats/pkg/config" "github.com/opencloud-eu/opencloud/services/nats/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/nats/pkg/logging" diff --git a/services/nats/pkg/config/config.go b/services/nats/pkg/config/config.go index 36002c440a..77cbe19e0c 100644 --- a/services/nats/pkg/config/config.go +++ b/services/nats/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/nats/pkg/config/defaults/defaultconfig.go b/services/nats/pkg/config/defaults/defaultconfig.go index 0a56fa39d1..e94f9dc9da 100644 --- a/services/nats/pkg/config/defaults/defaultconfig.go +++ b/services/nats/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "path/filepath" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/nats/pkg/config" ) diff --git a/services/nats/pkg/config/parser/parse.go b/services/nats/pkg/config/parser/parse.go index 6963b51000..dccadbf56e 100644 --- a/services/nats/pkg/config/parser/parse.go +++ b/services/nats/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/nats/pkg/config" "github.com/opencloud-eu/opencloud/services/nats/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/nats/pkg/logging/logging.go b/services/nats/pkg/logging/logging.go index f6d515e5c2..e3b93418b9 100644 --- a/services/nats/pkg/logging/logging.go +++ b/services/nats/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/nats/pkg/config" ) diff --git a/services/nats/pkg/logging/nats.go b/services/nats/pkg/logging/nats.go index 6b68b02263..f65fd5f469 100644 --- a/services/nats/pkg/logging/nats.go +++ b/services/nats/pkg/logging/nats.go @@ -3,7 +3,7 @@ package logging import ( "fmt" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) func NewLogWrapper(logger log.Logger) *LogWrapper { diff --git a/services/nats/pkg/server/debug/option.go b/services/nats/pkg/server/debug/option.go index 46fe727dce..fbcbee17f2 100644 --- a/services/nats/pkg/server/debug/option.go +++ b/services/nats/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/nats/pkg/config" ) diff --git a/services/nats/pkg/server/debug/server.go b/services/nats/pkg/server/debug/server.go index 61d8722011..5939241662 100644 --- a/services/nats/pkg/server/debug/server.go +++ b/services/nats/pkg/server/debug/server.go @@ -4,10 +4,10 @@ import ( "net/http" "strconv" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/notifications/pkg/channels/channels.go b/services/notifications/pkg/channels/channels.go index 93c487912f..5430f4a467 100644 --- a/services/notifications/pkg/channels/channels.go +++ b/services/notifications/pkg/channels/channels.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" mail "github.com/xhit/go-simple-mail/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" ) diff --git a/services/notifications/pkg/command/root.go b/services/notifications/pkg/command/root.go index c3faab2240..977796e618 100644 --- a/services/notifications/pkg/command/root.go +++ b/services/notifications/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/notifications/pkg/command/server.go b/services/notifications/pkg/command/server.go index b83eb3452e..2dc0a565d2 100644 --- a/services/notifications/pkg/command/server.go +++ b/services/notifications/pkg/command/server.go @@ -3,10 +3,11 @@ package command import ( "context" "fmt" + "reflect" + "github.com/cs3org/reva/v2/pkg/store" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" microstore "go-micro.dev/v4/store" - "reflect" "github.com/oklog/run" "github.com/urfave/cli/v2" @@ -15,10 +16,10 @@ import ( "github.com/cs3org/reva/v2/pkg/events/stream" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/notifications/pkg/channels" "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" diff --git a/services/notifications/pkg/config/config.go b/services/notifications/pkg/config/config.go index 98b136faca..a1db5f072d 100644 --- a/services/notifications/pkg/config/config.go +++ b/services/notifications/pkg/config/config.go @@ -5,7 +5,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/notifications/pkg/config/defaults/defaultconfig.go b/services/notifications/pkg/config/defaults/defaultconfig.go index 0741175cf1..463d210bb2 100644 --- a/services/notifications/pkg/config/defaults/defaultconfig.go +++ b/services/notifications/pkg/config/defaults/defaultconfig.go @@ -1,10 +1,11 @@ package defaults import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" - "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" "time" + + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/notifications/pkg/config/parser/parse.go b/services/notifications/pkg/config/parser/parse.go index eaf20392a4..bbf83a2b57 100644 --- a/services/notifications/pkg/config/parser/parse.go +++ b/services/notifications/pkg/config/parser/parse.go @@ -6,13 +6,13 @@ import ( "net/mail" "strings" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" "github.com/opencloud-eu/opencloud/services/notifications/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/notifications/pkg/logging" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/notifications/pkg/config/tracing.go b/services/notifications/pkg/config/tracing.go index b4ae8dc0f7..9c9e50849c 100644 --- a/services/notifications/pkg/config/tracing.go +++ b/services/notifications/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/notifications/pkg/email/composer.go b/services/notifications/pkg/email/composer.go index e35cab2040..a9aad3dc68 100644 --- a/services/notifications/pkg/email/composer.go +++ b/services/notifications/pkg/email/composer.go @@ -3,11 +3,12 @@ package email import ( "bytes" "embed" - "github.com/pkg/errors" "strings" "text/template" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + "github.com/pkg/errors" + + "github.com/opencloud-eu/opencloud/pkg/l10n" ) var ( diff --git a/services/notifications/pkg/email/templates.go b/services/notifications/pkg/email/templates.go index c640b8ed4e..83eff3da21 100644 --- a/services/notifications/pkg/email/templates.go +++ b/services/notifications/pkg/email/templates.go @@ -1,6 +1,6 @@ package email -import "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" +import "github.com/opencloud-eu/opencloud/pkg/l10n" const ( _textTemplate = "templates/text/email.text.tmpl" diff --git a/services/notifications/pkg/logging/logging.go b/services/notifications/pkg/logging/logging.go index 20a290c7f6..1c33af7700 100644 --- a/services/notifications/pkg/logging/logging.go +++ b/services/notifications/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" ) diff --git a/services/notifications/pkg/server/debug/option.go b/services/notifications/pkg/server/debug/option.go index 9f2a708b9c..6ea7f21bca 100644 --- a/services/notifications/pkg/server/debug/option.go +++ b/services/notifications/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" ) diff --git a/services/notifications/pkg/server/debug/server.go b/services/notifications/pkg/server/debug/server.go index 3b3ad9fe6c..bc9fb202dc 100644 --- a/services/notifications/pkg/server/debug/server.go +++ b/services/notifications/pkg/server/debug/server.go @@ -4,10 +4,10 @@ import ( "net/http" "strconv" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/notifications/pkg/service/filter.go b/services/notifications/pkg/service/filter.go index fcfe616410..f188691019 100644 --- a/services/notifications/pkg/service/filter.go +++ b/services/notifications/pkg/service/filter.go @@ -3,9 +3,10 @@ package service import ( "context" "errors" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/middleware" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" micrometadata "go-micro.dev/v4/metadata" ) diff --git a/services/notifications/pkg/service/filter_test.go b/services/notifications/pkg/service/filter_test.go index 90ff8d4992..560cc6b7cc 100644 --- a/services/notifications/pkg/service/filter_test.go +++ b/services/notifications/pkg/service/filter_test.go @@ -2,14 +2,15 @@ package service import ( "context" + "testing" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" settings "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "go-micro.dev/v4/client" - "testing" ) var testLogger = log.NewLogger() diff --git a/services/notifications/pkg/service/job.go b/services/notifications/pkg/service/job.go index 780bf51bce..0eaced8ebe 100644 --- a/services/notifications/pkg/service/job.go +++ b/services/notifications/pkg/service/job.go @@ -2,8 +2,9 @@ package service import ( "context" + "github.com/cs3org/reva/v2/pkg/events" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/l10n" ehmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0" "github.com/opencloud-eu/opencloud/services/notifications/pkg/channels" "github.com/opencloud-eu/opencloud/services/notifications/pkg/email" diff --git a/services/notifications/pkg/service/notification_suite_test.go b/services/notifications/pkg/service/notification_suite_test.go index 0dcde57955..16841667a0 100644 --- a/services/notifications/pkg/service/notification_suite_test.go +++ b/services/notifications/pkg/service/notification_suite_test.go @@ -3,7 +3,7 @@ package service_test import ( "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/registry" mRegistry "go-micro.dev/v4/registry" . "github.com/onsi/ginkgo/v2" diff --git a/services/notifications/pkg/service/persistence.go b/services/notifications/pkg/service/persistence.go index 4e6ecacd5a..626e6958f2 100644 --- a/services/notifications/pkg/service/persistence.go +++ b/services/notifications/pkg/service/persistence.go @@ -3,8 +3,9 @@ package service import ( "context" "encoding/json" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" "github.com/pkg/errors" diff --git a/services/notifications/pkg/service/service.go b/services/notifications/pkg/service/service.go index 4219512d83..3677a3449a 100644 --- a/services/notifications/pkg/service/service.go +++ b/services/notifications/pkg/service/service.go @@ -4,8 +4,6 @@ import ( "context" "errors" "fmt" - ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" - "go-micro.dev/v4/store" "net/url" "os" "os/signal" @@ -13,6 +11,9 @@ import ( "strings" "syscall" + ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" + "go-micro.dev/v4/store" + gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" @@ -24,9 +25,9 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/middleware" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/notifications/pkg/channels" "github.com/opencloud-eu/opencloud/services/notifications/pkg/email" diff --git a/services/notifications/pkg/service/service_test.go b/services/notifications/pkg/service/service_test.go index 141e855fe6..840241ab63 100644 --- a/services/notifications/pkg/service/service_test.go +++ b/services/notifications/pkg/service/service_test.go @@ -2,9 +2,10 @@ package service_test import ( "context" + "time" + "github.com/cs3org/reva/v2/pkg/store" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" - "time" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" @@ -16,8 +17,8 @@ import ( cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/shared" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/notifications/pkg/channels" diff --git a/services/notifications/pkg/service/splitter.go b/services/notifications/pkg/service/splitter.go index b588809e93..2903680ed4 100644 --- a/services/notifications/pkg/service/splitter.go +++ b/services/notifications/pkg/service/splitter.go @@ -2,9 +2,10 @@ package service import ( "context" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/middleware" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults" "github.com/pkg/errors" diff --git a/services/notifications/pkg/service/splitter_test.go b/services/notifications/pkg/service/splitter_test.go index 4715ba214a..f2febfb70b 100644 --- a/services/notifications/pkg/service/splitter_test.go +++ b/services/notifications/pkg/service/splitter_test.go @@ -2,16 +2,17 @@ package service import ( "context" + "strings" + "testing" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" settings "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "go-micro.dev/v4/client" - "strings" - "testing" ) func Test_intervalSplitter_execute(t *testing.T) { diff --git a/services/ocdav/pkg/command/health.go b/services/ocdav/pkg/command/health.go index 3bfdebd4e6..f445109c71 100644 --- a/services/ocdav/pkg/command/health.go +++ b/services/ocdav/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/logging" diff --git a/services/ocdav/pkg/command/root.go b/services/ocdav/pkg/command/root.go index a7a58cc322..5e4f236983 100644 --- a/services/ocdav/pkg/command/root.go +++ b/services/ocdav/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/ocdav/pkg/command/server.go b/services/ocdav/pkg/command/server.go index a6820ffdbd..b1ba4a2d48 100644 --- a/services/ocdav/pkg/command/server.go +++ b/services/ocdav/pkg/command/server.go @@ -7,11 +7,11 @@ import ( "github.com/cs3org/reva/v2/pkg/micro/ocdav" "github.com/cs3org/reva/v2/pkg/sharedconf" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/broker" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/broker" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/logging" diff --git a/services/ocdav/pkg/command/version.go b/services/ocdav/pkg/command/version.go index bcad60e4a2..4a8c515cc3 100644 --- a/services/ocdav/pkg/command/version.go +++ b/services/ocdav/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" diff --git a/services/ocdav/pkg/config/config.go b/services/ocdav/pkg/config/config.go index fca1ca6024..cd9e12c643 100644 --- a/services/ocdav/pkg/config/config.go +++ b/services/ocdav/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/ocdav/pkg/config/defaults/defaultconfig.go b/services/ocdav/pkg/config/defaults/defaultconfig.go index a40d0d7680..09d06c6e55 100644 --- a/services/ocdav/pkg/config/defaults/defaultconfig.go +++ b/services/ocdav/pkg/config/defaults/defaultconfig.go @@ -1,9 +1,9 @@ package defaults import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" ) diff --git a/services/ocdav/pkg/config/parser/parse.go b/services/ocdav/pkg/config/parser/parse.go index b31ccd9f6c..a045d36f16 100644 --- a/services/ocdav/pkg/config/parser/parse.go +++ b/services/ocdav/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/ocdav/pkg/config/tracing.go b/services/ocdav/pkg/config/tracing.go index 9f1b5cc7ae..bbc339a96d 100644 --- a/services/ocdav/pkg/config/tracing.go +++ b/services/ocdav/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/ocdav/pkg/logging/logging.go b/services/ocdav/pkg/logging/logging.go index 953bb0e3ab..b074da8c09 100644 --- a/services/ocdav/pkg/logging/logging.go +++ b/services/ocdav/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" ) diff --git a/services/ocdav/pkg/server/debug/option.go b/services/ocdav/pkg/server/debug/option.go index 3aecf2e09e..81945b1ef6 100644 --- a/services/ocdav/pkg/server/debug/option.go +++ b/services/ocdav/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" ) diff --git a/services/ocdav/pkg/server/debug/server.go b/services/ocdav/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/ocdav/pkg/server/debug/server.go +++ b/services/ocdav/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/ocm/pkg/command/root.go b/services/ocm/pkg/command/root.go index 03c6bfb0f1..9c07cb9550 100644 --- a/services/ocm/pkg/command/root.go +++ b/services/ocm/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/ocm/pkg/command/server.go b/services/ocm/pkg/command/server.go index b5fad3e6b4..36aa80b396 100644 --- a/services/ocm/pkg/command/server.go +++ b/services/ocm/pkg/command/server.go @@ -9,10 +9,10 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" "github.com/opencloud-eu/opencloud/services/ocm/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/ocm/pkg/logging" diff --git a/services/ocm/pkg/config/config.go b/services/ocm/pkg/config/config.go index 758c81b98a..efb18a6ae6 100644 --- a/services/ocm/pkg/config/config.go +++ b/services/ocm/pkg/config/config.go @@ -6,7 +6,7 @@ import ( "go-micro.dev/v4/client" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/ocm/pkg/config/defaults/defaultconfig.go b/services/ocm/pkg/config/defaults/defaultconfig.go index e31e0be018..e90415b82d 100644 --- a/services/ocm/pkg/config/defaults/defaultconfig.go +++ b/services/ocm/pkg/config/defaults/defaultconfig.go @@ -4,9 +4,9 @@ import ( "path/filepath" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" ) diff --git a/services/ocm/pkg/config/parser/parse.go b/services/ocm/pkg/config/parser/parse.go index adb4aadbd6..3a2b363ab4 100644 --- a/services/ocm/pkg/config/parser/parse.go +++ b/services/ocm/pkg/config/parser/parse.go @@ -3,13 +3,13 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" "github.com/opencloud-eu/opencloud/services/ocm/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/ocm/pkg/config/tracing.go b/services/ocm/pkg/config/tracing.go index d86c9a5c4a..849921b5a8 100644 --- a/services/ocm/pkg/config/tracing.go +++ b/services/ocm/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/ocm/pkg/logging/logging.go b/services/ocm/pkg/logging/logging.go index 3d3e0c1312..6ff4a3a3e3 100644 --- a/services/ocm/pkg/logging/logging.go +++ b/services/ocm/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" ) diff --git a/services/ocm/pkg/revaconfig/config.go b/services/ocm/pkg/revaconfig/config.go index 22bf3afec5..55b2f9029f 100644 --- a/services/ocm/pkg/revaconfig/config.go +++ b/services/ocm/pkg/revaconfig/config.go @@ -4,7 +4,7 @@ import ( "math" "net/url" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" ) diff --git a/services/ocm/pkg/server/debug/option.go b/services/ocm/pkg/server/debug/option.go index 7f27ab1666..bfee85b6a4 100644 --- a/services/ocm/pkg/server/debug/option.go +++ b/services/ocm/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" ) diff --git a/services/ocm/pkg/server/debug/server.go b/services/ocm/pkg/server/debug/server.go index 6447fdaa39..cb738fcd21 100644 --- a/services/ocm/pkg/server/debug/server.go +++ b/services/ocm/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/ocs/pkg/command/health.go b/services/ocs/pkg/command/health.go index d8444512e2..a0ef467e8d 100644 --- a/services/ocs/pkg/command/health.go +++ b/services/ocs/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/ocs/pkg/logging" diff --git a/services/ocs/pkg/command/root.go b/services/ocs/pkg/command/root.go index 1a3d8d70e5..aeb24a129c 100644 --- a/services/ocs/pkg/command/root.go +++ b/services/ocs/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/ocs/pkg/command/server.go b/services/ocs/pkg/command/server.go index ec15836481..dbf8c3c5d3 100644 --- a/services/ocs/pkg/command/server.go +++ b/services/ocs/pkg/command/server.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/ocs/pkg/logging" diff --git a/services/ocs/pkg/command/version.go b/services/ocs/pkg/command/version.go index 92927fc0fd..e11fc599ca 100644 --- a/services/ocs/pkg/command/version.go +++ b/services/ocs/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" diff --git a/services/ocs/pkg/config/config.go b/services/ocs/pkg/config/config.go index e0ad547036..7343bf6371 100644 --- a/services/ocs/pkg/config/config.go +++ b/services/ocs/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" "go-micro.dev/v4/client" ) diff --git a/services/ocs/pkg/config/defaults/defaultconfig.go b/services/ocs/pkg/config/defaults/defaultconfig.go index 4fd4baf943..41a6101c2d 100644 --- a/services/ocs/pkg/config/defaults/defaultconfig.go +++ b/services/ocs/pkg/config/defaults/defaultconfig.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" ) diff --git a/services/ocs/pkg/config/http.go b/services/ocs/pkg/config/http.go index d2ca4d3d58..ecbf649b17 100644 --- a/services/ocs/pkg/config/http.go +++ b/services/ocs/pkg/config/http.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // HTTP defines the available http configuration. type HTTP struct { diff --git a/services/ocs/pkg/config/parser/parse.go b/services/ocs/pkg/config/parser/parse.go index c6ea0c77b4..f0e858cc72 100644 --- a/services/ocs/pkg/config/parser/parse.go +++ b/services/ocs/pkg/config/parser/parse.go @@ -6,10 +6,10 @@ import ( "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config/defaults" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/ocs/pkg/config/tracing.go b/services/ocs/pkg/config/tracing.go index 7bc18db181..6ed9be04c2 100644 --- a/services/ocs/pkg/config/tracing.go +++ b/services/ocs/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/ocs/pkg/logging/logging.go b/services/ocs/pkg/logging/logging.go index 5ec6192193..f6970a2a83 100644 --- a/services/ocs/pkg/logging/logging.go +++ b/services/ocs/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" ) diff --git a/services/ocs/pkg/server/debug/option.go b/services/ocs/pkg/server/debug/option.go index c1fa1cc3c5..f15008c8fe 100644 --- a/services/ocs/pkg/server/debug/option.go +++ b/services/ocs/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" ) diff --git a/services/ocs/pkg/server/debug/server.go b/services/ocs/pkg/server/debug/server.go index 15cd147054..848a6032ef 100644 --- a/services/ocs/pkg/server/debug/server.go +++ b/services/ocs/pkg/server/debug/server.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/ocs/pkg/server/http/option.go b/services/ocs/pkg/server/http/option.go index 887db1cbbc..3ec05cd75c 100644 --- a/services/ocs/pkg/server/http/option.go +++ b/services/ocs/pkg/server/http/option.go @@ -3,7 +3,7 @@ package http import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" "github.com/opencloud-eu/opencloud/services/ocs/pkg/metrics" "github.com/urfave/cli/v2" diff --git a/services/ocs/pkg/server/http/server.go b/services/ocs/pkg/server/http/server.go index 94e96c3756..f28575328e 100644 --- a/services/ocs/pkg/server/http/server.go +++ b/services/ocs/pkg/server/http/server.go @@ -2,12 +2,13 @@ package http import ( "fmt" + "github.com/cs3org/reva/v2/pkg/store" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/version" svc "github.com/opencloud-eu/opencloud/services/ocs/pkg/service/v0" "go-micro.dev/v4" microstore "go-micro.dev/v4/store" diff --git a/services/ocs/pkg/service/v0/logging.go b/services/ocs/pkg/service/v0/logging.go index c883a367ef..c21734ce11 100644 --- a/services/ocs/pkg/service/v0/logging.go +++ b/services/ocs/pkg/service/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/services/ocs/pkg/service/v0/option.go b/services/ocs/pkg/service/v0/option.go index d8e211f86c..103d5f1f0d 100644 --- a/services/ocs/pkg/service/v0/option.go +++ b/services/ocs/pkg/service/v0/option.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" "go-micro.dev/v4/store" ) diff --git a/services/ocs/pkg/service/v0/service.go b/services/ocs/pkg/service/v0/service.go index 806c188153..9e02d7db23 100644 --- a/services/ocs/pkg/service/v0/service.go +++ b/services/ocs/pkg/service/v0/service.go @@ -7,9 +7,9 @@ import ( "github.com/go-chi/chi/v5/middleware" "github.com/go-chi/render" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - opkgm "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/account" + "github.com/opencloud-eu/opencloud/pkg/log" + opkgm "github.com/opencloud-eu/opencloud/pkg/middleware" "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" ocsm "github.com/opencloud-eu/opencloud/services/ocs/pkg/middleware" "github.com/opencloud-eu/opencloud/services/ocs/pkg/service/v0/data" diff --git a/services/ocs/pkg/service/v0/tracing.go b/services/ocs/pkg/service/v0/tracing.go index 078f5841ca..7e017ffe4f 100644 --- a/services/ocs/pkg/service/v0/tracing.go +++ b/services/ocs/pkg/service/v0/tracing.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/middleware" ) // NewTracing returns a service that instruments traces. diff --git a/services/policies/pkg/command/health.go b/services/policies/pkg/command/health.go index 98440f030b..77c53ce6de 100644 --- a/services/policies/pkg/command/health.go +++ b/services/policies/pkg/command/health.go @@ -2,10 +2,11 @@ package command import ( "fmt" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/log" + + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/policies/pkg/config" "github.com/opencloud-eu/opencloud/services/policies/pkg/config/parser" "github.com/urfave/cli/v2" diff --git a/services/policies/pkg/command/root.go b/services/policies/pkg/command/root.go index 31f11405f9..8e0a034d65 100644 --- a/services/policies/pkg/command/root.go +++ b/services/policies/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/policies/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/policies/pkg/command/server.go b/services/policies/pkg/command/server.go index 7219fa5dfa..be300bb06e 100644 --- a/services/policies/pkg/command/server.go +++ b/services/policies/pkg/command/server.go @@ -8,11 +8,11 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" svcProtogen "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0" "github.com/opencloud-eu/opencloud/services/policies/pkg/config" "github.com/opencloud-eu/opencloud/services/policies/pkg/config/parser" diff --git a/services/policies/pkg/command/version.go b/services/policies/pkg/command/version.go index 1d3b61454d..561fc7de83 100644 --- a/services/policies/pkg/command/version.go +++ b/services/policies/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/policies/pkg/config" diff --git a/services/policies/pkg/config/config.go b/services/policies/pkg/config/config.go index f9e5ca190c..2e51b448bc 100644 --- a/services/policies/pkg/config/config.go +++ b/services/policies/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/policies/pkg/config/defaults/defaultconfig.go b/services/policies/pkg/config/defaults/defaultconfig.go index 15eae9d372..942b748349 100644 --- a/services/policies/pkg/config/defaults/defaultconfig.go +++ b/services/policies/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/policies/pkg/config" ) diff --git a/services/policies/pkg/config/parser/parse.go b/services/policies/pkg/config/parser/parse.go index f10ec1c83a..89a0f48364 100644 --- a/services/policies/pkg/config/parser/parse.go +++ b/services/policies/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/policies/pkg/config" "github.com/opencloud-eu/opencloud/services/policies/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/policies/pkg/config/tracing.go b/services/policies/pkg/config/tracing.go index 7dfe60e06e..f1afd0e875 100644 --- a/services/policies/pkg/config/tracing.go +++ b/services/policies/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/policies/pkg/engine/opa/engine.go b/services/policies/pkg/engine/opa/engine.go index 122410809a..79f5187d51 100644 --- a/services/policies/pkg/engine/opa/engine.go +++ b/services/policies/pkg/engine/opa/engine.go @@ -9,7 +9,7 @@ import ( "github.com/open-policy-agent/opa/rego" "github.com/open-policy-agent/opa/topdown/print" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/policies/pkg/config" "github.com/opencloud-eu/opencloud/services/policies/pkg/engine" ) diff --git a/services/policies/pkg/engine/opa/opa.go b/services/policies/pkg/engine/opa/opa.go index ea2d6db832..45eb8be1dc 100644 --- a/services/policies/pkg/engine/opa/opa.go +++ b/services/policies/pkg/engine/opa/opa.go @@ -3,7 +3,7 @@ package opa import ( "github.com/open-policy-agent/opa/topdown/print" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) type logPrinter struct { diff --git a/services/policies/pkg/server/debug/option.go b/services/policies/pkg/server/debug/option.go index a98321641b..7c88b89b40 100644 --- a/services/policies/pkg/server/debug/option.go +++ b/services/policies/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/policies/pkg/config" ) diff --git a/services/policies/pkg/server/debug/server.go b/services/policies/pkg/server/debug/server.go index ec4670a908..57a232dd05 100644 --- a/services/policies/pkg/server/debug/server.go +++ b/services/policies/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/policies/pkg/service/event/service.go b/services/policies/pkg/service/event/service.go index 3cd44284f3..fda9e2816f 100644 --- a/services/policies/pkg/service/event/service.go +++ b/services/policies/pkg/service/event/service.go @@ -4,7 +4,7 @@ import ( "context" "github.com/cs3org/reva/v2/pkg/events" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/policies/pkg/engine" "go.opentelemetry.io/otel/trace" ) diff --git a/services/postprocessing/pkg/command/postprocessing.go b/services/postprocessing/pkg/command/postprocessing.go index 79c54f9959..fc6b3500c7 100644 --- a/services/postprocessing/pkg/command/postprocessing.go +++ b/services/postprocessing/pkg/command/postprocessing.go @@ -6,7 +6,7 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/events/stream" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/parser" "github.com/urfave/cli/v2" diff --git a/services/postprocessing/pkg/command/root.go b/services/postprocessing/pkg/command/root.go index fc7e2c5afd..4172de3ff4 100644 --- a/services/postprocessing/pkg/command/root.go +++ b/services/postprocessing/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/postprocessing/pkg/command/server.go b/services/postprocessing/pkg/command/server.go index d7ec402bd2..77dc311b2a 100644 --- a/services/postprocessing/pkg/command/server.go +++ b/services/postprocessing/pkg/command/server.go @@ -11,7 +11,7 @@ import ( "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/tracing" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/logging" diff --git a/services/postprocessing/pkg/config/config.go b/services/postprocessing/pkg/config/config.go index b7ae129d60..b873989c75 100644 --- a/services/postprocessing/pkg/config/config.go +++ b/services/postprocessing/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/postprocessing/pkg/config/parser/parse.go b/services/postprocessing/pkg/config/parser/parse.go index 76e14e555b..8e1ae2220e 100644 --- a/services/postprocessing/pkg/config/parser/parse.go +++ b/services/postprocessing/pkg/config/parser/parse.go @@ -6,11 +6,11 @@ import ( "strings" "github.com/cs3org/reva/v2/pkg/events" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/postprocessing/pkg/config/tracing.go b/services/postprocessing/pkg/config/tracing.go index af9e833320..0ec3f8bcfc 100644 --- a/services/postprocessing/pkg/config/tracing.go +++ b/services/postprocessing/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/postprocessing/pkg/logging/logging.go b/services/postprocessing/pkg/logging/logging.go index a954aca5d3..98468ab7e8 100644 --- a/services/postprocessing/pkg/logging/logging.go +++ b/services/postprocessing/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" ) diff --git a/services/postprocessing/pkg/server/debug/option.go b/services/postprocessing/pkg/server/debug/option.go index 7e9b82efd2..0847832df9 100644 --- a/services/postprocessing/pkg/server/debug/option.go +++ b/services/postprocessing/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" ) diff --git a/services/postprocessing/pkg/server/debug/server.go b/services/postprocessing/pkg/server/debug/server.go index 0c0504adf5..e512688d1d 100644 --- a/services/postprocessing/pkg/server/debug/server.go +++ b/services/postprocessing/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/postprocessing/pkg/service/service.go b/services/postprocessing/pkg/service/service.go index 605ee6aaa9..db741e4ca8 100644 --- a/services/postprocessing/pkg/service/service.go +++ b/services/postprocessing/pkg/service/service.go @@ -11,7 +11,7 @@ import ( ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/postprocessing" "go-micro.dev/v4/store" diff --git a/services/proxy/pkg/command/health.go b/services/proxy/pkg/command/health.go index 922288da94..28bbe2841c 100644 --- a/services/proxy/pkg/command/health.go +++ b/services/proxy/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/proxy/pkg/logging" diff --git a/services/proxy/pkg/command/root.go b/services/proxy/pkg/command/root.go index 188cef70d4..55d9ee59f3 100644 --- a/services/proxy/pkg/command/root.go +++ b/services/proxy/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/proxy/pkg/command/server.go b/services/proxy/pkg/command/server.go index 3784332a94..2c714fc7b7 100644 --- a/services/proxy/pkg/command/server.go +++ b/services/proxy/pkg/command/server.go @@ -15,14 +15,14 @@ import ( chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/justinas/alice" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - pkgmiddleware "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/log" + pkgmiddleware "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" policiessvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" diff --git a/services/proxy/pkg/command/version.go b/services/proxy/pkg/command/version.go index c405dd9026..ac6529365a 100644 --- a/services/proxy/pkg/command/version.go +++ b/services/proxy/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" diff --git a/services/proxy/pkg/config/config.go b/services/proxy/pkg/config/config.go index ac3a9d09cb..ebdbbf8660 100644 --- a/services/proxy/pkg/config/config.go +++ b/services/proxy/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" "go-micro.dev/v4/client" ) diff --git a/services/proxy/pkg/config/defaults/defaultconfig.go b/services/proxy/pkg/config/defaults/defaultconfig.go index ee511ee8cc..bb555cec6e 100644 --- a/services/proxy/pkg/config/defaults/defaultconfig.go +++ b/services/proxy/pkg/config/defaults/defaultconfig.go @@ -7,9 +7,9 @@ import ( "strings" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) diff --git a/services/proxy/pkg/config/parser/parse.go b/services/proxy/pkg/config/parser/parse.go index 14551f636f..9115ab9ef8 100644 --- a/services/proxy/pkg/config/parser/parse.go +++ b/services/proxy/pkg/config/parser/parse.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/proxy/pkg/config/tracing.go b/services/proxy/pkg/config/tracing.go index f74529e59e..ee5f013601 100644 --- a/services/proxy/pkg/config/tracing.go +++ b/services/proxy/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/proxy/pkg/logging/logging.go b/services/proxy/pkg/logging/logging.go index 2e249093b9..79d37447d4 100644 --- a/services/proxy/pkg/logging/logging.go +++ b/services/proxy/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) diff --git a/services/proxy/pkg/middleware/accesslog.go b/services/proxy/pkg/middleware/accesslog.go index 88fc7e2cdd..23c58f4d24 100644 --- a/services/proxy/pkg/middleware/accesslog.go +++ b/services/proxy/pkg/middleware/accesslog.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-chi/chi/v5/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "go.opentelemetry.io/otel/trace" ) diff --git a/services/proxy/pkg/middleware/account_resolver.go b/services/proxy/pkg/middleware/account_resolver.go index 15da7b4a96..c5bd10dead 100644 --- a/services/proxy/pkg/middleware/account_resolver.go +++ b/services/proxy/pkg/middleware/account_resolver.go @@ -13,8 +13,8 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/oidc" ) // AccountResolver provides a middleware which mints a jwt and adds it to the proxied request based diff --git a/services/proxy/pkg/middleware/account_resolver_test.go b/services/proxy/pkg/middleware/account_resolver_test.go index a827c87f07..883aa2f87f 100644 --- a/services/proxy/pkg/middleware/account_resolver_test.go +++ b/services/proxy/pkg/middleware/account_resolver_test.go @@ -10,8 +10,8 @@ import ( "github.com/cs3org/reva/v2/pkg/auth/scope" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/token/manager/jwt" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend" "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend/mocks" userRoleMocks "github.com/opencloud-eu/opencloud/services/proxy/pkg/userroles/mocks" diff --git a/services/proxy/pkg/middleware/app_auth.go b/services/proxy/pkg/middleware/app_auth.go index 7f422db942..708b27e473 100644 --- a/services/proxy/pkg/middleware/app_auth.go +++ b/services/proxy/pkg/middleware/app_auth.go @@ -7,7 +7,7 @@ import ( cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // AppAuthAuthenticator defines the app auth authenticator diff --git a/services/proxy/pkg/middleware/app_auth_test.go b/services/proxy/pkg/middleware/app_auth_test.go index 91d5b26be5..7e6850d747 100644 --- a/services/proxy/pkg/middleware/app_auth_test.go +++ b/services/proxy/pkg/middleware/app_auth_test.go @@ -11,7 +11,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) var _ = Describe("Authenticating requests", Label("AppAuthAuthenticator"), func() { diff --git a/services/proxy/pkg/middleware/authentication_test.go b/services/proxy/pkg/middleware/authentication_test.go index 74c27a9c2f..98dc6579fd 100644 --- a/services/proxy/pkg/middleware/authentication_test.go +++ b/services/proxy/pkg/middleware/authentication_test.go @@ -13,9 +13,9 @@ import ( "github.com/golang-jwt/jwt/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" - oidcmocks "github.com/opencloud-eu/opencloud/ocis-pkg/oidc/mocks" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/oidc" + oidcmocks "github.com/opencloud-eu/opencloud/pkg/oidc/mocks" "github.com/opencloud-eu/opencloud/services/proxy/pkg/router" "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend" "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend/mocks" diff --git a/services/proxy/pkg/middleware/basic_auth.go b/services/proxy/pkg/middleware/basic_auth.go index 2b42a3b6fb..36bbdfe84d 100644 --- a/services/proxy/pkg/middleware/basic_auth.go +++ b/services/proxy/pkg/middleware/basic_auth.go @@ -3,8 +3,8 @@ package middleware import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend" ) diff --git a/services/proxy/pkg/middleware/basic_auth_test.go b/services/proxy/pkg/middleware/basic_auth_test.go index e8d8eaf235..d8981a3be5 100644 --- a/services/proxy/pkg/middleware/basic_auth_test.go +++ b/services/proxy/pkg/middleware/basic_auth_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/mock" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend" "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend/mocks" ) diff --git a/services/proxy/pkg/middleware/context_logger.go b/services/proxy/pkg/middleware/context_logger.go index c22ae0d79f..5f8fd326d8 100644 --- a/services/proxy/pkg/middleware/context_logger.go +++ b/services/proxy/pkg/middleware/context_logger.go @@ -3,7 +3,7 @@ package middleware import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // ContextLogger is a middleware to use a logger associated with the request's diff --git a/services/proxy/pkg/middleware/create_home.go b/services/proxy/pkg/middleware/create_home.go index d95a904b5d..a039028d48 100644 --- a/services/proxy/pkg/middleware/create_home.go +++ b/services/proxy/pkg/middleware/create_home.go @@ -12,7 +12,7 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" "google.golang.org/grpc/metadata" ) diff --git a/services/proxy/pkg/middleware/oidc_auth.go b/services/proxy/pkg/middleware/oidc_auth.go index 7ba0dc88b1..dacc17dd7c 100644 --- a/services/proxy/pkg/middleware/oidc_auth.go +++ b/services/proxy/pkg/middleware/oidc_auth.go @@ -9,8 +9,8 @@ import ( "time" "github.com/golang-jwt/jwt/v5" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/pkg/errors" "github.com/shamaton/msgpack/v2" store "go-micro.dev/v4/store" diff --git a/services/proxy/pkg/middleware/oidc_auth_test.go b/services/proxy/pkg/middleware/oidc_auth_test.go index 68c70b5bfb..d5dd5ee08b 100644 --- a/services/proxy/pkg/middleware/oidc_auth_test.go +++ b/services/proxy/pkg/middleware/oidc_auth_test.go @@ -8,9 +8,9 @@ import ( "github.com/golang-jwt/jwt/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" - oidcmocks "github.com/opencloud-eu/opencloud/ocis-pkg/oidc/mocks" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/oidc" + oidcmocks "github.com/opencloud-eu/opencloud/pkg/oidc/mocks" "github.com/stretchr/testify/mock" "go-micro.dev/v4/store" ) diff --git a/services/proxy/pkg/middleware/options.go b/services/proxy/pkg/middleware/options.go index 8e3937b27b..c52ca98c19 100644 --- a/services/proxy/pkg/middleware/options.go +++ b/services/proxy/pkg/middleware/options.go @@ -7,8 +7,8 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/oidc" policiessvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" diff --git a/services/proxy/pkg/middleware/public_share_auth.go b/services/proxy/pkg/middleware/public_share_auth.go index db70b48201..3dd2078540 100644 --- a/services/proxy/pkg/middleware/public_share_auth.go +++ b/services/proxy/pkg/middleware/public_share_auth.go @@ -6,7 +6,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) const ( diff --git a/services/proxy/pkg/middleware/public_share_auth_test.go b/services/proxy/pkg/middleware/public_share_auth_test.go index e202e15fb0..f3371d8afc 100644 --- a/services/proxy/pkg/middleware/public_share_auth_test.go +++ b/services/proxy/pkg/middleware/public_share_auth_test.go @@ -11,7 +11,7 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "google.golang.org/grpc" ) diff --git a/services/proxy/pkg/middleware/selector_cookie.go b/services/proxy/pkg/middleware/selector_cookie.go index 1f8599af62..d5117e64fe 100644 --- a/services/proxy/pkg/middleware/selector_cookie.go +++ b/services/proxy/pkg/middleware/selector_cookie.go @@ -3,8 +3,8 @@ package middleware import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/proxy/policy" ) diff --git a/services/proxy/pkg/middleware/signed_url_auth.go b/services/proxy/pkg/middleware/signed_url_auth.go index e3b4544c32..3b8eca3010 100644 --- a/services/proxy/pkg/middleware/signed_url_auth.go +++ b/services/proxy/pkg/middleware/signed_url_auth.go @@ -11,7 +11,7 @@ import ( "time" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend" "github.com/opencloud-eu/opencloud/services/proxy/pkg/userroles" diff --git a/services/proxy/pkg/middleware/tracing.go b/services/proxy/pkg/middleware/tracing.go index 97b94b24c4..e680da90bc 100644 --- a/services/proxy/pkg/middleware/tracing.go +++ b/services/proxy/pkg/middleware/tracing.go @@ -5,7 +5,7 @@ import ( "net/http" chimiddleware "github.com/go-chi/chi/v5/middleware" - pkgtrace "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + pkgtrace "github.com/opencloud-eu/opencloud/pkg/tracing" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/propagation" "go.opentelemetry.io/otel/trace" diff --git a/services/proxy/pkg/proxy/option.go b/services/proxy/pkg/proxy/option.go index 42a3ad5f95..c1a2312125 100644 --- a/services/proxy/pkg/proxy/option.go +++ b/services/proxy/pkg/proxy/option.go @@ -1,7 +1,7 @@ package proxy import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) diff --git a/services/proxy/pkg/proxy/policy/selector.go b/services/proxy/pkg/proxy/policy/selector.go index 0c56740454..ee06147f48 100644 --- a/services/proxy/pkg/proxy/policy/selector.go +++ b/services/proxy/pkg/proxy/policy/selector.go @@ -7,7 +7,7 @@ import ( "sort" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) diff --git a/services/proxy/pkg/proxy/policy/selector_test.go b/services/proxy/pkg/proxy/policy/selector_test.go index bbc95b6ba7..7d79abafd6 100644 --- a/services/proxy/pkg/proxy/policy/selector_test.go +++ b/services/proxy/pkg/proxy/policy/selector_test.go @@ -8,7 +8,7 @@ import ( userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) diff --git a/services/proxy/pkg/proxy/proxy.go b/services/proxy/pkg/proxy/proxy.go index f505fd1c0d..68ca78e220 100644 --- a/services/proxy/pkg/proxy/proxy.go +++ b/services/proxy/pkg/proxy/proxy.go @@ -11,7 +11,7 @@ import ( "os" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/proxy/policy" "github.com/opencloud-eu/opencloud/services/proxy/pkg/router" diff --git a/services/proxy/pkg/proxy/proxy_integration_test.go b/services/proxy/pkg/proxy/proxy_integration_test.go index c876766ac5..57646560a8 100644 --- a/services/proxy/pkg/proxy/proxy_integration_test.go +++ b/services/proxy/pkg/proxy/proxy_integration_test.go @@ -9,8 +9,8 @@ import ( "net/url" "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/router" "go-micro.dev/v4/selector" diff --git a/services/proxy/pkg/router/router.go b/services/proxy/pkg/router/router.go index 90ef2c2eef..e58e6cdd73 100644 --- a/services/proxy/pkg/router/router.go +++ b/services/proxy/pkg/router/router.go @@ -8,7 +8,7 @@ import ( "regexp" "strings" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/proxy/policy" "go-micro.dev/v4/selector" diff --git a/services/proxy/pkg/router/router_test.go b/services/proxy/pkg/router/router_test.go index edad027cee..2ea8d21019 100644 --- a/services/proxy/pkg/router/router_test.go +++ b/services/proxy/pkg/router/router_test.go @@ -9,8 +9,8 @@ import ( "net/url" "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults" "go-micro.dev/v4/selector" diff --git a/services/proxy/pkg/server/debug/option.go b/services/proxy/pkg/server/debug/option.go index 0c5c173519..cfb3ba93b4 100644 --- a/services/proxy/pkg/server/debug/option.go +++ b/services/proxy/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) diff --git a/services/proxy/pkg/server/debug/server.go b/services/proxy/pkg/server/debug/server.go index 1cd011e972..b5d172ed2c 100644 --- a/services/proxy/pkg/server/debug/server.go +++ b/services/proxy/pkg/server/debug/server.go @@ -6,10 +6,10 @@ import ( "github.com/ggwhite/go-masker" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) diff --git a/services/proxy/pkg/server/http/option.go b/services/proxy/pkg/server/http/option.go index fce4df9915..28e3d06267 100644 --- a/services/proxy/pkg/server/http/option.go +++ b/services/proxy/pkg/server/http/option.go @@ -5,7 +5,7 @@ import ( "net/http" "github.com/justinas/alice" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/metrics" "github.com/urfave/cli/v2" diff --git a/services/proxy/pkg/server/http/server.go b/services/proxy/pkg/server/http/server.go index 26e5142653..16b6928c61 100644 --- a/services/proxy/pkg/server/http/server.go +++ b/services/proxy/pkg/server/http/server.go @@ -4,10 +4,10 @@ import ( "fmt" "os" - pkgcrypto "github.com/opencloud-eu/opencloud/ocis-pkg/crypto" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + pkgcrypto "github.com/opencloud-eu/opencloud/pkg/crypto" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/version" "go-micro.dev/v4" ) diff --git a/services/proxy/pkg/staticroutes/backchannellogout.go b/services/proxy/pkg/staticroutes/backchannellogout.go index 663c2fb8eb..bd58e7c066 100644 --- a/services/proxy/pkg/staticroutes/backchannellogout.go +++ b/services/proxy/pkg/staticroutes/backchannellogout.go @@ -8,7 +8,7 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/render" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/pkg/errors" "github.com/shamaton/msgpack/v2" microstore "go-micro.dev/v4/store" diff --git a/services/proxy/pkg/staticroutes/staticroutes.go b/services/proxy/pkg/staticroutes/staticroutes.go index ad7b33a5cd..d68b0161bf 100644 --- a/services/proxy/pkg/staticroutes/staticroutes.go +++ b/services/proxy/pkg/staticroutes/staticroutes.go @@ -5,8 +5,8 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/go-chi/chi/v5" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend" microstore "go-micro.dev/v4/store" diff --git a/services/proxy/pkg/user/backend/cs3.go b/services/proxy/pkg/user/backend/cs3.go index 7e9edc2fdc..1a30089b14 100644 --- a/services/proxy/pkg/user/backend/cs3.go +++ b/services/proxy/pkg/user/backend/cs3.go @@ -14,11 +14,11 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" utils "github.com/cs3org/reva/v2/pkg/utils" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" + libregraph "github.com/owncloud/libre-graph-api-go" "go-micro.dev/v4/selector" ) diff --git a/services/proxy/pkg/userroles/defaultrole.go b/services/proxy/pkg/userroles/defaultrole.go index 83f93eede1..eda0ef8fe7 100644 --- a/services/proxy/pkg/userroles/defaultrole.go +++ b/services/proxy/pkg/userroles/defaultrole.go @@ -5,7 +5,7 @@ import ( cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/middleware" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" settingsService "github.com/opencloud-eu/opencloud/services/settings/pkg/service/v0" "go-micro.dev/v4/metadata" diff --git a/services/proxy/pkg/userroles/oidcroles.go b/services/proxy/pkg/userroles/oidcroles.go index 22f3008cd7..ada72a9645 100644 --- a/services/proxy/pkg/userroles/oidcroles.go +++ b/services/proxy/pkg/userroles/oidcroles.go @@ -8,8 +8,8 @@ import ( cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/oidc" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "go-micro.dev/v4/metadata" ) diff --git a/services/proxy/pkg/userroles/userroles.go b/services/proxy/pkg/userroles/userroles.go index 2e4f79374f..6d20b80d53 100644 --- a/services/proxy/pkg/userroles/userroles.go +++ b/services/proxy/pkg/userroles/userroles.go @@ -6,7 +6,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) diff --git a/services/search/pkg/command/index.go b/services/search/pkg/command/index.go index 3f95c236f3..328ded3ebf 100644 --- a/services/search/pkg/command/index.go +++ b/services/search/pkg/command/index.go @@ -9,9 +9,9 @@ import ( "github.com/urfave/cli/v2" "go-micro.dev/v4/client" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" "github.com/opencloud-eu/opencloud/services/search/pkg/config" "github.com/opencloud-eu/opencloud/services/search/pkg/config/parser" diff --git a/services/search/pkg/command/root.go b/services/search/pkg/command/root.go index 878747e302..a84fb38f57 100644 --- a/services/search/pkg/command/root.go +++ b/services/search/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/search/pkg/config" "github.com/urfave/cli/v2" diff --git a/services/search/pkg/command/server.go b/services/search/pkg/command/server.go index 3f3efe81e4..bbb2c191a8 100644 --- a/services/search/pkg/command/server.go +++ b/services/search/pkg/command/server.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/search/pkg/config" "github.com/opencloud-eu/opencloud/services/search/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/search/pkg/logging" diff --git a/services/search/pkg/command/version.go b/services/search/pkg/command/version.go index 595349eca7..437ab50c11 100644 --- a/services/search/pkg/command/version.go +++ b/services/search/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/search/pkg/config" diff --git a/services/search/pkg/config/config.go b/services/search/pkg/config/config.go index 1b6f88e8d1..463d6defe3 100644 --- a/services/search/pkg/config/config.go +++ b/services/search/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" "go-micro.dev/v4/client" ) diff --git a/services/search/pkg/config/defaults/defaultconfig.go b/services/search/pkg/config/defaults/defaultconfig.go index 751bc15648..7f78f449df 100644 --- a/services/search/pkg/config/defaults/defaultconfig.go +++ b/services/search/pkg/config/defaults/defaultconfig.go @@ -3,9 +3,9 @@ package defaults import ( "path/filepath" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/search/pkg/config" ) diff --git a/services/search/pkg/config/grpc.go b/services/search/pkg/config/grpc.go index 0f54b53883..81038ba663 100644 --- a/services/search/pkg/config/grpc.go +++ b/services/search/pkg/config/grpc.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // GRPCConfig defines the available grpc configuration. type GRPCConfig struct { diff --git a/services/search/pkg/config/parser/parse.go b/services/search/pkg/config/parser/parse.go index 0f00471ca8..07e1f9ea4e 100644 --- a/services/search/pkg/config/parser/parse.go +++ b/services/search/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/search/pkg/config" "github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/search/pkg/config/tracing.go b/services/search/pkg/config/tracing.go index 8e0acc8900..f080f4ab68 100644 --- a/services/search/pkg/config/tracing.go +++ b/services/search/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/search/pkg/content/basic.go b/services/search/pkg/content/basic.go index 22ef984fa8..a80ea1495f 100644 --- a/services/search/pkg/content/basic.go +++ b/services/search/pkg/content/basic.go @@ -7,7 +7,7 @@ import ( storageProvider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" "github.com/cs3org/reva/v2/pkg/tags" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // Basic is the simplest Extractor implementation. diff --git a/services/search/pkg/content/basic_test.go b/services/search/pkg/content/basic_test.go index 80ee13cb46..79ba9c3631 100644 --- a/services/search/pkg/content/basic_test.go +++ b/services/search/pkg/content/basic_test.go @@ -7,7 +7,7 @@ import ( cs3Types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/search/pkg/content" ) diff --git a/services/search/pkg/content/cs3.go b/services/search/pkg/content/cs3.go index f2bd44d6ec..621c68611f 100644 --- a/services/search/pkg/content/cs3.go +++ b/services/search/pkg/content/cs3.go @@ -12,7 +12,7 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) type cs3 struct { diff --git a/services/search/pkg/content/tika.go b/services/search/pkg/content/tika.go index a2a71c56fd..5cc2cd4c93 100644 --- a/services/search/pkg/content/tika.go +++ b/services/search/pkg/content/tika.go @@ -13,9 +13,9 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/google/go-tika/tika" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/search/pkg/config" + libregraph "github.com/owncloud/libre-graph-api-go" ) // Tika is used to extract content from a resource, diff --git a/services/search/pkg/content/tika_test.go b/services/search/pkg/content/tika_test.go index 0d93d7d49c..742fd935a6 100644 --- a/services/search/pkg/content/tika_test.go +++ b/services/search/pkg/content/tika_test.go @@ -14,11 +14,11 @@ import ( . "github.com/onsi/gomega" "github.com/stretchr/testify/mock" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" conf "github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/search/pkg/content" contentMocks "github.com/opencloud-eu/opencloud/services/search/pkg/content/mocks" + libregraph "github.com/owncloud/libre-graph-api-go" ) var _ = Describe("Tika", func() { diff --git a/services/search/pkg/logging/logging.go b/services/search/pkg/logging/logging.go index d20aba54b2..3627d12280 100644 --- a/services/search/pkg/logging/logging.go +++ b/services/search/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/search/pkg/config" ) diff --git a/services/search/pkg/query/bleve/bleve.go b/services/search/pkg/query/bleve/bleve.go index d1dae0ee02..0acbc80095 100644 --- a/services/search/pkg/query/bleve/bleve.go +++ b/services/search/pkg/query/bleve/bleve.go @@ -4,7 +4,7 @@ package bleve import ( bQuery "github.com/blevesearch/bleve/v2/search/query" - "github.com/opencloud-eu/opencloud/ocis-pkg/kql" + "github.com/opencloud-eu/opencloud/pkg/kql" "github.com/opencloud-eu/opencloud/services/search/pkg/query" ) diff --git a/services/search/pkg/query/bleve/compiler.go b/services/search/pkg/query/bleve/compiler.go index 8e2bf7f460..77d151651f 100644 --- a/services/search/pkg/query/bleve/compiler.go +++ b/services/search/pkg/query/bleve/compiler.go @@ -6,8 +6,8 @@ import ( "github.com/blevesearch/bleve/v2" bleveQuery "github.com/blevesearch/bleve/v2/search/query" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" - "github.com/opencloud-eu/opencloud/ocis-pkg/kql" + "github.com/opencloud-eu/opencloud/pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/kql" ) var _fields = map[string]string{ diff --git a/services/search/pkg/query/bleve/compiler_test.go b/services/search/pkg/query/bleve/compiler_test.go index e576fa3906..d450b02550 100644 --- a/services/search/pkg/query/bleve/compiler_test.go +++ b/services/search/pkg/query/bleve/compiler_test.go @@ -5,7 +5,7 @@ import ( "time" "github.com/blevesearch/bleve/v2/search/query" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/ast" tAssert "github.com/stretchr/testify/assert" ) diff --git a/services/search/pkg/query/error.go b/services/search/pkg/query/error.go index 63c8d7be83..2ecafe2aef 100644 --- a/services/search/pkg/query/error.go +++ b/services/search/pkg/query/error.go @@ -3,7 +3,7 @@ package query import ( "fmt" - "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/pkg/ast" ) // StartsWithBinaryOperatorError records an error and the operation that caused it. diff --git a/services/search/pkg/query/query.go b/services/search/pkg/query/query.go index 1692b2f187..bd4091637e 100644 --- a/services/search/pkg/query/query.go +++ b/services/search/pkg/query/query.go @@ -1,7 +1,7 @@ // Package query provides functions to work with the different search query flavours. package query -import "github.com/opencloud-eu/opencloud/ocis-pkg/ast" +import "github.com/opencloud-eu/opencloud/pkg/ast" // Builder is the interface that wraps the basic Build method. type Builder interface { diff --git a/services/search/pkg/search/events.go b/services/search/pkg/search/events.go index 18500fa39b..1b9b6e04a7 100644 --- a/services/search/pkg/search/events.go +++ b/services/search/pkg/search/events.go @@ -6,7 +6,7 @@ import ( provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/search/pkg/config" ) diff --git a/services/search/pkg/search/events_test.go b/services/search/pkg/search/events_test.go index 5e27f524c5..2025f21f89 100644 --- a/services/search/pkg/search/events_test.go +++ b/services/search/pkg/search/events_test.go @@ -8,7 +8,7 @@ import ( "github.com/cs3org/reva/v2/pkg/events" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/search/pkg/config" "github.com/opencloud-eu/opencloud/services/search/pkg/search" searchMocks "github.com/opencloud-eu/opencloud/services/search/pkg/search/mocks" diff --git a/services/search/pkg/search/search.go b/services/search/pkg/search/search.go index 3c86a46ec1..3fec30d6ea 100644 --- a/services/search/pkg/search/search.go +++ b/services/search/pkg/search/search.go @@ -15,7 +15,7 @@ import ( "github.com/cs3org/reva/v2/pkg/storage/utils/grants" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" searchmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0" "github.com/opencloud-eu/opencloud/services/search/pkg/engine" ) diff --git a/services/search/pkg/search/search_suite_test.go b/services/search/pkg/search/search_suite_test.go index 97638dcc25..8950b54d74 100644 --- a/services/search/pkg/search/search_suite_test.go +++ b/services/search/pkg/search/search_suite_test.go @@ -3,7 +3,7 @@ package search_test import ( "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/registry" mRegistry "go-micro.dev/v4/registry" . "github.com/onsi/ginkgo/v2" diff --git a/services/search/pkg/search/service.go b/services/search/pkg/search/service.go index e03e19e23d..658ffbbafe 100644 --- a/services/search/pkg/search/service.go +++ b/services/search/pkg/search/service.go @@ -24,13 +24,13 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/types/known/fieldmaskpb" - libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" searchmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0" searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" "github.com/opencloud-eu/opencloud/services/search/pkg/config" "github.com/opencloud-eu/opencloud/services/search/pkg/content" "github.com/opencloud-eu/opencloud/services/search/pkg/engine" + libregraph "github.com/owncloud/libre-graph-api-go" ) const ( diff --git a/services/search/pkg/search/service_test.go b/services/search/pkg/search/service_test.go index 0d3120def0..d150664709 100644 --- a/services/search/pkg/search/service_test.go +++ b/services/search/pkg/search/service_test.go @@ -14,7 +14,7 @@ import ( cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" searchmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0" searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" "github.com/opencloud-eu/opencloud/services/search/pkg/config" diff --git a/services/search/pkg/server/debug/option.go b/services/search/pkg/server/debug/option.go index 3a575f4513..5a6f4ad4c9 100644 --- a/services/search/pkg/server/debug/option.go +++ b/services/search/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/search/pkg/config" ) diff --git a/services/search/pkg/server/debug/server.go b/services/search/pkg/server/debug/server.go index 3059ee6032..8241dafe96 100644 --- a/services/search/pkg/server/debug/server.go +++ b/services/search/pkg/server/debug/server.go @@ -4,10 +4,10 @@ import ( "context" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/search/pkg/server/grpc/option.go b/services/search/pkg/server/grpc/option.go index 411aa800b2..bc27a4ecc7 100644 --- a/services/search/pkg/server/grpc/option.go +++ b/services/search/pkg/server/grpc/option.go @@ -3,7 +3,7 @@ package grpc import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/search/pkg/config" "github.com/opencloud-eu/opencloud/services/search/pkg/metrics" svc "github.com/opencloud-eu/opencloud/services/search/pkg/service/grpc/v0" diff --git a/services/search/pkg/server/grpc/server.go b/services/search/pkg/server/grpc/server.go index e943499354..601fbc2bc9 100644 --- a/services/search/pkg/server/grpc/server.go +++ b/services/search/pkg/server/grpc/server.go @@ -1,8 +1,8 @@ package grpc import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/version" searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" svc "github.com/opencloud-eu/opencloud/services/search/pkg/service/grpc/v0" ) diff --git a/services/search/pkg/service/grpc/v0/option.go b/services/search/pkg/service/grpc/v0/option.go index 6bada325af..2bb8d0bf3d 100644 --- a/services/search/pkg/service/grpc/v0/option.go +++ b/services/search/pkg/service/grpc/v0/option.go @@ -1,7 +1,7 @@ package service import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/search/pkg/config" "go.opentelemetry.io/otel/trace" ) diff --git a/services/search/pkg/service/grpc/v0/service.go b/services/search/pkg/service/grpc/v0/service.go index ea65d6d354..0331c27783 100644 --- a/services/search/pkg/service/grpc/v0/service.go +++ b/services/search/pkg/service/grpc/v0/service.go @@ -22,8 +22,8 @@ import ( "go-micro.dev/v4/metadata" grpcmetadata "google.golang.org/grpc/metadata" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/registry" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0" searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" "github.com/opencloud-eu/opencloud/services/search/pkg/config" diff --git a/services/settings/pkg/command/health.go b/services/settings/pkg/command/health.go index 67ec48f0d7..44be10ac54 100644 --- a/services/settings/pkg/command/health.go +++ b/services/settings/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" "github.com/opencloud-eu/opencloud/services/settings/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/settings/pkg/logging" diff --git a/services/settings/pkg/command/root.go b/services/settings/pkg/command/root.go index d7d419b560..710be9c022 100644 --- a/services/settings/pkg/command/root.go +++ b/services/settings/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/settings/pkg/command/server.go b/services/settings/pkg/command/server.go index b5c7c50fb5..ce66284fd9 100644 --- a/services/settings/pkg/command/server.go +++ b/services/settings/pkg/command/server.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" "github.com/opencloud-eu/opencloud/services/settings/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/settings/pkg/logging" diff --git a/services/settings/pkg/command/version.go b/services/settings/pkg/command/version.go index bcd3e521c3..68d6fb2406 100644 --- a/services/settings/pkg/command/version.go +++ b/services/settings/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" diff --git a/services/settings/pkg/config/config.go b/services/settings/pkg/config/config.go index 6f40db4774..c772f27db2 100644 --- a/services/settings/pkg/config/config.go +++ b/services/settings/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" "go-micro.dev/v4/client" ) diff --git a/services/settings/pkg/config/defaults/defaultconfig.go b/services/settings/pkg/config/defaults/defaultconfig.go index 9e69108a82..08de3bfd24 100644 --- a/services/settings/pkg/config/defaults/defaultconfig.go +++ b/services/settings/pkg/config/defaults/defaultconfig.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" rdefaults "github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults" "github.com/pkg/errors" diff --git a/services/settings/pkg/config/grpc.go b/services/settings/pkg/config/grpc.go index e47dcf0ec1..3976737cf0 100644 --- a/services/settings/pkg/config/grpc.go +++ b/services/settings/pkg/config/grpc.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // GRPCConfig defines the available grpc configuration. type GRPCConfig struct { diff --git a/services/settings/pkg/config/http.go b/services/settings/pkg/config/http.go index 92260e94c3..c7fe296643 100644 --- a/services/settings/pkg/config/http.go +++ b/services/settings/pkg/config/http.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // HTTP defines the available http configuration. type HTTP struct { diff --git a/services/settings/pkg/config/parser/parse.go b/services/settings/pkg/config/parser/parse.go index 79a0ff748d..78e6209f86 100644 --- a/services/settings/pkg/config/parser/parse.go +++ b/services/settings/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" "github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/settings/pkg/config/tracing.go b/services/settings/pkg/config/tracing.go index ecda9ded84..2243cba714 100644 --- a/services/settings/pkg/config/tracing.go +++ b/services/settings/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/settings/pkg/logging/logging.go b/services/settings/pkg/logging/logging.go index 144a72e9e2..0bb0210bff 100644 --- a/services/settings/pkg/logging/logging.go +++ b/services/settings/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" ) diff --git a/services/settings/pkg/server/debug/option.go b/services/settings/pkg/server/debug/option.go index 0686a38f57..12e7d43170 100644 --- a/services/settings/pkg/server/debug/option.go +++ b/services/settings/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" ) diff --git a/services/settings/pkg/server/debug/server.go b/services/settings/pkg/server/debug/server.go index fa31e7caa7..ee3e29438d 100644 --- a/services/settings/pkg/server/debug/server.go +++ b/services/settings/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/settings/pkg/server/grpc/option.go b/services/settings/pkg/server/grpc/option.go index 7a27adb49e..a00e217a0c 100644 --- a/services/settings/pkg/server/grpc/option.go +++ b/services/settings/pkg/server/grpc/option.go @@ -3,7 +3,7 @@ package grpc import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" "github.com/opencloud-eu/opencloud/services/settings/pkg/metrics" "github.com/opencloud-eu/opencloud/services/settings/pkg/settings" diff --git a/services/settings/pkg/server/grpc/server.go b/services/settings/pkg/server/grpc/server.go index d0307421ad..feaa2a875f 100644 --- a/services/settings/pkg/server/grpc/server.go +++ b/services/settings/pkg/server/grpc/server.go @@ -4,8 +4,8 @@ import ( "context" permissions "github.com/cs3org/go-cs3apis/cs3/permissions/v1beta1" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/version" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "go-micro.dev/v4/api" "go-micro.dev/v4/server" diff --git a/services/settings/pkg/server/http/option.go b/services/settings/pkg/server/http/option.go index 58af96f485..1293259eb5 100644 --- a/services/settings/pkg/server/http/option.go +++ b/services/settings/pkg/server/http/option.go @@ -3,7 +3,7 @@ package http import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" "github.com/opencloud-eu/opencloud/services/settings/pkg/metrics" "github.com/opencloud-eu/opencloud/services/settings/pkg/settings" diff --git a/services/settings/pkg/server/http/server.go b/services/settings/pkg/server/http/server.go index 0b7f09fbed..36af60256e 100644 --- a/services/settings/pkg/server/http/server.go +++ b/services/settings/pkg/server/http/server.go @@ -6,12 +6,12 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - ohttp "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/account" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/middleware" + ohttp "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/riandyrn/otelchi" "go-micro.dev/v4" diff --git a/services/settings/pkg/service/v0/option.go b/services/settings/pkg/service/v0/option.go index 85a42e866b..9f81a5b735 100644 --- a/services/settings/pkg/service/v0/option.go +++ b/services/settings/pkg/service/v0/option.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" ) diff --git a/services/settings/pkg/service/v0/service.go b/services/settings/pkg/service/v0/service.go index f3a4985921..d2c0b150fd 100644 --- a/services/settings/pkg/service/v0/service.go +++ b/services/settings/pkg/service/v0/service.go @@ -12,10 +12,10 @@ import ( ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rgrpc/status" "github.com/leonelquinteros/gotext" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/roles" + "github.com/opencloud-eu/opencloud/pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/roles" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" diff --git a/services/settings/pkg/service/v0/service_test.go b/services/settings/pkg/service/v0/service_test.go index 51390fc1c9..f3634f1699 100644 --- a/services/settings/pkg/service/v0/service_test.go +++ b/services/settings/pkg/service/v0/service_test.go @@ -5,7 +5,7 @@ import ( "net/http" "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/middleware" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/settings/pkg/settings/mocks" diff --git a/services/settings/pkg/store/defaults/templates.go b/services/settings/pkg/store/defaults/templates.go index 0c056b5b91..57252abef0 100644 --- a/services/settings/pkg/store/defaults/templates.go +++ b/services/settings/pkg/store/defaults/templates.go @@ -1,6 +1,6 @@ package defaults -import "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" +import "github.com/opencloud-eu/opencloud/pkg/l10n" // Translatable configuration options var ( diff --git a/services/settings/pkg/store/metadata/assignments_test.go b/services/settings/pkg/store/metadata/assignments_test.go index c18807956e..570b13bcce 100644 --- a/services/settings/pkg/store/metadata/assignments_test.go +++ b/services/settings/pkg/store/metadata/assignments_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/gofrs/uuid" - olog "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + olog "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/shared" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" "github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults" "github.com/stretchr/testify/require" diff --git a/services/settings/pkg/store/metadata/cache.go b/services/settings/pkg/store/metadata/cache.go index 54fd70f4d0..3c016980aa 100644 --- a/services/settings/pkg/store/metadata/cache.go +++ b/services/settings/pkg/store/metadata/cache.go @@ -5,7 +5,7 @@ import ( "path" "github.com/cs3org/reva/v2/pkg/store" - olog "github.com/opencloud-eu/opencloud/ocis-pkg/log" + olog "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" "github.com/shamaton/msgpack/v2" microstore "go-micro.dev/v4/store" diff --git a/services/settings/pkg/store/metadata/store.go b/services/settings/pkg/store/metadata/store.go index 0bd5f44698..254ef748dd 100644 --- a/services/settings/pkg/store/metadata/store.go +++ b/services/settings/pkg/store/metadata/store.go @@ -10,7 +10,7 @@ import ( "github.com/cs3org/reva/v2/pkg/errtypes" "github.com/cs3org/reva/v2/pkg/storage/utils/metadata" "github.com/gofrs/uuid" - olog "github.com/opencloud-eu/opencloud/ocis-pkg/log" + olog "github.com/opencloud-eu/opencloud/pkg/log" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" "github.com/opencloud-eu/opencloud/services/settings/pkg/config" "github.com/opencloud-eu/opencloud/services/settings/pkg/settings" diff --git a/services/sharing/pkg/command/health.go b/services/sharing/pkg/command/health.go index 4b65e49a06..bd2cc2aa26 100644 --- a/services/sharing/pkg/command/health.go +++ b/services/sharing/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/sharing/pkg/logging" diff --git a/services/sharing/pkg/command/root.go b/services/sharing/pkg/command/root.go index 0fe4c3b97d..e1152ea6fb 100644 --- a/services/sharing/pkg/command/root.go +++ b/services/sharing/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/sharing/pkg/command/server.go b/services/sharing/pkg/command/server.go index 7601086e44..7c10ad9204 100644 --- a/services/sharing/pkg/command/server.go +++ b/services/sharing/pkg/command/server.go @@ -10,10 +10,10 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/sharing/pkg/logging" diff --git a/services/sharing/pkg/command/version.go b/services/sharing/pkg/command/version.go index 765ac6af91..0703a6db89 100644 --- a/services/sharing/pkg/command/version.go +++ b/services/sharing/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" diff --git a/services/sharing/pkg/config/config.go b/services/sharing/pkg/config/config.go index 9819bfbcda..bc11f6090c 100644 --- a/services/sharing/pkg/config/config.go +++ b/services/sharing/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/sharing/pkg/config/defaults/defaultconfig.go b/services/sharing/pkg/config/defaults/defaultconfig.go index d6c2d73c64..0f176cd7d3 100644 --- a/services/sharing/pkg/config/defaults/defaultconfig.go +++ b/services/sharing/pkg/config/defaults/defaultconfig.go @@ -3,9 +3,9 @@ package defaults import ( "path/filepath" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" ) diff --git a/services/sharing/pkg/config/parser/parse.go b/services/sharing/pkg/config/parser/parse.go index 1523b2e9b8..c72d67276b 100644 --- a/services/sharing/pkg/config/parser/parse.go +++ b/services/sharing/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) const ( diff --git a/services/sharing/pkg/config/tracing.go b/services/sharing/pkg/config/tracing.go index 24c327f968..edfa933a71 100644 --- a/services/sharing/pkg/config/tracing.go +++ b/services/sharing/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/sharing/pkg/logging/logging.go b/services/sharing/pkg/logging/logging.go index 32115a4bf3..91eafadec0 100644 --- a/services/sharing/pkg/logging/logging.go +++ b/services/sharing/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" ) diff --git a/services/sharing/pkg/revaconfig/config.go b/services/sharing/pkg/revaconfig/config.go index e1626180cd..cffb790774 100644 --- a/services/sharing/pkg/revaconfig/config.go +++ b/services/sharing/pkg/revaconfig/config.go @@ -6,8 +6,8 @@ import ( "os" "path/filepath" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" ) diff --git a/services/sharing/pkg/server/debug/option.go b/services/sharing/pkg/server/debug/option.go index 8bfc98f7af..e58e23155f 100644 --- a/services/sharing/pkg/server/debug/option.go +++ b/services/sharing/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" ) diff --git a/services/sharing/pkg/server/debug/server.go b/services/sharing/pkg/server/debug/server.go index ea1b80b923..1c5f26ae30 100644 --- a/services/sharing/pkg/server/debug/server.go +++ b/services/sharing/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/sse/pkg/command/health.go b/services/sse/pkg/command/health.go index 24331b3568..d385f26dbd 100644 --- a/services/sse/pkg/command/health.go +++ b/services/sse/pkg/command/health.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/sse/pkg/config" "github.com/opencloud-eu/opencloud/services/sse/pkg/config/parser" ) diff --git a/services/sse/pkg/command/root.go b/services/sse/pkg/command/root.go index 598d45f858..5686bf2bc8 100644 --- a/services/sse/pkg/command/root.go +++ b/services/sse/pkg/command/root.go @@ -5,7 +5,7 @@ import ( "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/sse/pkg/config" ) diff --git a/services/sse/pkg/command/server.go b/services/sse/pkg/command/server.go index bb533df54a..2ef3204d1f 100644 --- a/services/sse/pkg/command/server.go +++ b/services/sse/pkg/command/server.go @@ -9,9 +9,9 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/tracing" "github.com/opencloud-eu/opencloud/services/sse/pkg/config" "github.com/opencloud-eu/opencloud/services/sse/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/sse/pkg/server/debug" diff --git a/services/sse/pkg/command/version.go b/services/sse/pkg/command/version.go index 6c7a70c71c..c7e0a2d9c8 100644 --- a/services/sse/pkg/command/version.go +++ b/services/sse/pkg/command/version.go @@ -3,7 +3,7 @@ package command import ( "fmt" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/urfave/cli/v2" diff --git a/services/sse/pkg/config/config.go b/services/sse/pkg/config/config.go index 28d504ec80..313b351c2c 100644 --- a/services/sse/pkg/config/config.go +++ b/services/sse/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/sse/pkg/config/parser/parse.go b/services/sse/pkg/config/parser/parse.go index 52f2481798..565feaf5c9 100644 --- a/services/sse/pkg/config/parser/parse.go +++ b/services/sse/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/sse/pkg/config" "github.com/opencloud-eu/opencloud/services/sse/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/sse/pkg/config/tracing.go b/services/sse/pkg/config/tracing.go index 820ac9be9c..6c985d7579 100644 --- a/services/sse/pkg/config/tracing.go +++ b/services/sse/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/sse/pkg/server/debug/option.go b/services/sse/pkg/server/debug/option.go index cb0f0b4787..fb6546309e 100644 --- a/services/sse/pkg/server/debug/option.go +++ b/services/sse/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/sse/pkg/config" ) diff --git a/services/sse/pkg/server/debug/server.go b/services/sse/pkg/server/debug/server.go index ad5b6ed749..83e14bcecb 100644 --- a/services/sse/pkg/server/debug/server.go +++ b/services/sse/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/sse/pkg/server/http/option.go b/services/sse/pkg/server/http/option.go index 3068b4fc6d..b5f548ad66 100644 --- a/services/sse/pkg/server/http/option.go +++ b/services/sse/pkg/server/http/option.go @@ -4,7 +4,7 @@ import ( "context" "github.com/cs3org/reva/v2/pkg/events" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/sse/pkg/config" "go.opentelemetry.io/otel/trace" ) diff --git a/services/sse/pkg/server/http/server.go b/services/sse/pkg/server/http/server.go index f66006be22..dc8a386f69 100644 --- a/services/sse/pkg/server/http/server.go +++ b/services/sse/pkg/server/http/server.go @@ -9,12 +9,12 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/google/uuid" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/account" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" svc "github.com/opencloud-eu/opencloud/services/sse/pkg/service" "github.com/riandyrn/otelchi" "go-micro.dev/v4" diff --git a/services/sse/pkg/service/service.go b/services/sse/pkg/service/service.go index 486469e8a5..eff4fee801 100644 --- a/services/sse/pkg/service/service.go +++ b/services/sse/pkg/service/service.go @@ -10,7 +10,7 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/events" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/sse/pkg/config" ) diff --git a/services/storage-publiclink/pkg/command/health.go b/services/storage-publiclink/pkg/command/health.go index 4d5649caf8..f21f1f34a5 100644 --- a/services/storage-publiclink/pkg/command/health.go +++ b/services/storage-publiclink/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/logging" diff --git a/services/storage-publiclink/pkg/command/root.go b/services/storage-publiclink/pkg/command/root.go index 83a052db1b..3921d31bb8 100644 --- a/services/storage-publiclink/pkg/command/root.go +++ b/services/storage-publiclink/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/storage-publiclink/pkg/command/server.go b/services/storage-publiclink/pkg/command/server.go index 45dc7d1548..fb2e576a2b 100644 --- a/services/storage-publiclink/pkg/command/server.go +++ b/services/storage-publiclink/pkg/command/server.go @@ -9,10 +9,10 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/logging" diff --git a/services/storage-publiclink/pkg/command/version.go b/services/storage-publiclink/pkg/command/version.go index 2266c7e1f2..ba56fd22ca 100644 --- a/services/storage-publiclink/pkg/command/version.go +++ b/services/storage-publiclink/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config" diff --git a/services/storage-publiclink/pkg/config/config.go b/services/storage-publiclink/pkg/config/config.go index 208233ccb8..b118d78496 100644 --- a/services/storage-publiclink/pkg/config/config.go +++ b/services/storage-publiclink/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/storage-publiclink/pkg/config/defaults/defaultconfig.go b/services/storage-publiclink/pkg/config/defaults/defaultconfig.go index b7b257b0c6..ebc10fa13b 100644 --- a/services/storage-publiclink/pkg/config/defaults/defaultconfig.go +++ b/services/storage-publiclink/pkg/config/defaults/defaultconfig.go @@ -1,8 +1,8 @@ package defaults import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config" ) diff --git a/services/storage-publiclink/pkg/config/parser/parse.go b/services/storage-publiclink/pkg/config/parser/parse.go index c95925be81..ca1aeda1ff 100644 --- a/services/storage-publiclink/pkg/config/parser/parse.go +++ b/services/storage-publiclink/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/storage-publiclink/pkg/config/tracing.go b/services/storage-publiclink/pkg/config/tracing.go index de16433e1c..4cdc86ed2c 100644 --- a/services/storage-publiclink/pkg/config/tracing.go +++ b/services/storage-publiclink/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the tracing config. type Tracing struct { diff --git a/services/storage-publiclink/pkg/logging/logging.go b/services/storage-publiclink/pkg/logging/logging.go index 3b295c187a..bee62d5aaa 100644 --- a/services/storage-publiclink/pkg/logging/logging.go +++ b/services/storage-publiclink/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config" ) diff --git a/services/storage-publiclink/pkg/server/debug/option.go b/services/storage-publiclink/pkg/server/debug/option.go index 6b8e7821fd..0a34a305ea 100644 --- a/services/storage-publiclink/pkg/server/debug/option.go +++ b/services/storage-publiclink/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config" ) diff --git a/services/storage-publiclink/pkg/server/debug/server.go b/services/storage-publiclink/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/storage-publiclink/pkg/server/debug/server.go +++ b/services/storage-publiclink/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/storage-shares/pkg/command/health.go b/services/storage-shares/pkg/command/health.go index 41cb4188dc..7bb131f5f3 100644 --- a/services/storage-shares/pkg/command/health.go +++ b/services/storage-shares/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/logging" diff --git a/services/storage-shares/pkg/command/root.go b/services/storage-shares/pkg/command/root.go index 0a65306fae..ffe564b3ca 100644 --- a/services/storage-shares/pkg/command/root.go +++ b/services/storage-shares/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/storage-shares/pkg/command/server.go b/services/storage-shares/pkg/command/server.go index 081b6bf2f7..356031b2a5 100644 --- a/services/storage-shares/pkg/command/server.go +++ b/services/storage-shares/pkg/command/server.go @@ -9,10 +9,10 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/logging" diff --git a/services/storage-shares/pkg/command/version.go b/services/storage-shares/pkg/command/version.go index 1c43a416c2..9d984c106c 100644 --- a/services/storage-shares/pkg/command/version.go +++ b/services/storage-shares/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" diff --git a/services/storage-shares/pkg/config/config.go b/services/storage-shares/pkg/config/config.go index b42be23714..bc5ba2a0da 100644 --- a/services/storage-shares/pkg/config/config.go +++ b/services/storage-shares/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/storage-shares/pkg/config/defaults/defaultconfig.go b/services/storage-shares/pkg/config/defaults/defaultconfig.go index 3b1d250204..341507c6ed 100644 --- a/services/storage-shares/pkg/config/defaults/defaultconfig.go +++ b/services/storage-shares/pkg/config/defaults/defaultconfig.go @@ -1,8 +1,8 @@ package defaults import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" ) diff --git a/services/storage-shares/pkg/config/parser/parse.go b/services/storage-shares/pkg/config/parser/parse.go index fbb77825f6..5cd9a9a92b 100644 --- a/services/storage-shares/pkg/config/parser/parse.go +++ b/services/storage-shares/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/storage-shares/pkg/config/tracing.go b/services/storage-shares/pkg/config/tracing.go index e7a1da44bf..79414fea94 100644 --- a/services/storage-shares/pkg/config/tracing.go +++ b/services/storage-shares/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines configuration options for tracing. type Tracing struct { diff --git a/services/storage-shares/pkg/logging/logging.go b/services/storage-shares/pkg/logging/logging.go index e086dd61ff..4b0db494ca 100644 --- a/services/storage-shares/pkg/logging/logging.go +++ b/services/storage-shares/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" ) diff --git a/services/storage-shares/pkg/server/debug/option.go b/services/storage-shares/pkg/server/debug/option.go index e23b8a60a1..1e1d290b1f 100644 --- a/services/storage-shares/pkg/server/debug/option.go +++ b/services/storage-shares/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" ) diff --git a/services/storage-shares/pkg/server/debug/server.go b/services/storage-shares/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/storage-shares/pkg/server/debug/server.go +++ b/services/storage-shares/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/storage-system/pkg/command/health.go b/services/storage-system/pkg/command/health.go index 1494a454a3..f4b93fe5b9 100644 --- a/services/storage-system/pkg/command/health.go +++ b/services/storage-system/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/logging" diff --git a/services/storage-system/pkg/command/root.go b/services/storage-system/pkg/command/root.go index d83e5e52b3..a9587dec10 100644 --- a/services/storage-system/pkg/command/root.go +++ b/services/storage-system/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/storage-system/pkg/command/server.go b/services/storage-system/pkg/command/server.go index c04c9480be..107b6e09bd 100644 --- a/services/storage-system/pkg/command/server.go +++ b/services/storage-system/pkg/command/server.go @@ -11,10 +11,10 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/logging" diff --git a/services/storage-system/pkg/command/version.go b/services/storage-system/pkg/command/version.go index be18abc4c5..601e66e9d8 100644 --- a/services/storage-system/pkg/command/version.go +++ b/services/storage-system/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" diff --git a/services/storage-system/pkg/config/config.go b/services/storage-system/pkg/config/config.go index 033c29dd4a..f2c69ea55c 100644 --- a/services/storage-system/pkg/config/config.go +++ b/services/storage-system/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config holds Config config diff --git a/services/storage-system/pkg/config/defaults/defaultconfig.go b/services/storage-system/pkg/config/defaults/defaultconfig.go index fbcb64e086..0d45e76a4b 100644 --- a/services/storage-system/pkg/config/defaults/defaultconfig.go +++ b/services/storage-system/pkg/config/defaults/defaultconfig.go @@ -4,9 +4,9 @@ import ( "path/filepath" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" ) diff --git a/services/storage-system/pkg/config/parser/parse.go b/services/storage-system/pkg/config/parser/parse.go index 9118df6f8e..9e5b7ab7a7 100644 --- a/services/storage-system/pkg/config/parser/parse.go +++ b/services/storage-system/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/storage-system/pkg/config/tracing.go b/services/storage-system/pkg/config/tracing.go index acc5b64f8b..069351d5e4 100644 --- a/services/storage-system/pkg/config/tracing.go +++ b/services/storage-system/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing holds Tracing config type Tracing struct { diff --git a/services/storage-system/pkg/logging/logging.go b/services/storage-system/pkg/logging/logging.go index b08a9b0213..8aff7304f9 100644 --- a/services/storage-system/pkg/logging/logging.go +++ b/services/storage-system/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" ) diff --git a/services/storage-system/pkg/revaconfig/config.go b/services/storage-system/pkg/revaconfig/config.go index b79fc2c0ac..3a500f930f 100644 --- a/services/storage-system/pkg/revaconfig/config.go +++ b/services/storage-system/pkg/revaconfig/config.go @@ -2,7 +2,7 @@ package revaconfig import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - pkgconfig "github.com/opencloud-eu/opencloud/ocis-pkg/config" + pkgconfig "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" ) diff --git a/services/storage-system/pkg/server/debug/option.go b/services/storage-system/pkg/server/debug/option.go index 067ab3c820..bccdf7b662 100644 --- a/services/storage-system/pkg/server/debug/option.go +++ b/services/storage-system/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" ) diff --git a/services/storage-system/pkg/server/debug/server.go b/services/storage-system/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/storage-system/pkg/server/debug/server.go +++ b/services/storage-system/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/storage-users/pkg/command/health.go b/services/storage-users/pkg/command/health.go index 076ab1690e..0cafe4ffe5 100644 --- a/services/storage-users/pkg/command/health.go +++ b/services/storage-users/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/logging" diff --git a/services/storage-users/pkg/command/root.go b/services/storage-users/pkg/command/root.go index 0d8f527140..8c879e59dd 100644 --- a/services/storage-users/pkg/command/root.go +++ b/services/storage-users/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/storage-users/pkg/command/server.go b/services/storage-users/pkg/command/server.go index 9c82501296..c6b9072dba 100644 --- a/services/storage-users/pkg/command/server.go +++ b/services/storage-users/pkg/command/server.go @@ -10,10 +10,10 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/event" diff --git a/services/storage-users/pkg/command/trash_bin.go b/services/storage-users/pkg/command/trash_bin.go index cff8e21ec4..4baacc4fc0 100644 --- a/services/storage-users/pkg/command/trash_bin.go +++ b/services/storage-users/pkg/command/trash_bin.go @@ -19,8 +19,8 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" "github.com/mohae/deepcopy" tw "github.com/olekukonko/tablewriter" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - zlog "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + zlog "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/event" diff --git a/services/storage-users/pkg/command/uploads.go b/services/storage-users/pkg/command/uploads.go index af2c7d0ff8..3ee13bd4a7 100644 --- a/services/storage-users/pkg/command/uploads.go +++ b/services/storage-users/pkg/command/uploads.go @@ -17,7 +17,7 @@ import ( "github.com/cs3org/reva/v2/pkg/storage" "github.com/cs3org/reva/v2/pkg/storage/fs/registry" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/event" diff --git a/services/storage-users/pkg/command/version.go b/services/storage-users/pkg/command/version.go index fa6100da79..99ef72f4fa 100644 --- a/services/storage-users/pkg/command/version.go +++ b/services/storage-users/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" diff --git a/services/storage-users/pkg/config/config.go b/services/storage-users/pkg/config/config.go index f1eebe1c2e..8c359dfbcc 100644 --- a/services/storage-users/pkg/config/config.go +++ b/services/storage-users/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config is the configuration for the storage-users service diff --git a/services/storage-users/pkg/config/defaults/defaultconfig.go b/services/storage-users/pkg/config/defaults/defaultconfig.go index cec1e539f9..e05689ad49 100644 --- a/services/storage-users/pkg/config/defaults/defaultconfig.go +++ b/services/storage-users/pkg/config/defaults/defaultconfig.go @@ -4,9 +4,9 @@ import ( "path/filepath" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" ) diff --git a/services/storage-users/pkg/config/parser/parse.go b/services/storage-users/pkg/config/parser/parse.go index 36ab4d6257..1289cc01dc 100644 --- a/services/storage-users/pkg/config/parser/parse.go +++ b/services/storage-users/pkg/config/parser/parse.go @@ -4,13 +4,13 @@ import ( "errors" "fmt" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - defaults2 "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + defaults2 "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/storage-users/pkg/config/tracing.go b/services/storage-users/pkg/config/tracing.go index 5f368c0b36..fefb51d2a7 100644 --- a/services/storage-users/pkg/config/tracing.go +++ b/services/storage-users/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing configures the tracing type Tracing struct { diff --git a/services/storage-users/pkg/event/service.go b/services/storage-users/pkg/event/service.go index 56c149452d..d77498821d 100644 --- a/services/storage-users/pkg/event/service.go +++ b/services/storage-users/pkg/event/service.go @@ -7,7 +7,7 @@ import ( apiGateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/task" ) diff --git a/services/storage-users/pkg/logging/logging.go b/services/storage-users/pkg/logging/logging.go index e2ea255fd7..5f8089772a 100644 --- a/services/storage-users/pkg/logging/logging.go +++ b/services/storage-users/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" ) diff --git a/services/storage-users/pkg/server/debug/option.go b/services/storage-users/pkg/server/debug/option.go index 628a928123..1166cf3e3e 100644 --- a/services/storage-users/pkg/server/debug/option.go +++ b/services/storage-users/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" ) diff --git a/services/storage-users/pkg/server/debug/server.go b/services/storage-users/pkg/server/debug/server.go index 9574c97d5f..33a7b8e8fc 100644 --- a/services/storage-users/pkg/server/debug/server.go +++ b/services/storage-users/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/storage-users/pkg/task/task_suite_test.go b/services/storage-users/pkg/task/task_suite_test.go index 3118aa8bbb..3ed0b41d20 100644 --- a/services/storage-users/pkg/task/task_suite_test.go +++ b/services/storage-users/pkg/task/task_suite_test.go @@ -3,7 +3,7 @@ package task_test import ( "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/registry" mRegistry "go-micro.dev/v4/registry" . "github.com/onsi/ginkgo/v2" diff --git a/services/thumbnails/pkg/command/health.go b/services/thumbnails/pkg/command/health.go index 828b505eb4..4240ac796c 100644 --- a/services/thumbnails/pkg/command/health.go +++ b/services/thumbnails/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/logging" diff --git a/services/thumbnails/pkg/command/root.go b/services/thumbnails/pkg/command/root.go index 83b1dac589..0a86414705 100644 --- a/services/thumbnails/pkg/command/root.go +++ b/services/thumbnails/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/thumbnails/pkg/command/server.go b/services/thumbnails/pkg/command/server.go index 745ac78633..d434e60b0a 100644 --- a/services/thumbnails/pkg/command/server.go +++ b/services/thumbnails/pkg/command/server.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/logging" diff --git a/services/thumbnails/pkg/command/version.go b/services/thumbnails/pkg/command/version.go index 5f3ea32675..9f6e21ccc9 100644 --- a/services/thumbnails/pkg/command/version.go +++ b/services/thumbnails/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" diff --git a/services/thumbnails/pkg/config/config.go b/services/thumbnails/pkg/config/config.go index 0f1ba92489..f8c367999f 100644 --- a/services/thumbnails/pkg/config/config.go +++ b/services/thumbnails/pkg/config/config.go @@ -4,7 +4,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" "go-micro.dev/v4/client" ) diff --git a/services/thumbnails/pkg/config/defaults/defaultconfig.go b/services/thumbnails/pkg/config/defaults/defaultconfig.go index 761e227de1..f525ba16e7 100644 --- a/services/thumbnails/pkg/config/defaults/defaultconfig.go +++ b/services/thumbnails/pkg/config/defaults/defaultconfig.go @@ -4,9 +4,9 @@ import ( "path" "strings" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" ) diff --git a/services/thumbnails/pkg/config/grpc.go b/services/thumbnails/pkg/config/grpc.go index ef558f1694..d47e26aa5e 100644 --- a/services/thumbnails/pkg/config/grpc.go +++ b/services/thumbnails/pkg/config/grpc.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // GRPCConfig defines the available grpc configuration. type GRPCConfig struct { diff --git a/services/thumbnails/pkg/config/http.go b/services/thumbnails/pkg/config/http.go index c5b9e6caa4..8e83530df6 100644 --- a/services/thumbnails/pkg/config/http.go +++ b/services/thumbnails/pkg/config/http.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // CORS defines the available cors configuration. type CORS struct { diff --git a/services/thumbnails/pkg/config/parser/parse.go b/services/thumbnails/pkg/config/parser/parse.go index 4f5d51676f..3cac8829b1 100644 --- a/services/thumbnails/pkg/config/parser/parse.go +++ b/services/thumbnails/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/thumbnails/pkg/config/tracing.go b/services/thumbnails/pkg/config/tracing.go index 803f06b4de..3a51564c2e 100644 --- a/services/thumbnails/pkg/config/tracing.go +++ b/services/thumbnails/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/thumbnails/pkg/logging/logging.go b/services/thumbnails/pkg/logging/logging.go index a301ed866b..942e50f0c8 100644 --- a/services/thumbnails/pkg/logging/logging.go +++ b/services/thumbnails/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" ) diff --git a/services/thumbnails/pkg/preprocessor/fontloader.go b/services/thumbnails/pkg/preprocessor/fontloader.go index e04cd4cc35..91824b611d 100644 --- a/services/thumbnails/pkg/preprocessor/fontloader.go +++ b/services/thumbnails/pkg/preprocessor/fontloader.go @@ -6,7 +6,7 @@ import ( "path/filepath" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/sync" + "github.com/opencloud-eu/opencloud/pkg/sync" "golang.org/x/image/font" "golang.org/x/image/font/gofont/goregular" "golang.org/x/image/font/opentype" diff --git a/services/thumbnails/pkg/server/debug/option.go b/services/thumbnails/pkg/server/debug/option.go index 420fc024b9..a545766adc 100644 --- a/services/thumbnails/pkg/server/debug/option.go +++ b/services/thumbnails/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" ) diff --git a/services/thumbnails/pkg/server/debug/server.go b/services/thumbnails/pkg/server/debug/server.go index fa31e7caa7..ee3e29438d 100644 --- a/services/thumbnails/pkg/server/debug/server.go +++ b/services/thumbnails/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/thumbnails/pkg/server/grpc/option.go b/services/thumbnails/pkg/server/grpc/option.go index 2d6f02fb05..4197aa80d5 100644 --- a/services/thumbnails/pkg/server/grpc/option.go +++ b/services/thumbnails/pkg/server/grpc/option.go @@ -3,7 +3,7 @@ package grpc import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/metrics" "go.opentelemetry.io/otel/trace" diff --git a/services/thumbnails/pkg/server/grpc/server.go b/services/thumbnails/pkg/server/grpc/server.go index 236e9b2487..a3d26a7387 100644 --- a/services/thumbnails/pkg/server/grpc/server.go +++ b/services/thumbnails/pkg/server/grpc/server.go @@ -3,10 +3,10 @@ package grpc import ( "github.com/cs3org/reva/v2/pkg/bytesize" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc/handler/ratelimiter" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/service/grpc/handler/ratelimiter" + "github.com/opencloud-eu/opencloud/pkg/version" thumbnailssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/thumbnails/v0" svc "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/service/grpc/v0" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/service/grpc/v0/decorators" diff --git a/services/thumbnails/pkg/server/http/option.go b/services/thumbnails/pkg/server/http/option.go index 78a61eed17..b840bfb9fd 100644 --- a/services/thumbnails/pkg/server/http/option.go +++ b/services/thumbnails/pkg/server/http/option.go @@ -3,7 +3,7 @@ package http import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/metrics" "github.com/urfave/cli/v2" diff --git a/services/thumbnails/pkg/server/http/server.go b/services/thumbnails/pkg/server/http/server.go index 139db8c121..68ced7d39a 100644 --- a/services/thumbnails/pkg/server/http/server.go +++ b/services/thumbnails/pkg/server/http/server.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/go-chi/chi/v5/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - ocismiddleware "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/cors" + ocismiddleware "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/version" svc "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/service/http/v0" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/storage" "go-micro.dev/v4" diff --git a/services/thumbnails/pkg/service/grpc/v0/decorators/logging.go b/services/thumbnails/pkg/service/grpc/v0/decorators/logging.go index 974a1b14f2..c590fd6db3 100644 --- a/services/thumbnails/pkg/service/grpc/v0/decorators/logging.go +++ b/services/thumbnails/pkg/service/grpc/v0/decorators/logging.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" thumbnailssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/thumbnails/v0" merrors "go-micro.dev/v4/errors" ) diff --git a/services/thumbnails/pkg/service/grpc/v0/option.go b/services/thumbnails/pkg/service/grpc/v0/option.go index 2d194b31a1..ceda9c3e68 100644 --- a/services/thumbnails/pkg/service/grpc/v0/option.go +++ b/services/thumbnails/pkg/service/grpc/v0/option.go @@ -5,7 +5,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/imgsource" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/storage" diff --git a/services/thumbnails/pkg/service/grpc/v0/service.go b/services/thumbnails/pkg/service/grpc/v0/service.go index a26ab3b2ee..7703ae214e 100644 --- a/services/thumbnails/pkg/service/grpc/v0/service.go +++ b/services/thumbnails/pkg/service/grpc/v0/service.go @@ -20,7 +20,7 @@ import ( merrors "go-micro.dev/v4/errors" "google.golang.org/grpc/metadata" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" thumbnailssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/thumbnails/v0" terrors "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/errors" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/preprocessor" diff --git a/services/thumbnails/pkg/service/http/v0/logging.go b/services/thumbnails/pkg/service/http/v0/logging.go index ee378ec2ef..e1051bb7ab 100644 --- a/services/thumbnails/pkg/service/http/v0/logging.go +++ b/services/thumbnails/pkg/service/http/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/services/thumbnails/pkg/service/http/v0/option.go b/services/thumbnails/pkg/service/http/v0/option.go index ec357ffa99..3f8e7e9981 100644 --- a/services/thumbnails/pkg/service/http/v0/option.go +++ b/services/thumbnails/pkg/service/http/v0/option.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/storage" "go.opentelemetry.io/otel/trace" diff --git a/services/thumbnails/pkg/service/http/v0/service.go b/services/thumbnails/pkg/service/http/v0/service.go index 48bee02fc4..04c8f8627d 100644 --- a/services/thumbnails/pkg/service/http/v0/service.go +++ b/services/thumbnails/pkg/service/http/v0/service.go @@ -10,8 +10,8 @@ import ( "github.com/golang-jwt/jwt/v5" "github.com/riandyrn/otelchi" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/tracing" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" tjwt "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/service/jwt" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail" diff --git a/services/thumbnails/pkg/thumbnail/storage/filesystem.go b/services/thumbnails/pkg/thumbnail/storage/filesystem.go index 6f701e52f9..dd55762d4e 100644 --- a/services/thumbnails/pkg/thumbnail/storage/filesystem.go +++ b/services/thumbnails/pkg/thumbnail/storage/filesystem.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" ) diff --git a/services/thumbnails/pkg/thumbnail/thumbnail.go b/services/thumbnails/pkg/thumbnail/thumbnail.go index 00f04ccf71..bf465d67b0 100644 --- a/services/thumbnails/pkg/thumbnail/thumbnail.go +++ b/services/thumbnails/pkg/thumbnail/thumbnail.go @@ -5,7 +5,7 @@ import ( "image" "mime" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/errors" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/storage" ) diff --git a/services/thumbnails/pkg/thumbnail/thumbnail_test.go b/services/thumbnails/pkg/thumbnail/thumbnail_test.go index 5c5487e2f5..2a2c09783a 100644 --- a/services/thumbnails/pkg/thumbnail/thumbnail_test.go +++ b/services/thumbnails/pkg/thumbnail/thumbnail_test.go @@ -15,7 +15,7 @@ import ( "github.com/google/go-cmp/cmp" "github.com/google/go-cmp/cmp/cmpopts" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/thumbnail/storage" ) diff --git a/services/userlog/pkg/command/root.go b/services/userlog/pkg/command/root.go index 45759830e3..4d4b95a3da 100644 --- a/services/userlog/pkg/command/root.go +++ b/services/userlog/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/userlog/pkg/command/server.go b/services/userlog/pkg/command/server.go index 4c9218b6cc..f6aae6ff59 100644 --- a/services/userlog/pkg/command/server.go +++ b/services/userlog/pkg/command/server.go @@ -12,11 +12,11 @@ import ( "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/registry" + ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config" diff --git a/services/userlog/pkg/config/config.go b/services/userlog/pkg/config/config.go index b3bd358425..261594d7ea 100644 --- a/services/userlog/pkg/config/config.go +++ b/services/userlog/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/userlog/pkg/config/defaults/defaultconfig.go b/services/userlog/pkg/config/defaults/defaultconfig.go index 19e328b462..41ac75cc30 100644 --- a/services/userlog/pkg/config/defaults/defaultconfig.go +++ b/services/userlog/pkg/config/defaults/defaultconfig.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config" ) diff --git a/services/userlog/pkg/config/parser/parse.go b/services/userlog/pkg/config/parser/parse.go index 3241b63970..1b3ec86524 100644 --- a/services/userlog/pkg/config/parser/parse.go +++ b/services/userlog/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/userlog/pkg/config/tracing.go b/services/userlog/pkg/config/tracing.go index e1fb2c05d0..3058c30020 100644 --- a/services/userlog/pkg/config/tracing.go +++ b/services/userlog/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/userlog/pkg/logging/logging.go b/services/userlog/pkg/logging/logging.go index bb87be6325..cdebe12dde 100644 --- a/services/userlog/pkg/logging/logging.go +++ b/services/userlog/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config" ) diff --git a/services/userlog/pkg/server/debug/option.go b/services/userlog/pkg/server/debug/option.go index eae188ca37..097418394a 100644 --- a/services/userlog/pkg/server/debug/option.go +++ b/services/userlog/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config" ) diff --git a/services/userlog/pkg/server/debug/server.go b/services/userlog/pkg/server/debug/server.go index ad5b6ed749..83e14bcecb 100644 --- a/services/userlog/pkg/server/debug/server.go +++ b/services/userlog/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/userlog/pkg/server/http/option.go b/services/userlog/pkg/server/http/option.go index c91c24faee..363ab97c70 100644 --- a/services/userlog/pkg/server/http/option.go +++ b/services/userlog/pkg/server/http/option.go @@ -6,7 +6,7 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config" diff --git a/services/userlog/pkg/server/http/server.go b/services/userlog/pkg/server/http/server.go index 35d0d672a8..5f02edd7fe 100644 --- a/services/userlog/pkg/server/http/server.go +++ b/services/userlog/pkg/server/http/server.go @@ -7,12 +7,12 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/account" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" svc "github.com/opencloud-eu/opencloud/services/userlog/pkg/service" "github.com/riandyrn/otelchi" "go-micro.dev/v4" diff --git a/services/userlog/pkg/service/conversion.go b/services/userlog/pkg/service/conversion.go index 38c5f389ef..f4abd96e98 100644 --- a/services/userlog/pkg/service/conversion.go +++ b/services/userlog/pkg/service/conversion.go @@ -18,7 +18,7 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/l10n" ) //go:embed l10n/locale diff --git a/services/userlog/pkg/service/filter.go b/services/userlog/pkg/service/filter.go index 02a6d8b995..b07d03f647 100644 --- a/services/userlog/pkg/service/filter.go +++ b/services/userlog/pkg/service/filter.go @@ -3,10 +3,11 @@ package service import ( "context" "errors" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" "github.com/cs3org/reva/v2/pkg/events" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/middleware" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults" micrometadata "go-micro.dev/v4/metadata" diff --git a/services/userlog/pkg/service/filter_test.go b/services/userlog/pkg/service/filter_test.go index 973ce8f46e..9c00cd0616 100644 --- a/services/userlog/pkg/service/filter_test.go +++ b/services/userlog/pkg/service/filter_test.go @@ -2,15 +2,16 @@ package service import ( "context" + "testing" + user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" "github.com/cs3org/reva/v2/pkg/events" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" settings "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "go-micro.dev/v4/client" - "testing" ) var testLogger = log.NewLogger() diff --git a/services/userlog/pkg/service/http.go b/services/userlog/pkg/service/http.go index 241493feba..dd0cd12e0f 100644 --- a/services/userlog/pkg/service/http.go +++ b/services/userlog/pkg/service/http.go @@ -9,7 +9,7 @@ import ( "github.com/cs3org/reva/v2/pkg/appctx" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/opencloud-eu/opencloud/ocis-pkg/roles" + "github.com/opencloud-eu/opencloud/pkg/roles" "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" settings "github.com/opencloud-eu/opencloud/services/settings/pkg/service/v0" "go.opentelemetry.io/otel/attribute" diff --git a/services/userlog/pkg/service/options.go b/services/userlog/pkg/service/options.go index 1a56174f62..d94a3a5a52 100644 --- a/services/userlog/pkg/service/options.go +++ b/services/userlog/pkg/service/options.go @@ -5,7 +5,7 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/go-chi/chi/v5" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" "github.com/opencloud-eu/opencloud/services/userlog/pkg/config" diff --git a/services/userlog/pkg/service/service.go b/services/userlog/pkg/service/service.go index 7c55db1e06..617a6c9c50 100644 --- a/services/userlog/pkg/service/service.go +++ b/services/userlog/pkg/service/service.go @@ -17,9 +17,9 @@ import ( "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" - "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/roles" + "github.com/opencloud-eu/opencloud/pkg/l10n" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/roles" ehmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" diff --git a/services/userlog/pkg/service/service_suit_test.go b/services/userlog/pkg/service/service_suit_test.go index 98fa32aff6..3e703cfb93 100644 --- a/services/userlog/pkg/service/service_suit_test.go +++ b/services/userlog/pkg/service/service_suit_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/gomega" mRegistry "go-micro.dev/v4/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/registry" ) func init() { diff --git a/services/userlog/pkg/service/service_test.go b/services/userlog/pkg/service/service_test.go index ee51610734..a1237b3b08 100644 --- a/services/userlog/pkg/service/service_test.go +++ b/services/userlog/pkg/service/service_test.go @@ -3,10 +3,11 @@ package service_test import ( "context" "encoding/json" - settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" "reflect" "time" + settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" + gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" @@ -27,7 +28,7 @@ import ( "go.opentelemetry.io/otel/trace" "google.golang.org/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ehmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0" ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0/mocks" diff --git a/services/userlog/pkg/service/templates.go b/services/userlog/pkg/service/templates.go index dd73130991..8e6596f155 100644 --- a/services/userlog/pkg/service/templates.go +++ b/services/userlog/pkg/service/templates.go @@ -1,6 +1,6 @@ package service -import "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" +import "github.com/opencloud-eu/opencloud/pkg/l10n" // the available templates var ( diff --git a/services/users/pkg/command/health.go b/services/users/pkg/command/health.go index d181f63f55..794a6a958f 100644 --- a/services/users/pkg/command/health.go +++ b/services/users/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/users/pkg/config" "github.com/opencloud-eu/opencloud/services/users/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/users/pkg/logging" diff --git a/services/users/pkg/command/root.go b/services/users/pkg/command/root.go index 62237df43d..4b4143bc88 100644 --- a/services/users/pkg/command/root.go +++ b/services/users/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/users/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/users/pkg/command/server.go b/services/users/pkg/command/server.go index f257efe19d..e71e14d9cb 100644 --- a/services/users/pkg/command/server.go +++ b/services/users/pkg/command/server.go @@ -9,11 +9,11 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/ldap" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/ldap" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/users/pkg/config" "github.com/opencloud-eu/opencloud/services/users/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/users/pkg/logging" diff --git a/services/users/pkg/command/version.go b/services/users/pkg/command/version.go index d6175933bb..07f0785237 100644 --- a/services/users/pkg/command/version.go +++ b/services/users/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/users/pkg/config" diff --git a/services/users/pkg/config/config.go b/services/users/pkg/config/config.go index 470d49b523..bc3e8b846b 100644 --- a/services/users/pkg/config/config.go +++ b/services/users/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) type Config struct { diff --git a/services/users/pkg/config/defaults/defaultconfig.go b/services/users/pkg/config/defaults/defaultconfig.go index ebc84e72bf..8d561f159b 100644 --- a/services/users/pkg/config/defaults/defaultconfig.go +++ b/services/users/pkg/config/defaults/defaultconfig.go @@ -3,9 +3,9 @@ package defaults import ( "path/filepath" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/users/pkg/config" ) diff --git a/services/users/pkg/config/parser/parse.go b/services/users/pkg/config/parser/parse.go index d8c9422731..e736f301d6 100644 --- a/services/users/pkg/config/parser/parse.go +++ b/services/users/pkg/config/parser/parse.go @@ -3,12 +3,12 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/users/pkg/config" "github.com/opencloud-eu/opencloud/services/users/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/users/pkg/config/tracing.go b/services/users/pkg/config/tracing.go index 9e2df2f1e1..08ba87a75d 100644 --- a/services/users/pkg/config/tracing.go +++ b/services/users/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the configuration options for tracing. type Tracing struct { diff --git a/services/users/pkg/logging/logging.go b/services/users/pkg/logging/logging.go index f54346c58c..aaa6faa2ec 100644 --- a/services/users/pkg/logging/logging.go +++ b/services/users/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/users/pkg/config" ) diff --git a/services/users/pkg/server/debug/option.go b/services/users/pkg/server/debug/option.go index 507bcd27ca..03a9b048fc 100644 --- a/services/users/pkg/server/debug/option.go +++ b/services/users/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/users/pkg/config" ) diff --git a/services/users/pkg/server/debug/server.go b/services/users/pkg/server/debug/server.go index 54914a8ec6..1c16fa1cf5 100644 --- a/services/users/pkg/server/debug/server.go +++ b/services/users/pkg/server/debug/server.go @@ -3,8 +3,8 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/web/pkg/apps/apps.go b/services/web/pkg/apps/apps.go index 3add9175f4..006c6fe5cf 100644 --- a/services/web/pkg/apps/apps.go +++ b/services/web/pkg/apps/apps.go @@ -10,8 +10,8 @@ import ( "github.com/go-playground/validator/v10" "golang.org/x/exp/maps" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/path/filepathx" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/x/path/filepathx" "github.com/opencloud-eu/opencloud/services/web/pkg/config" ) diff --git a/services/web/pkg/apps/apps_test.go b/services/web/pkg/apps/apps_test.go index 7b72123aec..08485cdc05 100644 --- a/services/web/pkg/apps/apps_test.go +++ b/services/web/pkg/apps/apps_test.go @@ -7,7 +7,7 @@ import ( "github.com/onsi/gomega" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/web/pkg/apps" "github.com/opencloud-eu/opencloud/services/web/pkg/config" ) diff --git a/services/web/pkg/command/health.go b/services/web/pkg/command/health.go index 75f29a0219..a03913be95 100644 --- a/services/web/pkg/command/health.go +++ b/services/web/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/web/pkg/config" "github.com/opencloud-eu/opencloud/services/web/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/web/pkg/logging" diff --git a/services/web/pkg/command/root.go b/services/web/pkg/command/root.go index f6cdcb7e08..1b7756dd66 100644 --- a/services/web/pkg/command/root.go +++ b/services/web/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/web/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/web/pkg/command/server.go b/services/web/pkg/command/server.go index 439c535945..25eeec2083 100644 --- a/services/web/pkg/command/server.go +++ b/services/web/pkg/command/server.go @@ -7,8 +7,8 @@ import ( "os" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/tracing" "github.com/opencloud-eu/opencloud/services/web/pkg/config" "github.com/opencloud-eu/opencloud/services/web/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/web/pkg/logging" diff --git a/services/web/pkg/command/version.go b/services/web/pkg/command/version.go index 72fee0ce67..663c168d6b 100644 --- a/services/web/pkg/command/version.go +++ b/services/web/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/web/pkg/config" diff --git a/services/web/pkg/config/config.go b/services/web/pkg/config/config.go index 9568945112..af24dd2bb6 100644 --- a/services/web/pkg/config/config.go +++ b/services/web/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/web/pkg/config/defaults/defaultconfig.go b/services/web/pkg/config/defaults/defaultconfig.go index 438682a8b7..ac8e4c78f9 100644 --- a/services/web/pkg/config/defaults/defaultconfig.go +++ b/services/web/pkg/config/defaults/defaultconfig.go @@ -4,7 +4,7 @@ import ( "path/filepath" "strings" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" + "github.com/opencloud-eu/opencloud/pkg/config/defaults" "github.com/opencloud-eu/opencloud/services/web/pkg/config" ) diff --git a/services/web/pkg/config/http.go b/services/web/pkg/config/http.go index f82ed0225b..1788d3a941 100644 --- a/services/web/pkg/config/http.go +++ b/services/web/pkg/config/http.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // HTTP defines the available http configuration. type HTTP struct { diff --git a/services/web/pkg/config/parser/parse.go b/services/web/pkg/config/parser/parse.go index 72aa8a4ce4..a74b4e2079 100644 --- a/services/web/pkg/config/parser/parse.go +++ b/services/web/pkg/config/parser/parse.go @@ -3,9 +3,9 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/shared" "github.com/opencloud-eu/opencloud/services/web/pkg/config" "github.com/opencloud-eu/opencloud/services/web/pkg/config/defaults" ) diff --git a/services/web/pkg/config/tracing.go b/services/web/pkg/config/tracing.go index 4730738884..8c2b0f6b59 100644 --- a/services/web/pkg/config/tracing.go +++ b/services/web/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/web/pkg/logging/logging.go b/services/web/pkg/logging/logging.go index 09f46005f4..20ce81534b 100644 --- a/services/web/pkg/logging/logging.go +++ b/services/web/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/web/pkg/config" ) diff --git a/services/web/pkg/server/debug/option.go b/services/web/pkg/server/debug/option.go index cfdbbb6779..396a92df1f 100644 --- a/services/web/pkg/server/debug/option.go +++ b/services/web/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/web/pkg/config" ) diff --git a/services/web/pkg/server/debug/server.go b/services/web/pkg/server/debug/server.go index 0471857682..a578204b98 100644 --- a/services/web/pkg/server/debug/server.go +++ b/services/web/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/web/pkg/server/http/option.go b/services/web/pkg/server/http/option.go index bbff6660d1..1187cb4b9e 100644 --- a/services/web/pkg/server/http/option.go +++ b/services/web/pkg/server/http/option.go @@ -3,7 +3,7 @@ package http import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/web/pkg/config" "github.com/opencloud-eu/opencloud/services/web/pkg/metrics" "github.com/urfave/cli/v2" diff --git a/services/web/pkg/server/http/server.go b/services/web/pkg/server/http/server.go index 383a4ab8e6..6952f513d8 100644 --- a/services/web/pkg/server/http/server.go +++ b/services/web/pkg/server/http/server.go @@ -8,12 +8,12 @@ import ( chimiddleware "github.com/go-chi/chi/v5/middleware" "go-micro.dev/v4" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/version" + "github.com/opencloud-eu/opencloud/pkg/x/io/fsx" "github.com/opencloud-eu/opencloud/services/web" "github.com/opencloud-eu/opencloud/services/web/pkg/apps" svc "github.com/opencloud-eu/opencloud/services/web/pkg/service/v0" diff --git a/services/web/pkg/service/v0/logging.go b/services/web/pkg/service/v0/logging.go index 436394a6eb..761a07f6e6 100644 --- a/services/web/pkg/service/v0/logging.go +++ b/services/web/pkg/service/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/services/web/pkg/service/v0/option.go b/services/web/pkg/service/v0/option.go index f56bad94e0..c85faa318c 100644 --- a/services/web/pkg/service/v0/option.go +++ b/services/web/pkg/service/v0/option.go @@ -8,8 +8,8 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "go.opentelemetry.io/otel/trace" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/x/io/fsx" "github.com/opencloud-eu/opencloud/services/web/pkg/config" ) diff --git a/services/web/pkg/service/v0/service.go b/services/web/pkg/service/v0/service.go index d675c87849..68930202f2 100644 --- a/services/web/pkg/service/v0/service.go +++ b/services/web/pkg/service/v0/service.go @@ -15,11 +15,11 @@ import ( "github.com/go-chi/chi/v5" "github.com/riandyrn/otelchi" - "github.com/opencloud-eu/opencloud/ocis-pkg/account" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/pkg/account" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/x/io/fsx" "github.com/opencloud-eu/opencloud/services/web/pkg/assets" "github.com/opencloud-eu/opencloud/services/web/pkg/config" "github.com/opencloud-eu/opencloud/services/web/pkg/theme" diff --git a/services/web/pkg/theme/kv_test.go b/services/web/pkg/theme/kv_test.go index e188ce34ff..11901619d7 100644 --- a/services/web/pkg/theme/kv_test.go +++ b/services/web/pkg/theme/kv_test.go @@ -7,7 +7,7 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/assert" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/pkg/x/io/fsx" "github.com/opencloud-eu/opencloud/services/web/pkg/theme" ) diff --git a/services/web/pkg/theme/service.go b/services/web/pkg/theme/service.go index b8feed96cf..5e7adff647 100644 --- a/services/web/pkg/theme/service.go +++ b/services/web/pkg/theme/service.go @@ -13,8 +13,8 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/path/filepathx" + "github.com/opencloud-eu/opencloud/pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/pkg/x/path/filepathx" ) // ServiceOptions defines the options to configure the Service. diff --git a/services/web/pkg/theme/service_test.go b/services/web/pkg/theme/service_test.go index 39beaf6abd..ca392582df 100644 --- a/services/web/pkg/theme/service_test.go +++ b/services/web/pkg/theme/service_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/tidwall/gjson" - "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/pkg/x/io/fsx" "github.com/opencloud-eu/opencloud/services/graph/mocks" "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" "github.com/opencloud-eu/opencloud/services/web/pkg/theme" diff --git a/services/web/pkg/theme/theme.go b/services/web/pkg/theme/theme.go index fdd4ebfb62..56f190d04e 100644 --- a/services/web/pkg/theme/theme.go +++ b/services/web/pkg/theme/theme.go @@ -3,7 +3,7 @@ package theme import ( "path" - "github.com/opencloud-eu/opencloud/ocis-pkg/capabilities" + "github.com/opencloud-eu/opencloud/pkg/capabilities" "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) diff --git a/services/webdav/pkg/command/health.go b/services/webdav/pkg/command/health.go index 885ce5bdc9..593404c872 100644 --- a/services/webdav/pkg/command/health.go +++ b/services/webdav/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/webdav/pkg/logging" diff --git a/services/webdav/pkg/command/root.go b/services/webdav/pkg/command/root.go index fd4c48de43..4e2a1abf6d 100644 --- a/services/webdav/pkg/command/root.go +++ b/services/webdav/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/webdav/pkg/command/server.go b/services/webdav/pkg/command/server.go index 06fd039f62..51cf58ecde 100644 --- a/services/webdav/pkg/command/server.go +++ b/services/webdav/pkg/command/server.go @@ -5,10 +5,10 @@ import ( "fmt" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - ogrpc "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + ogrpc "github.com/opencloud-eu/opencloud/pkg/service/grpc" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/webdav/pkg/logging" diff --git a/services/webdav/pkg/command/version.go b/services/webdav/pkg/command/version.go index 40aa94475f..d9f626fcef 100644 --- a/services/webdav/pkg/command/version.go +++ b/services/webdav/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" diff --git a/services/webdav/pkg/config/config.go b/services/webdav/pkg/config/config.go index b4a6f4c170..8aa4242207 100644 --- a/services/webdav/pkg/config/config.go +++ b/services/webdav/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" "go-micro.dev/v4/client" ) diff --git a/services/webdav/pkg/config/defaults/defaultconfig.go b/services/webdav/pkg/config/defaults/defaultconfig.go index a5fc087054..a0ac05715b 100644 --- a/services/webdav/pkg/config/defaults/defaultconfig.go +++ b/services/webdav/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "strings" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/structs" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" ) diff --git a/services/webdav/pkg/config/http.go b/services/webdav/pkg/config/http.go index 79f3876b69..b2158ed7dd 100644 --- a/services/webdav/pkg/config/http.go +++ b/services/webdav/pkg/config/http.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // CORS defines the available cors configuration. type CORS struct { diff --git a/services/webdav/pkg/config/parser/parse.go b/services/webdav/pkg/config/parser/parse.go index 234e54e4ca..11be3cdabe 100644 --- a/services/webdav/pkg/config/parser/parse.go +++ b/services/webdav/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/webdav/pkg/config/tracing.go b/services/webdav/pkg/config/tracing.go index 75812a2583..96a338bdd8 100644 --- a/services/webdav/pkg/config/tracing.go +++ b/services/webdav/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/webdav/pkg/logging/logging.go b/services/webdav/pkg/logging/logging.go index f306ebdead..6b06e3b0b3 100644 --- a/services/webdav/pkg/logging/logging.go +++ b/services/webdav/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" ) diff --git a/services/webdav/pkg/server/debug/option.go b/services/webdav/pkg/server/debug/option.go index cb7ef5e2d4..2b0a596b03 100644 --- a/services/webdav/pkg/server/debug/option.go +++ b/services/webdav/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" ) diff --git a/services/webdav/pkg/server/debug/server.go b/services/webdav/pkg/server/debug/server.go index e48ed33ac9..63fa005ad2 100644 --- a/services/webdav/pkg/server/debug/server.go +++ b/services/webdav/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/webdav/pkg/server/http/option.go b/services/webdav/pkg/server/http/option.go index 682c7d550e..56859aef7c 100644 --- a/services/webdav/pkg/server/http/option.go +++ b/services/webdav/pkg/server/http/option.go @@ -3,7 +3,7 @@ package http import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" "github.com/opencloud-eu/opencloud/services/webdav/pkg/metrics" "github.com/urfave/cli/v2" diff --git a/services/webdav/pkg/server/http/server.go b/services/webdav/pkg/server/http/server.go index e9766a6e85..4e7c794f24 100644 --- a/services/webdav/pkg/server/http/server.go +++ b/services/webdav/pkg/server/http/server.go @@ -4,10 +4,10 @@ import ( "fmt" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/middleware" + "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/version" svc "github.com/opencloud-eu/opencloud/services/webdav/pkg/service/v0" "go-micro.dev/v4" ) diff --git a/services/webdav/pkg/service/v0/logging.go b/services/webdav/pkg/service/v0/logging.go index 675a9d07b5..1697371869 100644 --- a/services/webdav/pkg/service/v0/logging.go +++ b/services/webdav/pkg/service/v0/logging.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // NewLogging returns a service that logs messages. diff --git a/services/webdav/pkg/service/v0/option.go b/services/webdav/pkg/service/v0/option.go index 78fad2cf45..22bdc0525c 100644 --- a/services/webdav/pkg/service/v0/option.go +++ b/services/webdav/pkg/service/v0/option.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" "go.opentelemetry.io/otel/trace" ) diff --git a/services/webdav/pkg/service/v0/service.go b/services/webdav/pkg/service/v0/service.go index c2849e76df..d4a0e99250 100644 --- a/services/webdav/pkg/service/v0/service.go +++ b/services/webdav/pkg/service/v0/service.go @@ -24,9 +24,9 @@ import ( merrors "go-micro.dev/v4/errors" grpcmetadata "google.golang.org/grpc/metadata" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/log" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/tracing" thumbnailsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/thumbnails/v0" searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" thumbnailssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/thumbnails/v0" diff --git a/services/webfinger/pkg/command/health.go b/services/webfinger/pkg/command/health.go index 25375e307c..cb1fdfe4b2 100644 --- a/services/webfinger/pkg/command/health.go +++ b/services/webfinger/pkg/command/health.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/logging" diff --git a/services/webfinger/pkg/command/root.go b/services/webfinger/pkg/command/root.go index abdb719ec2..dc9d6be680 100644 --- a/services/webfinger/pkg/command/root.go +++ b/services/webfinger/pkg/command/root.go @@ -3,7 +3,7 @@ package command import ( "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/pkg/clihelper" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/webfinger/pkg/command/server.go b/services/webfinger/pkg/command/server.go index 52a208a529..0115e8aad1 100644 --- a/services/webfinger/pkg/command/server.go +++ b/services/webfinger/pkg/command/server.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/oklog/run" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/config/configlog" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config/parser" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/logging" diff --git a/services/webfinger/pkg/command/version.go b/services/webfinger/pkg/command/version.go index 18fed51e1e..a2504afc19 100644 --- a/services/webfinger/pkg/command/version.go +++ b/services/webfinger/pkg/command/version.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/version" tw "github.com/olekukonko/tablewriter" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" diff --git a/services/webfinger/pkg/config/config.go b/services/webfinger/pkg/config/config.go index 4c3971763d..1760e9d244 100644 --- a/services/webfinger/pkg/config/config.go +++ b/services/webfinger/pkg/config/config.go @@ -3,7 +3,7 @@ package config import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/webfinger/pkg/config/http.go b/services/webfinger/pkg/config/http.go index 737710e1ae..651587cb4c 100644 --- a/services/webfinger/pkg/config/http.go +++ b/services/webfinger/pkg/config/http.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/pkg/shared" // CORS defines the available cors configuration. type CORS struct { diff --git a/services/webfinger/pkg/config/parser/parse.go b/services/webfinger/pkg/config/parser/parse.go index 767b2defe3..4ef917c859 100644 --- a/services/webfinger/pkg/config/parser/parse.go +++ b/services/webfinger/pkg/config/parser/parse.go @@ -3,11 +3,11 @@ package parser import ( "errors" - ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/pkg/config" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config/defaults" - "github.com/opencloud-eu/opencloud/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/pkg/config/envdecode" ) // ParseConfig loads configuration from known paths. diff --git a/services/webfinger/pkg/config/tracing.go b/services/webfinger/pkg/config/tracing.go index 9445844489..5dcfebf8bc 100644 --- a/services/webfinger/pkg/config/tracing.go +++ b/services/webfinger/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/webfinger/pkg/logging/logging.go b/services/webfinger/pkg/logging/logging.go index e2a5f2eac1..98756b62dc 100644 --- a/services/webfinger/pkg/logging/logging.go +++ b/services/webfinger/pkg/logging/logging.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" ) diff --git a/services/webfinger/pkg/metrics/options.go b/services/webfinger/pkg/metrics/options.go index 10ec24b6c3..304456e7d1 100644 --- a/services/webfinger/pkg/metrics/options.go +++ b/services/webfinger/pkg/metrics/options.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" ) // Option defines a single option function. diff --git a/services/webfinger/pkg/relations/owncloud_instance.go b/services/webfinger/pkg/relations/owncloud_instance.go index 5cf047612a..3a839ecdc0 100644 --- a/services/webfinger/pkg/relations/owncloud_instance.go +++ b/services/webfinger/pkg/relations/owncloud_instance.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/service/v0" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/webfinger" diff --git a/services/webfinger/pkg/relations/owncloud_instance_test.go b/services/webfinger/pkg/relations/owncloud_instance_test.go index f1051f0746..138fa9db1f 100644 --- a/services/webfinger/pkg/relations/owncloud_instance_test.go +++ b/services/webfinger/pkg/relations/owncloud_instance_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/pkg/oidc" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/webfinger" ) diff --git a/services/webfinger/pkg/server/debug/option.go b/services/webfinger/pkg/server/debug/option.go index 99c7a2b2d1..5822afc4f6 100644 --- a/services/webfinger/pkg/server/debug/option.go +++ b/services/webfinger/pkg/server/debug/option.go @@ -3,7 +3,7 @@ package debug import ( "context" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" ) diff --git a/services/webfinger/pkg/server/debug/server.go b/services/webfinger/pkg/server/debug/server.go index e48ed33ac9..63fa005ad2 100644 --- a/services/webfinger/pkg/server/debug/server.go +++ b/services/webfinger/pkg/server/debug/server.go @@ -3,10 +3,10 @@ package debug import ( "net/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/checks" - "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" - "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/checks" + "github.com/opencloud-eu/opencloud/pkg/handlers" + "github.com/opencloud-eu/opencloud/pkg/service/debug" + "github.com/opencloud-eu/opencloud/pkg/version" ) // Server initializes the debug service and server. diff --git a/services/webfinger/pkg/server/http/option.go b/services/webfinger/pkg/server/http/option.go index 70e187c331..5f9b9153e1 100644 --- a/services/webfinger/pkg/server/http/option.go +++ b/services/webfinger/pkg/server/http/option.go @@ -2,9 +2,10 @@ package http import ( "context" + "go.opentelemetry.io/otel/trace/noop" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" svc "github.com/opencloud-eu/opencloud/services/webfinger/pkg/service/v0" "github.com/urfave/cli/v2" diff --git a/services/webfinger/pkg/server/http/server.go b/services/webfinger/pkg/server/http/server.go index 38f76b5ac0..239ca5e67a 100644 --- a/services/webfinger/pkg/server/http/server.go +++ b/services/webfinger/pkg/server/http/server.go @@ -9,11 +9,11 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/go-chi/render" - "github.com/opencloud-eu/opencloud/ocis-pkg/cors" - "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" - ohttp "github.com/opencloud-eu/opencloud/ocis-pkg/service/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" - "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/pkg/cors" + "github.com/opencloud-eu/opencloud/pkg/middleware" + ohttp "github.com/opencloud-eu/opencloud/pkg/service/http" + "github.com/opencloud-eu/opencloud/pkg/tracing" + "github.com/opencloud-eu/opencloud/pkg/version" serviceErrors "github.com/opencloud-eu/opencloud/services/webfinger/pkg/service/v0" svc "github.com/opencloud-eu/opencloud/services/webfinger/pkg/service/v0" "github.com/pkg/errors" diff --git a/services/webfinger/pkg/service/v0/logging.go b/services/webfinger/pkg/service/v0/logging.go index d58d93f530..4f03b76958 100644 --- a/services/webfinger/pkg/service/v0/logging.go +++ b/services/webfinger/pkg/service/v0/logging.go @@ -4,7 +4,7 @@ import ( "context" "net/url" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/webfinger" ) diff --git a/services/webfinger/pkg/service/v0/option.go b/services/webfinger/pkg/service/v0/option.go index f2ea2d7afd..e96f473f2f 100644 --- a/services/webfinger/pkg/service/v0/option.go +++ b/services/webfinger/pkg/service/v0/option.go @@ -1,7 +1,7 @@ package service import ( - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" ) diff --git a/services/webfinger/pkg/service/v0/service.go b/services/webfinger/pkg/service/v0/service.go index 180543b639..eb3dbeabbc 100644 --- a/services/webfinger/pkg/service/v0/service.go +++ b/services/webfinger/pkg/service/v0/service.go @@ -4,7 +4,7 @@ import ( "context" "net/url" - "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/pkg/log" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" "github.com/opencloud-eu/opencloud/services/webfinger/pkg/webfinger" ) diff --git a/vendor/github.com/cs3org/reva/v2/pkg/app/registry/micro/manager.go b/vendor/github.com/cs3org/reva/v2/pkg/app/registry/micro/manager.go index 06846d2ace..0b6d3390b1 100644 --- a/vendor/github.com/cs3org/reva/v2/pkg/app/registry/micro/manager.go +++ b/vendor/github.com/cs3org/reva/v2/pkg/app/registry/micro/manager.go @@ -30,7 +30,7 @@ import ( "github.com/cs3org/reva/v2/pkg/app" "github.com/cs3org/reva/v2/pkg/appctx" "github.com/cs3org/reva/v2/pkg/errtypes" - oreg "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + oreg "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/rs/zerolog/log" mreg "go-micro.dev/v4/registry" ) diff --git a/vendor/github.com/cs3org/reva/v2/pkg/micro/ocdav/service.go b/vendor/github.com/cs3org/reva/v2/pkg/micro/ocdav/service.go index 12e4b01567..2ad82d4f06 100644 --- a/vendor/github.com/cs3org/reva/v2/pkg/micro/ocdav/service.go +++ b/vendor/github.com/cs3org/reva/v2/pkg/micro/ocdav/service.go @@ -34,7 +34,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" httpServer "github.com/go-micro/plugins/v4/server/http" - "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/pkg/registry" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto"