From 8e028f17e9ae2cbf4396d45fed0bc56375164bad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 10 Jan 2025 14:56:46 +0100 Subject: [PATCH] change module name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- docs/helpers/configenvextractor.go | 2 +- docs/helpers/markdowncreation.go | 2 +- go.mod | 2 +- ocis-pkg/account/option.go | 2 +- ocis-pkg/ast/test/test.go | 2 +- ocis-pkg/checks/checkgrpc.go | 2 +- ocis-pkg/checks/checkhttp.go | 2 +- ocis-pkg/checks/checktcp.go | 2 +- ocis-pkg/clihelper/app.go | 2 +- ocis-pkg/config/config.go | 86 ++++++++--------- ocis-pkg/config/config_test.go | 2 +- ocis-pkg/config/defaultconfig.go | 86 ++++++++--------- ocis-pkg/config/helpers.go | 2 +- ocis-pkg/config/parser/parse.go | 8 +- ocis-pkg/conversions/ptr_test.go | 2 +- ocis-pkg/cors/option.go | 2 +- ocis-pkg/crypto/crypto_test.go | 6 +- ocis-pkg/crypto/gencert.go | 2 +- ocis-pkg/crypto/gencert_test.go | 2 +- ocis-pkg/handlers/checker.go | 2 +- ocis-pkg/handlers/checker_test.go | 4 +- ocis-pkg/kql/cast.go | 4 +- ocis-pkg/kql/connect.go | 2 +- ocis-pkg/kql/dictionary_test.go | 8 +- ocis-pkg/kql/factory.go | 2 +- ocis-pkg/kql/kql.go | 2 +- ocis-pkg/kql/kql_test.go | 6 +- ocis-pkg/kql/validate.go | 4 +- ocis-pkg/l10n/l10n.go | 4 +- ocis-pkg/ldap/ldap.go | 2 +- ocis-pkg/log/log_test.go | 4 +- ocis-pkg/middleware/account.go | 4 +- ocis-pkg/middleware/header.go | 2 +- ocis-pkg/middleware/logger.go | 2 +- ocis-pkg/middleware/oidc.go | 2 +- ocis-pkg/middleware/options.go | 2 +- ocis-pkg/middleware/static.go | 4 +- ocis-pkg/oidc/claims_test.go | 2 +- ocis-pkg/oidc/client.go | 4 +- ocis-pkg/oidc/client_test.go | 2 +- ocis-pkg/oidc/metadata.go | 2 +- ocis-pkg/oidc/mocks/oidc_client.go | 2 +- ocis-pkg/oidc/options.go | 4 +- ocis-pkg/registry/register.go | 2 +- ocis-pkg/registry/register_test.go | 2 +- ocis-pkg/registry/registry.go | 2 +- ocis-pkg/roles/manager.go | 6 +- ocis-pkg/roles/option.go | 4 +- ocis-pkg/roles/util.go | 2 +- ocis-pkg/runner/grouprunner_test.go | 2 +- ocis-pkg/runner/runner_test.go | 2 +- ocis-pkg/service/debug/option.go | 2 +- ocis-pkg/service/debug/service.go | 10 +- ocis-pkg/service/grpc/client.go | 4 +- ocis-pkg/service/grpc/option.go | 2 +- ocis-pkg/service/grpc/service.go | 6 +- ocis-pkg/service/http/option.go | 4 +- ocis-pkg/service/http/service.go | 6 +- ocis-pkg/shared/errors.go | 2 +- ocis-pkg/x/io/fsx/fallback_test.go | 2 +- ocis-pkg/x/io/fsx/fsx_test.go | 2 +- ocis-pkg/x/path/filepathx/path_test.go | 2 +- ocis/cmd/ocis/main.go | 2 +- ocis/pkg/backup/backup_test.go | 2 +- ocis/pkg/command/backup.go | 10 +- ocis/pkg/command/benchmark.go | 6 +- ocis/pkg/command/decomposedfs.go | 4 +- ocis/pkg/command/init.go | 8 +- ocis/pkg/command/list.go | 4 +- ocis/pkg/command/migrate.go | 16 ++-- ocis/pkg/command/revisions.go | 10 +- ocis/pkg/command/root.go | 6 +- ocis/pkg/command/server.go | 10 +- ocis/pkg/command/services.go | 94 +++++++++---------- ocis/pkg/command/shares.go | 12 +-- ocis/pkg/command/trash.go | 10 +- ocis/pkg/command/version.go | 8 +- ocis/pkg/init/init.go | 2 +- ocis/pkg/register/command.go | 2 +- ocis/pkg/runtime/cmd/list.go | 2 +- ocis/pkg/runtime/options.go | 2 +- ocis/pkg/runtime/runtime.go | 4 +- ocis/pkg/runtime/service/option.go | 2 +- ocis/pkg/runtime/service/service.go | 88 ++++++++--------- ocis/pkg/runtime/service/sutureservice.go | 2 +- .../eventhistory/v0/eventhistory.pb.go | 2 +- .../eventhistory/v0/eventhistory.pb.micro.go | 2 +- .../v0/mocks/event_history_service.go | 2 +- .../v0/mocks/policies_provider_service.go | 2 +- .../ocis/services/policies/v0/policies.pb.go | 2 +- .../services/policies/v0/policies.pb.micro.go | 2 +- .../v0/mocks/search_provider_service.go | 2 +- .../gen/ocis/services/search/v0/search.pb.go | 2 +- .../services/search/v0/search.pb.micro.go | 2 +- .../settings/v0/mocks/value_service.go | 2 +- .../ocis/services/settings/v0/settings.pb.go | 2 +- .../services/settings/v0/settings.pb.micro.go | 2 +- .../gen/ocis/services/store/v0/store.pb.go | 2 +- .../ocis/services/store/v0/store.pb.micro.go | 2 +- .../thumbnails/v0/mocks/thumbnail_service.go | 2 +- .../services/thumbnails/v0/thumbnails.pb.go | 2 +- .../thumbnails/v0/thumbnails.pb.micro.go | 2 +- services/activitylog/cmd/activitylog/main.go | 4 +- services/activitylog/pkg/command/health.go | 2 +- services/activitylog/pkg/command/root.go | 4 +- services/activitylog/pkg/command/server.go | 26 ++--- services/activitylog/pkg/command/version.go | 2 +- services/activitylog/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- .../activitylog/pkg/config/parser/parse.go | 8 +- services/activitylog/pkg/config/tracing.go | 2 +- services/activitylog/pkg/logging/logging.go | 4 +- .../activitylog/pkg/server/debug/option.go | 4 +- .../activitylog/pkg/server/debug/server.go | 8 +- .../activitylog/pkg/server/http/option.go | 10 +- .../activitylog/pkg/server/http/server.go | 14 +-- services/activitylog/pkg/service/http.go | 10 +- services/activitylog/pkg/service/options.go | 8 +- services/activitylog/pkg/service/response.go | 2 +- services/activitylog/pkg/service/service.go | 8 +- services/antivirus/cmd/antivirus/main.go | 4 +- services/antivirus/pkg/command/health.go | 8 +- services/antivirus/pkg/command/root.go | 4 +- services/antivirus/pkg/command/server.go | 14 +-- services/antivirus/pkg/command/version.go | 4 +- .../pkg/config/defaults/defaultconfig.go | 2 +- services/antivirus/pkg/config/parser/parse.go | 8 +- services/antivirus/pkg/config/tracing.go | 2 +- services/antivirus/pkg/scanners/icap_test.go | 4 +- services/antivirus/pkg/server/debug/option.go | 4 +- services/antivirus/pkg/server/debug/server.go | 8 +- services/antivirus/pkg/service/service.go | 6 +- .../app-provider/cmd/app-provider/main.go | 4 +- services/app-provider/pkg/command/health.go | 8 +- services/app-provider/pkg/command/root.go | 4 +- services/app-provider/pkg/command/server.go | 18 ++-- services/app-provider/pkg/command/version.go | 6 +- services/app-provider/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- .../app-provider/pkg/config/parser/parse.go | 10 +- services/app-provider/pkg/config/tracing.go | 2 +- services/app-provider/pkg/logging/logging.go | 4 +- .../app-provider/pkg/revaconfig/config.go | 2 +- .../app-provider/pkg/server/debug/option.go | 4 +- .../app-provider/pkg/server/debug/server.go | 4 +- .../app-registry/cmd/app-registry/main.go | 4 +- services/app-registry/pkg/command/health.go | 8 +- services/app-registry/pkg/command/root.go | 4 +- services/app-registry/pkg/command/server.go | 18 ++-- services/app-registry/pkg/command/version.go | 6 +- services/app-registry/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- .../app-registry/pkg/config/parser/parse.go | 10 +- services/app-registry/pkg/config/tracing.go | 2 +- services/app-registry/pkg/logging/logging.go | 4 +- .../app-registry/pkg/revaconfig/config.go | 4 +- .../app-registry/pkg/server/debug/option.go | 4 +- .../app-registry/pkg/server/debug/server.go | 4 +- services/audit/cmd/audit/main.go | 4 +- services/audit/pkg/command/health.go | 2 +- services/audit/pkg/command/root.go | 4 +- services/audit/pkg/command/server.go | 14 +-- services/audit/pkg/command/version.go | 2 +- services/audit/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 2 +- services/audit/pkg/config/parser/parse.go | 8 +- services/audit/pkg/logging/logging.go | 4 +- services/audit/pkg/server/debug/option.go | 4 +- services/audit/pkg/server/debug/server.go | 8 +- services/audit/pkg/service/service.go | 6 +- services/audit/pkg/service/service_test.go | 4 +- services/auth-app/cmd/auth-app/main.go | 4 +- services/auth-app/pkg/command/create.go | 10 +- services/auth-app/pkg/command/health.go | 8 +- services/auth-app/pkg/command/root.go | 4 +- services/auth-app/pkg/command/server.go | 24 ++--- services/auth-app/pkg/command/version.go | 6 +- services/auth-app/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- services/auth-app/pkg/config/parser/parse.go | 10 +- services/auth-app/pkg/config/tracing.go | 2 +- services/auth-app/pkg/logging/logging.go | 4 +- services/auth-app/pkg/revaconfig/config.go | 4 +- services/auth-app/pkg/server/debug/option.go | 4 +- services/auth-app/pkg/server/debug/server.go | 4 +- services/auth-app/pkg/server/http/option.go | 6 +- services/auth-app/pkg/server/http/server.go | 14 +-- services/auth-app/pkg/service/option.go | 6 +- services/auth-app/pkg/service/service.go | 8 +- services/auth-basic/cmd/auth-basic/main.go | 4 +- services/auth-basic/pkg/command/health.go | 8 +- services/auth-basic/pkg/command/root.go | 4 +- services/auth-basic/pkg/command/server.go | 20 ++-- services/auth-basic/pkg/command/version.go | 6 +- services/auth-basic/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 8 +- .../auth-basic/pkg/config/parser/parse.go | 10 +- services/auth-basic/pkg/config/tracing.go | 2 +- services/auth-basic/pkg/logging/logging.go | 4 +- services/auth-basic/pkg/revaconfig/config.go | 2 +- .../auth-basic/pkg/server/debug/option.go | 4 +- .../auth-basic/pkg/server/debug/server.go | 4 +- services/auth-bearer/cmd/auth-bearer/main.go | 4 +- services/auth-bearer/pkg/command/health.go | 8 +- services/auth-bearer/pkg/command/root.go | 6 +- services/auth-bearer/pkg/command/server.go | 18 ++-- services/auth-bearer/pkg/command/version.go | 6 +- services/auth-bearer/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- .../auth-bearer/pkg/config/parser/parse.go | 10 +- services/auth-bearer/pkg/config/tracing.go | 2 +- services/auth-bearer/pkg/logging/logging.go | 4 +- services/auth-bearer/pkg/revaconfig/config.go | 2 +- .../auth-bearer/pkg/server/debug/option.go | 4 +- .../auth-bearer/pkg/server/debug/server.go | 4 +- .../auth-machine/cmd/auth-machine/main.go | 4 +- services/auth-machine/pkg/command/health.go | 8 +- services/auth-machine/pkg/command/root.go | 4 +- services/auth-machine/pkg/command/server.go | 18 ++-- services/auth-machine/pkg/command/version.go | 6 +- services/auth-machine/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- .../auth-machine/pkg/config/parser/parse.go | 10 +- services/auth-machine/pkg/config/tracing.go | 2 +- services/auth-machine/pkg/logging/logging.go | 4 +- .../auth-machine/pkg/revaconfig/config.go | 2 +- .../auth-machine/pkg/server/debug/option.go | 4 +- .../auth-machine/pkg/server/debug/server.go | 4 +- .../auth-service/cmd/auth-service/main.go | 4 +- services/auth-service/pkg/command/health.go | 8 +- services/auth-service/pkg/command/root.go | 4 +- services/auth-service/pkg/command/server.go | 18 ++-- services/auth-service/pkg/command/version.go | 6 +- services/auth-service/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- .../auth-service/pkg/config/parser/parse.go | 10 +- services/auth-service/pkg/config/tracing.go | 2 +- services/auth-service/pkg/logging/logging.go | 4 +- .../auth-service/pkg/revaconfig/config.go | 2 +- .../auth-service/pkg/server/debug/option.go | 4 +- .../auth-service/pkg/server/debug/server.go | 4 +- services/clientlog/cmd/clientlog/main.go | 4 +- services/clientlog/pkg/command/health.go | 2 +- services/clientlog/pkg/command/root.go | 4 +- services/clientlog/pkg/command/server.go | 20 ++-- services/clientlog/pkg/command/version.go | 2 +- services/clientlog/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- services/clientlog/pkg/config/parser/parse.go | 10 +- services/clientlog/pkg/config/tracing.go | 2 +- services/clientlog/pkg/logging/logging.go | 4 +- services/clientlog/pkg/server/debug/option.go | 4 +- services/clientlog/pkg/server/debug/server.go | 8 +- services/clientlog/pkg/service/options.go | 4 +- services/clientlog/pkg/service/service.go | 4 +- .../collaboration/mocks/connector_service.go | 2 +- .../mocks/content_connector_service.go | 2 +- .../mocks/file_connector_service.go | 2 +- services/collaboration/pkg/command/health.go | 8 +- services/collaboration/pkg/command/root.go | 4 +- services/collaboration/pkg/command/server.go | 22 ++--- services/collaboration/pkg/command/version.go | 6 +- services/collaboration/pkg/config/config.go | 4 +- services/collaboration/pkg/config/cs3api.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- services/collaboration/pkg/config/http.go | 2 +- .../collaboration/pkg/config/parser/parse.go | 12 +-- .../pkg/connector/contentconnector.go | 6 +- .../pkg/connector/contentconnector_test.go | 8 +- .../pkg/connector/fileconnector.go | 10 +- .../pkg/connector/fileconnector_test.go | 14 +-- .../pkg/connector/httpadapter.go | 6 +- .../pkg/connector/httpadapter_test.go | 6 +- .../pkg/connector/utf7/utf7_test.go | 2 +- .../collaboration/pkg/helpers/discovery.go | 4 +- .../pkg/helpers/discovery_test.go | 6 +- .../collaboration/pkg/helpers/registration.go | 8 +- services/collaboration/pkg/logging/logging.go | 4 +- .../collaboration/pkg/middleware/accesslog.go | 2 +- .../collaboration/pkg/middleware/proofkeys.go | 4 +- .../pkg/middleware/wopicontext.go | 4 +- .../pkg/middleware/wopicontext_test.go | 8 +- .../collaboration/pkg/server/debug/option.go | 4 +- .../collaboration/pkg/server/debug/server.go | 8 +- .../collaboration/pkg/server/grpc/option.go | 4 +- .../collaboration/pkg/server/grpc/server.go | 4 +- .../collaboration/pkg/server/http/option.go | 6 +- .../collaboration/pkg/server/http/server.go | 14 +-- .../pkg/service/grpc/v0/option.go | 4 +- .../pkg/service/grpc/v0/service.go | 10 +- .../pkg/service/grpc/v0/service_test.go | 8 +- services/collaboration/pkg/wopisrc/wopisrc.go | 2 +- .../collaboration/pkg/wopisrc/wopisrc_test.go | 4 +- .../eventhistory/cmd/eventhistory/main.go | 4 +- services/eventhistory/pkg/command/health.go | 2 +- services/eventhistory/pkg/command/root.go | 4 +- services/eventhistory/pkg/command/server.go | 20 ++-- services/eventhistory/pkg/command/version.go | 2 +- services/eventhistory/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 +- .../eventhistory/pkg/config/parser/parse.go | 8 +- services/eventhistory/pkg/config/tracing.go | 2 +- services/eventhistory/pkg/logging/logging.go | 4 +- .../eventhistory/pkg/server/debug/option.go | 4 +- .../eventhistory/pkg/server/debug/server.go | 8 +- .../eventhistory/pkg/server/grpc/option.go | 6 +- .../eventhistory/pkg/server/grpc/server.go | 8 +- services/eventhistory/pkg/service/service.go | 8 +- .../eventhistory/pkg/service/service_test.go | 8 +- services/frontend/cmd/frontend/main.go | 4 +- services/frontend/pkg/command/events.go | 16 ++-- services/frontend/pkg/command/health.go | 8 +- services/frontend/pkg/command/root.go | 4 +- services/frontend/pkg/command/server.go | 18 ++-- services/frontend/pkg/command/version.go | 6 +- services/frontend/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- services/frontend/pkg/config/parser/parse.go | 12 +-- services/frontend/pkg/config/tracing.go | 2 +- services/frontend/pkg/logging/logging.go | 4 +- services/frontend/pkg/revaconfig/config.go | 10 +- services/frontend/pkg/server/debug/option.go | 4 +- services/frontend/pkg/server/debug/server.go | 8 +- services/gateway/cmd/gateway/main.go | 4 +- services/gateway/pkg/command/health.go | 8 +- services/gateway/pkg/command/root.go | 4 +- services/gateway/pkg/command/server.go | 18 ++-- services/gateway/pkg/command/version.go | 6 +- services/gateway/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- services/gateway/pkg/config/parser/parse.go | 12 +-- services/gateway/pkg/config/tracing.go | 2 +- services/gateway/pkg/logging/logging.go | 4 +- services/gateway/pkg/revaconfig/config.go | 6 +- services/gateway/pkg/server/debug/option.go | 4 +- services/gateway/pkg/server/debug/server.go | 8 +- services/graph/cmd/graph/main.go | 4 +- .../graph/mocks/drives_drive_item_provider.go | 2 +- services/graph/mocks/permissions.go | 2 +- services/graph/mocks/role_service.go | 2 +- services/graph/pkg/command/health.go | 8 +- services/graph/pkg/command/root.go | 4 +- services/graph/pkg/command/server.go | 18 ++-- services/graph/pkg/command/unified_roles.go | 8 +- services/graph/pkg/command/version.go | 6 +- services/graph/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 10 +- services/graph/pkg/config/http.go | 2 +- services/graph/pkg/config/parser/parse.go | 14 +-- services/graph/pkg/config/tracing.go | 2 +- services/graph/pkg/errorcode/cs3_test.go | 2 +- .../graph/pkg/errorcode/errorcode_test.go | 2 +- services/graph/pkg/identity/backend.go | 2 +- services/graph/pkg/identity/cache.go | 2 +- services/graph/pkg/identity/cs3.go | 6 +- services/graph/pkg/identity/ldap.go | 6 +- services/graph/pkg/identity/ldap/reconnect.go | 2 +- .../pkg/identity/ldap_education_class.go | 2 +- .../pkg/identity/ldap_education_class_test.go | 2 +- .../pkg/identity/ldap_education_school.go | 6 +- .../identity/ldap_education_school_test.go | 6 +- .../graph/pkg/identity/ldap_education_user.go | 2 +- .../pkg/identity/ldap_education_user_test.go | 2 +- services/graph/pkg/identity/ldap_group.go | 2 +- .../graph/pkg/identity/ldap_group_test.go | 2 +- services/graph/pkg/identity/ldap_test.go | 6 +- services/graph/pkg/l10n/translation.go | 2 +- services/graph/pkg/linktype/linktype.go | 2 +- services/graph/pkg/linktype/linktype_test.go | 2 +- services/graph/pkg/logging/logging.go | 4 +- services/graph/pkg/middleware/auth.go | 8 +- services/graph/pkg/middleware/requireadmin.go | 8 +- services/graph/pkg/middleware/token.go | 2 +- services/graph/pkg/server/debug/option.go | 4 +- services/graph/pkg/server/debug/server.go | 8 +- services/graph/pkg/server/http/option.go | 6 +- services/graph/pkg/server/http/server.go | 26 ++--- .../service/v0/api_driveitem_permissions.go | 18 ++-- .../v0/api_driveitem_permissions_links.go | 4 +- .../api_driveitem_permissions_links_test.go | 14 +-- .../v0/api_driveitem_permissions_test.go | 18 ++-- .../pkg/service/v0/api_drives_drive_item.go | 4 +- .../service/v0/api_drives_drive_item_ocm.go | 2 +- .../service/v0/api_drives_drive_item_test.go | 10 +- services/graph/pkg/service/v0/application.go | 4 +- .../graph/pkg/service/v0/application_test.go | 16 ++-- .../pkg/service/v0/approleassignments.go | 6 +- .../pkg/service/v0/approleassignments_test.go | 16 ++-- services/graph/pkg/service/v0/base.go | 12 +-- services/graph/pkg/service/v0/driveitems.go | 4 +- .../graph/pkg/service/v0/driveitems_test.go | 12 +-- services/graph/pkg/service/v0/drives.go | 10 +- .../graph/pkg/service/v0/educationclasses.go | 2 +- .../pkg/service/v0/educationclasses_test.go | 14 +-- .../graph/pkg/service/v0/educationschools.go | 4 +- .../pkg/service/v0/educationschools_test.go | 12 +-- .../graph/pkg/service/v0/educationuser.go | 2 +- .../pkg/service/v0/educationuser_test.go | 14 +-- services/graph/pkg/service/v0/graph.go | 12 +-- .../graph/pkg/service/v0/graph_suite_test.go | 2 +- services/graph/pkg/service/v0/graph_test.go | 18 ++-- services/graph/pkg/service/v0/groups.go | 2 +- services/graph/pkg/service/v0/groups_test.go | 18 ++-- services/graph/pkg/service/v0/option.go | 16 ++-- services/graph/pkg/service/v0/password.go | 2 +- .../graph/pkg/service/v0/password_test.go | 16 ++-- services/graph/pkg/service/v0/personaldata.go | 6 +- .../graph/pkg/service/v0/rolemanagement.go | 4 +- services/graph/pkg/service/v0/service.go | 18 ++-- services/graph/pkg/service/v0/sharedbyme.go | 2 +- .../graph/pkg/service/v0/sharedbyme_test.go | 16 ++-- services/graph/pkg/service/v0/sharedwithme.go | 4 +- .../graph/pkg/service/v0/sharedwithme_test.go | 14 +-- .../graph/pkg/service/v0/spacetemplates.go | 4 +- services/graph/pkg/service/v0/tags.go | 4 +- services/graph/pkg/service/v0/users.go | 12 +-- services/graph/pkg/service/v0/users_filter.go | 4 +- services/graph/pkg/service/v0/users_test.go | 18 ++-- services/graph/pkg/service/v0/utils.go | 8 +- services/graph/pkg/service/v0/utils_test.go | 10 +- .../graph/pkg/unifiedrole/conversion_test.go | 4 +- services/graph/pkg/unifiedrole/filter_test.go | 2 +- services/graph/pkg/unifiedrole/roles.go | 2 +- services/graph/pkg/unifiedrole/roles_test.go | 2 +- services/graph/pkg/validate/libregraph.go | 2 +- .../graph/pkg/validate/libregraph_test.go | 6 +- services/groups/cmd/groups/main.go | 4 +- services/groups/pkg/command/health.go | 8 +- services/groups/pkg/command/root.go | 4 +- services/groups/pkg/command/server.go | 20 ++-- services/groups/pkg/command/version.go | 6 +- services/groups/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 8 +- services/groups/pkg/config/parser/parse.go | 10 +- services/groups/pkg/config/tracing.go | 2 +- services/groups/pkg/logging/logging.go | 4 +- services/groups/pkg/revaconfig/config.go | 2 +- services/groups/pkg/server/debug/option.go | 4 +- services/groups/pkg/server/debug/server.go | 4 +- services/idm/cmd/idm/main.go | 4 +- services/idm/pkg/command/health.go | 8 +- services/idm/pkg/command/resetpw.go | 10 +- services/idm/pkg/command/root.go | 4 +- services/idm/pkg/command/server.go | 16 ++-- services/idm/pkg/command/version.go | 2 +- services/idm/pkg/config/config.go | 2 +- .../idm/pkg/config/defaults/defaultconfig.go | 4 +- services/idm/pkg/config/parser/parse.go | 10 +- services/idm/pkg/logging/logging.go | 4 +- services/idm/pkg/server/debug/option.go | 4 +- services/idm/pkg/server/debug/server.go | 4 +- services/idp/cmd/idp/main.go | 4 +- services/idp/pkg/assets/option.go | 8 +- .../idp/pkg/backends/cs3/bootstrap/cs3.go | 2 +- services/idp/pkg/command/health.go | 8 +- services/idp/pkg/command/root.go | 4 +- services/idp/pkg/command/server.go | 18 ++-- services/idp/pkg/command/version.go | 6 +- services/idp/pkg/config/config.go | 2 +- .../idp/pkg/config/defaults/defaultconfig.go | 8 +- services/idp/pkg/config/parser/parse.go | 10 +- services/idp/pkg/config/tracing.go | 2 +- services/idp/pkg/logging/logging.go | 4 +- services/idp/pkg/server/debug/option.go | 4 +- services/idp/pkg/server/debug/server.go | 8 +- services/idp/pkg/server/http/option.go | 6 +- services/idp/pkg/server/http/server.go | 12 +-- services/idp/pkg/service/v0/instrument.go | 2 +- services/idp/pkg/service/v0/logging.go | 2 +- services/idp/pkg/service/v0/option.go | 4 +- services/idp/pkg/service/v0/service.go | 14 +-- services/invitations/cmd/invitations/main.go | 4 +- .../pkg/backends/keycloak/backend.go | 6 +- .../pkg/backends/keycloak/backend_test.go | 10 +- .../pkg/backends/keycloak/mocks/client.go | 2 +- services/invitations/pkg/command/health.go | 8 +- services/invitations/pkg/command/root.go | 4 +- services/invitations/pkg/command/server.go | 20 ++-- services/invitations/pkg/command/version.go | 6 +- services/invitations/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 2 +- services/invitations/pkg/config/http.go | 2 +- .../invitations/pkg/config/parser/parse.go | 8 +- services/invitations/pkg/config/tracing.go | 2 +- services/invitations/pkg/logging/logging.go | 4 +- services/invitations/pkg/metrics/options.go | 2 +- .../invitations/pkg/server/debug/option.go | 4 +- .../invitations/pkg/server/debug/server.go | 8 +- .../invitations/pkg/server/http/option.go | 6 +- .../invitations/pkg/server/http/server.go | 16 ++-- .../invitations/pkg/service/v0/instrument.go | 4 +- .../invitations/pkg/service/v0/logging.go | 4 +- services/invitations/pkg/service/v0/option.go | 4 +- .../invitations/pkg/service/v0/service.go | 8 +- .../invitations/pkg/service/v0/tracing.go | 2 +- services/nats/cmd/nats/main.go | 4 +- services/nats/pkg/command/health.go | 2 +- services/nats/pkg/command/root.go | 4 +- services/nats/pkg/command/server.go | 14 +-- services/nats/pkg/command/version.go | 2 +- services/nats/pkg/config/config.go | 2 +- .../nats/pkg/config/defaults/defaultconfig.go | 4 +- services/nats/pkg/config/parser/parse.go | 8 +- services/nats/pkg/logging/logging.go | 4 +- services/nats/pkg/logging/nats.go | 2 +- services/nats/pkg/server/debug/option.go | 4 +- services/nats/pkg/server/debug/server.go | 8 +- .../notifications/cmd/notifications/main.go | 4 +- .../notifications/pkg/channels/channels.go | 4 +- services/notifications/pkg/command/health.go | 2 +- services/notifications/pkg/command/root.go | 4 +- .../notifications/pkg/command/send_email.go | 2 +- services/notifications/pkg/command/server.go | 24 ++--- services/notifications/pkg/command/version.go | 2 +- services/notifications/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- .../notifications/pkg/config/parser/parse.go | 12 +-- services/notifications/pkg/config/tracing.go | 2 +- services/notifications/pkg/email/composer.go | 2 +- services/notifications/pkg/email/email.go | 2 +- services/notifications/pkg/email/templates.go | 2 +- services/notifications/pkg/logging/logging.go | 4 +- .../notifications/pkg/server/debug/option.go | 4 +- .../notifications/pkg/server/debug/server.go | 8 +- services/notifications/pkg/service/filter.go | 6 +- .../notifications/pkg/service/filter_test.go | 6 +- services/notifications/pkg/service/job.go | 8 +- .../pkg/service/notification_suite_test.go | 2 +- .../notifications/pkg/service/persistence.go | 6 +- .../notifications/pkg/service/sciencemesh.go | 4 +- services/notifications/pkg/service/service.go | 16 ++-- .../notifications/pkg/service/service_test.go | 14 +-- services/notifications/pkg/service/shares.go | 4 +- services/notifications/pkg/service/spaces.go | 4 +- .../notifications/pkg/service/splitter.go | 8 +- .../pkg/service/splitter_test.go | 8 +- services/ocdav/cmd/ocdav/main.go | 4 +- services/ocdav/pkg/command/health.go | 8 +- services/ocdav/pkg/command/root.go | 4 +- services/ocdav/pkg/command/server.go | 18 ++-- services/ocdav/pkg/command/version.go | 6 +- services/ocdav/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 8 +- services/ocdav/pkg/config/parser/parse.go | 10 +- services/ocdav/pkg/config/tracing.go | 2 +- services/ocdav/pkg/logging/logging.go | 4 +- services/ocdav/pkg/server/debug/option.go | 4 +- services/ocdav/pkg/server/debug/server.go | 4 +- services/ocm/cmd/ocm/main.go | 4 +- services/ocm/pkg/command/health.go | 2 +- services/ocm/pkg/command/root.go | 4 +- services/ocm/pkg/command/server.go | 18 ++-- services/ocm/pkg/command/version.go | 2 +- services/ocm/pkg/config/config.go | 2 +- .../ocm/pkg/config/defaults/defaultconfig.go | 8 +- services/ocm/pkg/config/parser/parse.go | 12 +-- services/ocm/pkg/config/tracing.go | 2 +- services/ocm/pkg/logging/logging.go | 4 +- services/ocm/pkg/revaconfig/config.go | 4 +- services/ocm/pkg/server/debug/option.go | 4 +- services/ocm/pkg/server/debug/server.go | 8 +- services/ocs/cmd/ocs/main.go | 4 +- services/ocs/pkg/command/health.go | 8 +- services/ocs/pkg/command/root.go | 4 +- services/ocs/pkg/command/server.go | 20 ++-- services/ocs/pkg/command/version.go | 6 +- services/ocs/pkg/config/config.go | 2 +- .../ocs/pkg/config/defaults/defaultconfig.go | 4 +- services/ocs/pkg/config/http.go | 2 +- services/ocs/pkg/config/parser/parse.go | 10 +- services/ocs/pkg/config/tracing.go | 2 +- services/ocs/pkg/logging/logging.go | 4 +- services/ocs/pkg/server/debug/option.go | 4 +- services/ocs/pkg/server/debug/server.go | 8 +- services/ocs/pkg/server/http/option.go | 6 +- services/ocs/pkg/server/http/server.go | 10 +- services/ocs/pkg/service/v0/instrument.go | 2 +- services/ocs/pkg/service/v0/logging.go | 2 +- services/ocs/pkg/service/v0/option.go | 4 +- .../ocs/pkg/service/v0/response/response.go | 2 +- .../ocs/pkg/service/v0/response/version.go | 2 +- services/ocs/pkg/service/v0/service.go | 14 +-- services/ocs/pkg/service/v0/tracing.go | 2 +- services/ocs/pkg/service/v0/users.go | 4 +- services/policies/cmd/policies/main.go | 4 +- services/policies/pkg/command/health.go | 8 +- services/policies/pkg/command/root.go | 4 +- services/policies/pkg/command/server.go | 24 ++--- services/policies/pkg/command/version.go | 6 +- services/policies/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 +- services/policies/pkg/config/parser/parse.go | 8 +- services/policies/pkg/config/tracing.go | 2 +- services/policies/pkg/engine/engine.go | 2 +- services/policies/pkg/engine/engine_test.go | 4 +- services/policies/pkg/engine/opa/engine.go | 6 +- services/policies/pkg/engine/opa/opa.go | 2 +- .../pkg/engine/opa/rf_mimetype_test.go | 2 +- .../pkg/engine/opa/rf_resource_test.go | 2 +- services/policies/pkg/server/debug/option.go | 4 +- services/policies/pkg/server/debug/server.go | 8 +- .../policies/pkg/service/event/service.go | 4 +- services/policies/pkg/service/grpc/service.go | 4 +- .../postprocessing/cmd/postprocessing/main.go | 4 +- services/postprocessing/pkg/command/health.go | 2 +- .../pkg/command/postprocessing.go | 6 +- services/postprocessing/pkg/command/root.go | 4 +- services/postprocessing/pkg/command/server.go | 12 +-- .../postprocessing/pkg/command/version.go | 2 +- services/postprocessing/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 2 +- .../postprocessing/pkg/config/parser/parse.go | 8 +- services/postprocessing/pkg/config/tracing.go | 2 +- .../postprocessing/pkg/logging/logging.go | 4 +- .../pkg/postprocessing/postprocessing.go | 2 +- .../postprocessing/pkg/server/debug/option.go | 4 +- .../postprocessing/pkg/server/debug/server.go | 8 +- .../postprocessing/pkg/service/service.go | 6 +- services/proxy/cmd/proxy/main.go | 4 +- services/proxy/pkg/command/health.go | 8 +- services/proxy/pkg/command/root.go | 4 +- services/proxy/pkg/command/server.go | 44 ++++----- services/proxy/pkg/command/version.go | 6 +- services/proxy/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 8 +- services/proxy/pkg/config/parser/parse.go | 10 +- services/proxy/pkg/config/tracing.go | 2 +- services/proxy/pkg/logging/logging.go | 4 +- services/proxy/pkg/middleware/accesslog.go | 2 +- .../proxy/pkg/middleware/account_resolver.go | 8 +- .../pkg/middleware/account_resolver_test.go | 10 +- services/proxy/pkg/middleware/app_auth.go | 2 +- .../proxy/pkg/middleware/app_auth_test.go | 2 +- .../proxy/pkg/middleware/authentication.go | 4 +- .../pkg/middleware/authentication_test.go | 12 +-- services/proxy/pkg/middleware/basic_auth.go | 6 +- .../proxy/pkg/middleware/basic_auth_test.go | 8 +- .../proxy/pkg/middleware/context_logger.go | 2 +- services/proxy/pkg/middleware/create_home.go | 4 +- services/proxy/pkg/middleware/metrics.go | 2 +- services/proxy/pkg/middleware/oidc_auth.go | 4 +- .../proxy/pkg/middleware/oidc_auth_test.go | 6 +- services/proxy/pkg/middleware/options.go | 14 +-- services/proxy/pkg/middleware/policies.go | 6 +- .../proxy/pkg/middleware/policies_test.go | 10 +- .../proxy/pkg/middleware/public_share_auth.go | 2 +- .../pkg/middleware/public_share_auth_test.go | 2 +- services/proxy/pkg/middleware/security.go | 2 +- .../proxy/pkg/middleware/selector_cookie.go | 8 +- .../proxy/pkg/middleware/signed_url_auth.go | 8 +- .../pkg/middleware/signed_url_auth_test.go | 2 +- services/proxy/pkg/middleware/tracing.go | 2 +- services/proxy/pkg/proxy/option.go | 4 +- services/proxy/pkg/proxy/policy/selector.go | 4 +- .../proxy/pkg/proxy/policy/selector_test.go | 4 +- services/proxy/pkg/proxy/proxy.go | 8 +- .../proxy/pkg/proxy/proxy_integration_test.go | 8 +- services/proxy/pkg/router/router.go | 6 +- services/proxy/pkg/router/router_test.go | 8 +- services/proxy/pkg/server/debug/option.go | 4 +- services/proxy/pkg/server/debug/server.go | 10 +- services/proxy/pkg/server/http/option.go | 6 +- services/proxy/pkg/server/http/server.go | 8 +- .../pkg/staticroutes/backchannellogout.go | 2 +- .../proxy/pkg/staticroutes/staticroutes.go | 8 +- services/proxy/pkg/user/backend/cs3.go | 8 +- services/proxy/pkg/userroles/defaultrole.go | 6 +- services/proxy/pkg/userroles/oidcroles.go | 6 +- services/proxy/pkg/userroles/userroles.go | 6 +- services/search/cmd/search/main.go | 4 +- services/search/pkg/command/health.go | 6 +- services/search/pkg/command/index.go | 12 +-- services/search/pkg/command/root.go | 4 +- services/search/pkg/command/server.go | 20 ++-- services/search/pkg/command/version.go | 6 +- services/search/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 8 +- services/search/pkg/config/grpc.go | 2 +- services/search/pkg/config/parser/parse.go | 10 +- services/search/pkg/config/tracing.go | 2 +- services/search/pkg/content/basic.go | 2 +- services/search/pkg/content/basic_test.go | 4 +- services/search/pkg/content/content_test.go | 2 +- services/search/pkg/content/cs3.go | 2 +- .../search/pkg/content/mocks/extractor.go | 2 +- services/search/pkg/content/tika.go | 4 +- services/search/pkg/content/tika_test.go | 8 +- services/search/pkg/engine/bleve.go | 8 +- services/search/pkg/engine/bleve_test.go | 10 +- services/search/pkg/engine/engine.go | 6 +- services/search/pkg/engine/mocks/engine.go | 4 +- services/search/pkg/logging/logging.go | 4 +- services/search/pkg/query/bleve/bleve.go | 4 +- services/search/pkg/query/bleve/compiler.go | 4 +- .../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/debouncer_test.go | 2 +- services/search/pkg/search/events.go | 4 +- services/search/pkg/search/events_test.go | 8 +- services/search/pkg/search/mocks/searcher.go | 2 +- services/search/pkg/search/search.go | 6 +- .../search/pkg/search/search_suite_test.go | 2 +- services/search/pkg/search/service.go | 12 +-- services/search/pkg/search/service_test.go | 16 ++-- services/search/pkg/server/debug/option.go | 4 +- services/search/pkg/server/debug/server.go | 8 +- services/search/pkg/server/grpc/option.go | 8 +- services/search/pkg/server/grpc/server.go | 8 +- services/search/pkg/service/grpc/v0/option.go | 4 +- .../search/pkg/service/grpc/v0/service.go | 18 ++-- services/settings/cmd/settings/main.go | 4 +- services/settings/pkg/command/health.go | 8 +- services/settings/pkg/command/root.go | 4 +- services/settings/pkg/command/server.go | 24 ++--- services/settings/pkg/command/version.go | 6 +- services/settings/pkg/config/config.go | 4 +- .../pkg/config/defaults/defaultconfig.go | 6 +- services/settings/pkg/config/grpc.go | 2 +- services/settings/pkg/config/http.go | 2 +- services/settings/pkg/config/parser/parse.go | 10 +- services/settings/pkg/config/tracing.go | 2 +- services/settings/pkg/logging/logging.go | 4 +- services/settings/pkg/server/debug/option.go | 4 +- services/settings/pkg/server/debug/server.go | 8 +- services/settings/pkg/server/grpc/option.go | 8 +- services/settings/pkg/server/grpc/server.go | 6 +- services/settings/pkg/server/http/option.go | 8 +- services/settings/pkg/server/http/server.go | 14 +-- services/settings/pkg/service/v0/option.go | 4 +- .../settings/pkg/service/v0/permissions.go | 2 +- services/settings/pkg/service/v0/service.go | 20 ++-- .../settings/pkg/service/v0/service_test.go | 10 +- .../pkg/service/v0/servicedecorator.go | 10 +- services/settings/pkg/service/v0/validator.go | 4 +- .../settings/pkg/settings/mocks/manager.go | 2 +- services/settings/pkg/settings/settings.go | 6 +- .../settings/pkg/store/defaults/defaults.go | 4 +- .../pkg/store/defaults/permissions.go | 2 +- .../settings/pkg/store/defaults/templates.go | 2 +- .../pkg/store/metadata/assignments.go | 6 +- .../pkg/store/metadata/assignments_test.go | 8 +- .../settings/pkg/store/metadata/bundles.go | 6 +- .../pkg/store/metadata/bundles_test.go | 2 +- services/settings/pkg/store/metadata/cache.go | 4 +- .../pkg/store/metadata/permissions.go | 6 +- .../pkg/store/metadata/permissions_test.go | 2 +- services/settings/pkg/store/metadata/store.go | 10 +- .../settings/pkg/store/metadata/store_test.go | 6 +- .../settings/pkg/store/metadata/values.go | 4 +- .../pkg/store/metadata/values_test.go | 2 +- services/settings/pkg/store/registry.go | 2 +- services/settings/pkg/util/resource_helper.go | 2 +- .../settings/pkg/util/resource_helper_test.go | 2 +- services/sharing/cmd/sharing/main.go | 4 +- services/sharing/pkg/command/health.go | 8 +- services/sharing/pkg/command/root.go | 4 +- services/sharing/pkg/command/server.go | 18 ++-- services/sharing/pkg/command/version.go | 6 +- services/sharing/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 8 +- services/sharing/pkg/config/parser/parse.go | 10 +- services/sharing/pkg/config/tracing.go | 2 +- services/sharing/pkg/logging/logging.go | 4 +- services/sharing/pkg/revaconfig/config.go | 6 +- services/sharing/pkg/server/debug/option.go | 4 +- services/sharing/pkg/server/debug/server.go | 8 +- services/sse/cmd/sse/main.go | 4 +- services/sse/pkg/command/health.go | 8 +- services/sse/pkg/command/root.go | 4 +- services/sse/pkg/command/server.go | 14 +-- services/sse/pkg/command/version.go | 4 +- services/sse/pkg/config/config.go | 2 +- .../sse/pkg/config/defaults/defaultconfig.go | 2 +- services/sse/pkg/config/parser/parse.go | 8 +- services/sse/pkg/config/tracing.go | 2 +- services/sse/pkg/server/debug/option.go | 4 +- services/sse/pkg/server/debug/server.go | 8 +- services/sse/pkg/server/http/option.go | 4 +- services/sse/pkg/server/http/server.go | 14 +-- services/sse/pkg/service/service.go | 4 +- .../cmd/storage-publiclink/main.go | 4 +- .../storage-publiclink/pkg/command/health.go | 8 +- .../storage-publiclink/pkg/command/root.go | 4 +- .../storage-publiclink/pkg/command/server.go | 18 ++-- .../storage-publiclink/pkg/command/version.go | 6 +- .../storage-publiclink/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- .../pkg/config/parser/parse.go | 10 +- .../storage-publiclink/pkg/config/tracing.go | 2 +- .../storage-publiclink/pkg/logging/logging.go | 4 +- .../pkg/revaconfig/config.go | 2 +- .../pkg/server/debug/option.go | 4 +- .../pkg/server/debug/server.go | 4 +- .../storage-shares/cmd/storage-shares/main.go | 4 +- services/storage-shares/pkg/command/health.go | 8 +- services/storage-shares/pkg/command/root.go | 4 +- services/storage-shares/pkg/command/server.go | 18 ++-- .../storage-shares/pkg/command/version.go | 6 +- services/storage-shares/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- .../storage-shares/pkg/config/parser/parse.go | 10 +- services/storage-shares/pkg/config/tracing.go | 2 +- .../storage-shares/pkg/logging/logging.go | 4 +- .../storage-shares/pkg/revaconfig/config.go | 2 +- .../storage-shares/pkg/server/debug/option.go | 4 +- .../storage-shares/pkg/server/debug/server.go | 4 +- .../storage-system/cmd/storage-system/main.go | 4 +- services/storage-system/pkg/command/health.go | 8 +- services/storage-system/pkg/command/root.go | 4 +- services/storage-system/pkg/command/server.go | 18 ++-- .../storage-system/pkg/command/version.go | 6 +- services/storage-system/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 8 +- .../storage-system/pkg/config/parser/parse.go | 10 +- services/storage-system/pkg/config/tracing.go | 2 +- .../storage-system/pkg/logging/logging.go | 4 +- .../storage-system/pkg/revaconfig/config.go | 4 +- .../storage-system/pkg/server/debug/option.go | 4 +- .../storage-system/pkg/server/debug/server.go | 4 +- .../storage-users/cmd/storage-users/main.go | 4 +- services/storage-users/pkg/command/health.go | 8 +- services/storage-users/pkg/command/root.go | 4 +- services/storage-users/pkg/command/server.go | 20 ++-- .../storage-users/pkg/command/trash_bin.go | 10 +- services/storage-users/pkg/command/uploads.go | 10 +- services/storage-users/pkg/command/version.go | 6 +- services/storage-users/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 8 +- .../storage-users/pkg/config/parser/parse.go | 12 +-- services/storage-users/pkg/config/tracing.go | 2 +- services/storage-users/pkg/event/event.go | 2 +- services/storage-users/pkg/event/service.go | 6 +- services/storage-users/pkg/logging/logging.go | 4 +- .../storage-users/pkg/revaconfig/config.go | 2 +- .../storage-users/pkg/revaconfig/drivers.go | 2 +- services/storage-users/pkg/revaconfig/user.go | 2 +- .../storage-users/pkg/server/debug/option.go | 4 +- .../storage-users/pkg/server/debug/server.go | 8 +- .../storage-users/pkg/task/task_suite_test.go | 2 +- .../storage-users/pkg/task/trash_bin_test.go | 2 +- services/thumbnails/cmd/thumbnails/main.go | 4 +- services/thumbnails/pkg/command/health.go | 8 +- services/thumbnails/pkg/command/root.go | 4 +- services/thumbnails/pkg/command/server.go | 22 ++--- services/thumbnails/pkg/command/version.go | 6 +- services/thumbnails/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 8 +- services/thumbnails/pkg/config/grpc.go | 2 +- services/thumbnails/pkg/config/http.go | 2 +- .../thumbnails/pkg/config/parser/parse.go | 8 +- services/thumbnails/pkg/config/tracing.go | 2 +- services/thumbnails/pkg/logging/logging.go | 4 +- .../thumbnails/pkg/preprocessor/fontloader.go | 2 +- .../pkg/preprocessor/preprocessor.go | 2 +- .../thumbnails/pkg/server/debug/option.go | 4 +- .../thumbnails/pkg/server/debug/server.go | 8 +- services/thumbnails/pkg/server/grpc/option.go | 6 +- services/thumbnails/pkg/server/grpc/server.go | 18 ++-- services/thumbnails/pkg/server/http/option.go | 6 +- services/thumbnails/pkg/server/http/server.go | 12 +-- .../pkg/service/grpc/v0/decorators/base.go | 2 +- .../service/grpc/v0/decorators/instrument.go | 4 +- .../pkg/service/grpc/v0/decorators/logging.go | 4 +- .../pkg/service/grpc/v0/decorators/tracing.go | 2 +- .../thumbnails/pkg/service/grpc/v0/option.go | 8 +- .../thumbnails/pkg/service/grpc/v0/service.go | 16 ++-- .../pkg/service/http/v0/instrument.go | 2 +- .../thumbnails/pkg/service/http/v0/logging.go | 2 +- .../thumbnails/pkg/service/http/v0/option.go | 6 +- .../thumbnails/pkg/service/http/v0/service.go | 10 +- services/thumbnails/pkg/thumbnail/encoding.go | 2 +- .../pkg/thumbnail/encoding_imaging.go | 2 +- .../thumbnails/pkg/thumbnail/encoding_vips.go | 2 +- .../thumbnails/pkg/thumbnail/generator.go | 2 +- .../pkg/thumbnail/generator_simple.go | 2 +- .../pkg/thumbnail/generator_vips.go | 2 +- .../thumbnails/pkg/thumbnail/imgsource/cs3.go | 4 +- .../pkg/thumbnail/imgsource/webdav.go | 4 +- .../pkg/thumbnail/processor_test.go | 2 +- .../pkg/thumbnail/storage/filesystem.go | 4 +- .../pkg/thumbnail/storage/filesystem_test.go | 2 +- .../thumbnails/pkg/thumbnail/thumbnail.go | 6 +- .../pkg/thumbnail/thumbnail_test.go | 8 +- services/userlog/cmd/userlog/main.go | 4 +- services/userlog/pkg/command/health.go | 2 +- services/userlog/pkg/command/root.go | 4 +- services/userlog/pkg/command/server.go | 26 ++--- services/userlog/pkg/command/version.go | 2 +- services/userlog/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- services/userlog/pkg/config/parser/parse.go | 10 +- services/userlog/pkg/config/tracing.go | 2 +- services/userlog/pkg/logging/logging.go | 4 +- services/userlog/pkg/server/debug/option.go | 4 +- services/userlog/pkg/server/debug/server.go | 8 +- services/userlog/pkg/server/http/option.go | 10 +- services/userlog/pkg/server/http/server.go | 14 +-- services/userlog/pkg/service/conversion.go | 2 +- services/userlog/pkg/service/filter.go | 8 +- services/userlog/pkg/service/filter_test.go | 6 +- services/userlog/pkg/service/http.go | 6 +- services/userlog/pkg/service/options.go | 8 +- services/userlog/pkg/service/service.go | 14 +-- .../userlog/pkg/service/service_suit_test.go | 2 +- services/userlog/pkg/service/service_test.go | 16 ++-- services/userlog/pkg/service/templates.go | 2 +- services/users/cmd/user/main.go | 4 +- services/users/pkg/command/health.go | 8 +- services/users/pkg/command/root.go | 4 +- services/users/pkg/command/server.go | 20 ++-- services/users/pkg/command/version.go | 6 +- services/users/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 8 +- services/users/pkg/config/parser/parse.go | 10 +- services/users/pkg/config/tracing.go | 2 +- services/users/pkg/logging/logging.go | 4 +- services/users/pkg/revaconfig/config.go | 2 +- services/users/pkg/server/debug/option.go | 4 +- services/users/pkg/server/debug/server.go | 4 +- services/web/cmd/web/main.go | 4 +- services/web/pkg/apps/apps.go | 6 +- services/web/pkg/apps/apps_test.go | 6 +- services/web/pkg/command/health.go | 8 +- services/web/pkg/command/root.go | 4 +- services/web/pkg/command/server.go | 16 ++-- services/web/pkg/command/version.go | 6 +- services/web/pkg/config/config.go | 2 +- .../web/pkg/config/defaults/defaultconfig.go | 4 +- services/web/pkg/config/http.go | 2 +- services/web/pkg/config/parser/parse.go | 10 +- services/web/pkg/config/tracing.go | 2 +- services/web/pkg/logging/logging.go | 4 +- services/web/pkg/server/debug/option.go | 4 +- services/web/pkg/server/debug/server.go | 8 +- services/web/pkg/server/http/option.go | 6 +- services/web/pkg/server/http/server.go | 18 ++-- services/web/pkg/service/v0/instrument.go | 2 +- services/web/pkg/service/v0/logging.go | 2 +- services/web/pkg/service/v0/option.go | 6 +- services/web/pkg/service/v0/service.go | 16 ++-- services/web/pkg/theme/kv_test.go | 4 +- services/web/pkg/theme/service.go | 4 +- services/web/pkg/theme/service_test.go | 8 +- services/web/pkg/theme/theme.go | 4 +- services/web/pkg/theme/theme_test.go | 2 +- services/webdav/cmd/webdav/main.go | 4 +- services/webdav/pkg/command/health.go | 8 +- services/webdav/pkg/command/root.go | 4 +- services/webdav/pkg/command/server.go | 20 ++-- services/webdav/pkg/command/version.go | 6 +- services/webdav/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 6 +- services/webdav/pkg/config/http.go | 2 +- services/webdav/pkg/config/parser/parse.go | 8 +- services/webdav/pkg/config/tracing.go | 2 +- services/webdav/pkg/dav/requests/thumbnail.go | 2 +- services/webdav/pkg/logging/logging.go | 4 +- services/webdav/pkg/propfind/propfind.go | 4 +- services/webdav/pkg/server/debug/option.go | 4 +- services/webdav/pkg/server/debug/server.go | 8 +- services/webdav/pkg/server/http/option.go | 6 +- services/webdav/pkg/server/http/server.go | 10 +- services/webdav/pkg/service/v0/instrument.go | 2 +- services/webdav/pkg/service/v0/logging.go | 2 +- services/webdav/pkg/service/v0/option.go | 4 +- services/webdav/pkg/service/v0/search.go | 12 +-- services/webdav/pkg/service/v0/service.go | 18 ++-- services/webfinger/cmd/webfinger/main.go | 4 +- services/webfinger/pkg/command/health.go | 8 +- services/webfinger/pkg/command/root.go | 4 +- services/webfinger/pkg/command/server.go | 22 ++--- services/webfinger/pkg/command/version.go | 6 +- services/webfinger/pkg/config/config.go | 2 +- .../pkg/config/defaults/defaultconfig.go | 4 +- services/webfinger/pkg/config/http.go | 2 +- services/webfinger/pkg/config/parser/parse.go | 8 +- services/webfinger/pkg/config/tracing.go | 2 +- services/webfinger/pkg/logging/logging.go | 4 +- services/webfinger/pkg/metrics/options.go | 2 +- .../pkg/relations/openid_discovery.go | 4 +- .../pkg/relations/openid_discovery_test.go | 2 +- .../pkg/relations/owncloud_instance.go | 8 +- .../pkg/relations/owncloud_instance_test.go | 6 +- services/webfinger/pkg/server/debug/option.go | 4 +- services/webfinger/pkg/server/debug/server.go | 8 +- services/webfinger/pkg/server/http/option.go | 6 +- services/webfinger/pkg/server/http/server.go | 14 +-- .../webfinger/pkg/service/v0/instrument.go | 4 +- services/webfinger/pkg/service/v0/logging.go | 4 +- services/webfinger/pkg/service/v0/option.go | 4 +- services/webfinger/pkg/service/v0/service.go | 6 +- services/webfinger/pkg/service/v0/tracing.go | 2 +- .../reva/v2/pkg/app/registry/micro/manager.go | 2 +- .../cs3org/reva/v2/pkg/micro/ocdav/service.go | 2 +- 995 files changed, 3044 insertions(+), 3044 deletions(-) diff --git a/docs/helpers/configenvextractor.go b/docs/helpers/configenvextractor.go index b680186df3..41b1e451d9 100644 --- a/docs/helpers/configenvextractor.go +++ b/docs/helpers/configenvextractor.go @@ -26,7 +26,7 @@ func RenderTemplates() { log.Fatal(err) } replacer := strings.NewReplacer( - "../../", "github.com/owncloud/ocis/v2/", + "../../", "github.com/opencloud-eu/opencloud/", "/defaultconfig.go", "", ) for i := range paths { diff --git a/docs/helpers/markdowncreation.go b/docs/helpers/markdowncreation.go index 2ae8b98ada..c77f373b15 100644 --- a/docs/helpers/markdowncreation.go +++ b/docs/helpers/markdowncreation.go @@ -10,7 +10,7 @@ import ( "text/template" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/markdown" + "github.com/opencloud-eu/opencloud/ocis-pkg/markdown" ) var _configMarkdown = `{{< include file="services/_includes/%s-config-example.yaml" language="yaml" >}} diff --git a/go.mod b/go.mod index 0d15b33b61..f431f308df 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis/v2 +module github.com/opencloud-eu/opencloud go 1.22.7 diff --git a/ocis-pkg/account/option.go b/ocis-pkg/account/option.go index fe4d07040a..dff192ccfd 100644 --- a/ocis-pkg/account/option.go +++ b/ocis-pkg/account/option.go @@ -1,7 +1,7 @@ package account import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/ast/test/test.go b/ocis-pkg/ast/test/test.go index 946856f8b3..4f9644ba06 100644 --- a/ocis-pkg/ast/test/test.go +++ b/ocis-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/owncloud/ocis/v2/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/ocis-pkg/ast" ) // DiffAst returns a human-readable report of the differences between two values diff --git a/ocis-pkg/checks/checkgrpc.go b/ocis-pkg/checks/checkgrpc.go index c10b53bbf8..6af211de6a 100644 --- a/ocis-pkg/checks/checkgrpc.go +++ b/ocis-pkg/checks/checkgrpc.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" + "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) diff --git a/ocis-pkg/checks/checkhttp.go b/ocis-pkg/checks/checkhttp.go index 48502fe6ac..8d34747189 100644 --- a/ocis-pkg/checks/checkhttp.go +++ b/ocis-pkg/checks/checkhttp.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" + "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" ) // NewHTTPCheck checks the reachability of a http server. diff --git a/ocis-pkg/checks/checktcp.go b/ocis-pkg/checks/checktcp.go index 693ba255ce..939cde157b 100644 --- a/ocis-pkg/checks/checktcp.go +++ b/ocis-pkg/checks/checktcp.go @@ -5,7 +5,7 @@ import ( "net" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" + "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" ) // NewTCPCheck returns a check that connects to a given tcp endpoint. diff --git a/ocis-pkg/clihelper/app.go b/ocis-pkg/clihelper/app.go index fcaa792d61..135b2648a6 100644 --- a/ocis-pkg/clihelper/app.go +++ b/ocis-pkg/clihelper/app.go @@ -1,7 +1,7 @@ package clihelper import ( - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" "github.com/urfave/cli/v2" ) diff --git a/ocis-pkg/config/config.go b/ocis-pkg/config/config.go index 5e469d7bed..46682dacf2 100644 --- a/ocis-pkg/config/config.go +++ b/ocis-pkg/config/config.go @@ -1,49 +1,49 @@ package config import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - activitylog "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" - antivirus "github.com/owncloud/ocis/v2/services/antivirus/pkg/config" - appProvider "github.com/owncloud/ocis/v2/services/app-provider/pkg/config" - appRegistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/config" - audit "github.com/owncloud/ocis/v2/services/audit/pkg/config" - authapp "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" - authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config" - authbearer "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config" - authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config" - authservice "github.com/owncloud/ocis/v2/services/auth-service/pkg/config" - clientlog "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" - collaboration "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - eventhistory "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" - frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/config" - gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/config" - graph "github.com/owncloud/ocis/v2/services/graph/pkg/config" - groups "github.com/owncloud/ocis/v2/services/groups/pkg/config" - idm "github.com/owncloud/ocis/v2/services/idm/pkg/config" - idp "github.com/owncloud/ocis/v2/services/idp/pkg/config" - invitations "github.com/owncloud/ocis/v2/services/invitations/pkg/config" - nats "github.com/owncloud/ocis/v2/services/nats/pkg/config" - notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/config" - ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/config" - ocm "github.com/owncloud/ocis/v2/services/ocm/pkg/config" - ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/config" - policies "github.com/owncloud/ocis/v2/services/policies/pkg/config" - postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" - proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - search "github.com/owncloud/ocis/v2/services/search/pkg/config" - settings "github.com/owncloud/ocis/v2/services/settings/pkg/config" - sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/config" - sse "github.com/owncloud/ocis/v2/services/sse/pkg/config" - storagepublic "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/config" - storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/config" - storagesystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/config" - storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/config" - thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config" - userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/config" - users "github.com/owncloud/ocis/v2/services/users/pkg/config" - web "github.com/owncloud/ocis/v2/services/web/pkg/config" - webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/config" - webfinger "github.com/owncloud/ocis/v2/services/webfinger/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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" + appRegistry "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" + audit "github.com/opencloud-eu/opencloud/services/audit/pkg/config" + authapp "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" + authbasic "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" + authbearer "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" + authmachine "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" + authservice "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" + clientlog "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" + collaboration "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" + eventhistory "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" + frontend "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" + gateway "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" + graph "github.com/opencloud-eu/opencloud/services/graph/pkg/config" + groups "github.com/opencloud-eu/opencloud/services/groups/pkg/config" + idm "github.com/opencloud-eu/opencloud/services/idm/pkg/config" + idp "github.com/opencloud-eu/opencloud/services/idp/pkg/config" + invitations "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" + nats "github.com/opencloud-eu/opencloud/services/nats/pkg/config" + notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" + ocdav "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" + ocm "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" + ocs "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" + policies "github.com/opencloud-eu/opencloud/services/policies/pkg/config" + postprocessing "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" + proxy "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" + search "github.com/opencloud-eu/opencloud/services/search/pkg/config" + settings "github.com/opencloud-eu/opencloud/services/settings/pkg/config" + sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/config" + sse "github.com/opencloud-eu/opencloud/services/sse/pkg/config" + storagepublic "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config" + storageshares "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config" + storagesystem "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config" + storageusers "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config" + thumbnails "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config" + userlog "github.com/opencloud-eu/opencloud/services/userlog/pkg/config" + users "github.com/opencloud-eu/opencloud/services/users/pkg/config" + web "github.com/opencloud-eu/opencloud/services/web/pkg/config" + webdav "github.com/opencloud-eu/opencloud/services/webdav/pkg/config" + webfinger "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config" ) type Mode int diff --git a/ocis-pkg/config/config_test.go b/ocis-pkg/config/config_test.go index cd125e2c0d..9da021fc06 100644 --- a/ocis-pkg/config/config_test.go +++ b/ocis-pkg/config/config_test.go @@ -3,7 +3,7 @@ package config_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/config" "gopkg.in/yaml.v2" ) diff --git a/ocis-pkg/config/defaultconfig.go b/ocis-pkg/config/defaultconfig.go index f25cccd810..b532571e64 100644 --- a/ocis-pkg/config/defaultconfig.go +++ b/ocis-pkg/config/defaultconfig.go @@ -1,49 +1,49 @@ package config import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - activitylog "github.com/owncloud/ocis/v2/services/activitylog/pkg/config/defaults" - antivirus "github.com/owncloud/ocis/v2/services/antivirus/pkg/config/defaults" - appProvider "github.com/owncloud/ocis/v2/services/app-provider/pkg/config/defaults" - appRegistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/config/defaults" - audit "github.com/owncloud/ocis/v2/services/audit/pkg/config/defaults" - authapp "github.com/owncloud/ocis/v2/services/auth-app/pkg/config/defaults" - authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config/defaults" - authbearer "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config/defaults" - authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config/defaults" - authservice "github.com/owncloud/ocis/v2/services/auth-service/pkg/config/defaults" - clientlog "github.com/owncloud/ocis/v2/services/clientlog/pkg/config/defaults" - collaboration "github.com/owncloud/ocis/v2/services/collaboration/pkg/config/defaults" - eventhistory "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config/defaults" - frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/config/defaults" - gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/config/defaults" - graph "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - groups "github.com/owncloud/ocis/v2/services/groups/pkg/config/defaults" - idm "github.com/owncloud/ocis/v2/services/idm/pkg/config/defaults" - idp "github.com/owncloud/ocis/v2/services/idp/pkg/config/defaults" - invitations "github.com/owncloud/ocis/v2/services/invitations/pkg/config/defaults" - nats "github.com/owncloud/ocis/v2/services/nats/pkg/config/defaults" - notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/config/defaults" - ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/config/defaults" - ocm "github.com/owncloud/ocis/v2/services/ocm/pkg/config/defaults" - ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/config/defaults" - policies "github.com/owncloud/ocis/v2/services/policies/pkg/config/defaults" - postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config/defaults" - proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults" - search "github.com/owncloud/ocis/v2/services/search/pkg/config/defaults" - settings "github.com/owncloud/ocis/v2/services/settings/pkg/config/defaults" - sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/config/defaults" - sse "github.com/owncloud/ocis/v2/services/sse/pkg/config/defaults" - storagepublic "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/config/defaults" - storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/config/defaults" - storageSystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/config/defaults" - storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/config/defaults" - thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config/defaults" - userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/config/defaults" - users "github.com/owncloud/ocis/v2/services/users/pkg/config/defaults" - web "github.com/owncloud/ocis/v2/services/web/pkg/config/defaults" - webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/config/defaults" - webfinger "github.com/owncloud/ocis/v2/services/webfinger/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/ocis-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" + appRegistry "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/defaults" + audit "github.com/opencloud-eu/opencloud/services/audit/pkg/config/defaults" + authapp "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/defaults" + authbasic "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/defaults" + authbearer "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/defaults" + authmachine "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/defaults" + authservice "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/defaults" + clientlog "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/defaults" + collaboration "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config/defaults" + eventhistory "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/defaults" + frontend "github.com/opencloud-eu/opencloud/services/frontend/pkg/config/defaults" + gateway "github.com/opencloud-eu/opencloud/services/gateway/pkg/config/defaults" + graph "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" + groups "github.com/opencloud-eu/opencloud/services/groups/pkg/config/defaults" + idm "github.com/opencloud-eu/opencloud/services/idm/pkg/config/defaults" + idp "github.com/opencloud-eu/opencloud/services/idp/pkg/config/defaults" + invitations "github.com/opencloud-eu/opencloud/services/invitations/pkg/config/defaults" + nats "github.com/opencloud-eu/opencloud/services/nats/pkg/config/defaults" + notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/config/defaults" + ocdav "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/defaults" + ocm "github.com/opencloud-eu/opencloud/services/ocm/pkg/config/defaults" + ocs "github.com/opencloud-eu/opencloud/services/ocs/pkg/config/defaults" + policies "github.com/opencloud-eu/opencloud/services/policies/pkg/config/defaults" + postprocessing "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/defaults" + proxy "github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults" + search "github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults" + settings "github.com/opencloud-eu/opencloud/services/settings/pkg/config/defaults" + sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/defaults" + sse "github.com/opencloud-eu/opencloud/services/sse/pkg/config/defaults" + storagepublic "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/config/defaults" + storageshares "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/config/defaults" + storageSystem "github.com/opencloud-eu/opencloud/services/storage-system/pkg/config/defaults" + storageusers "github.com/opencloud-eu/opencloud/services/storage-users/pkg/config/defaults" + thumbnails "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/config/defaults" + userlog "github.com/opencloud-eu/opencloud/services/userlog/pkg/config/defaults" + users "github.com/opencloud-eu/opencloud/services/users/pkg/config/defaults" + web "github.com/opencloud-eu/opencloud/services/web/pkg/config/defaults" + webdav "github.com/opencloud-eu/opencloud/services/webdav/pkg/config/defaults" + webfinger "github.com/opencloud-eu/opencloud/services/webfinger/pkg/config/defaults" ) func DefaultConfig() *Config { diff --git a/ocis-pkg/config/helpers.go b/ocis-pkg/config/helpers.go index 1899e3bd46..249ce0fd86 100644 --- a/ocis-pkg/config/helpers.go +++ b/ocis-pkg/config/helpers.go @@ -8,7 +8,7 @@ import ( gofig "github.com/gookit/config/v2" gooyaml "github.com/gookit/config/v2/yaml" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" + "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" ) var ( diff --git a/ocis-pkg/config/parser/parse.go b/ocis-pkg/config/parser/parse.go index 30dbacd17b..b6ac7b61f4 100644 --- a/ocis-pkg/config/parser/parse.go +++ b/ocis-pkg/config/parser/parse.go @@ -3,10 +3,10 @@ package parser import ( "errors" - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" + "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" ) // ParseConfig loads the ocis configuration and diff --git a/ocis-pkg/conversions/ptr_test.go b/ocis-pkg/conversions/ptr_test.go index d29b356bf3..26a710da17 100644 --- a/ocis-pkg/conversions/ptr_test.go +++ b/ocis-pkg/conversions/ptr_test.go @@ -6,7 +6,7 @@ import ( libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/conversions" + "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" ) func checkIdentical[T any](t *testing.T, p T, want string) { diff --git a/ocis-pkg/cors/option.go b/ocis-pkg/cors/option.go index 0ac1d1c4c9..5a12e82875 100644 --- a/ocis-pkg/cors/option.go +++ b/ocis-pkg/cors/option.go @@ -1,7 +1,7 @@ package cors import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/crypto/crypto_test.go b/ocis-pkg/crypto/crypto_test.go index 6147edc444..3feb977430 100644 --- a/ocis-pkg/crypto/crypto_test.go +++ b/ocis-pkg/crypto/crypto_test.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "github.com/owncloud/ocis/v2/ocis-pkg/crypto" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/crypto" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" . "github.com/onsi/ginkgo/v2" - cfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + cfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" ) var _ = Describe("Crypto", func() { diff --git a/ocis-pkg/crypto/gencert.go b/ocis-pkg/crypto/gencert.go index 6787f9890b..29703ae88d 100644 --- a/ocis-pkg/crypto/gencert.go +++ b/ocis-pkg/crypto/gencert.go @@ -12,7 +12,7 @@ import ( "os" "path/filepath" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" mtls "go-micro.dev/v4/util/tls" ) diff --git a/ocis-pkg/crypto/gencert_test.go b/ocis-pkg/crypto/gencert_test.go index 32f0bbc695..62683d87b1 100644 --- a/ocis-pkg/crypto/gencert_test.go +++ b/ocis-pkg/crypto/gencert_test.go @@ -9,7 +9,7 @@ import ( "path/filepath" "testing" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) func TestEnsureExistsDir(t *testing.T) { diff --git a/ocis-pkg/handlers/checker.go b/ocis-pkg/handlers/checker.go index 0326c580dc..3484c16ca8 100644 --- a/ocis-pkg/handlers/checker.go +++ b/ocis-pkg/handlers/checker.go @@ -9,7 +9,7 @@ import ( "net/http" "strings" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" "golang.org/x/sync/errgroup" ) diff --git a/ocis-pkg/handlers/checker_test.go b/ocis-pkg/handlers/checker_test.go index 3a87111b6f..d9b7390a86 100644 --- a/ocis-pkg/handlers/checker_test.go +++ b/ocis-pkg/handlers/checker_test.go @@ -12,8 +12,8 @@ import ( "github.com/test-go/testify/require" "github.com/tidwall/gjson" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/handlers" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) func TestCheckHandlerConfiguration(t *testing.T) { diff --git a/ocis-pkg/kql/cast.go b/ocis-pkg/kql/cast.go index 55033eb1ff..ef0d82b619 100644 --- a/ocis-pkg/kql/cast.go +++ b/ocis-pkg/kql/cast.go @@ -5,8 +5,8 @@ import ( "time" "github.com/jinzhu/now" - "github.com/owncloud/ocis/v2/ocis-pkg/ast" - "github.com/owncloud/ocis/v2/services/search/pkg/query" + "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/services/search/pkg/query" ) func toNode[T ast.Node](in interface{}) (T, error) { diff --git a/ocis-pkg/kql/connect.go b/ocis-pkg/kql/connect.go index 674a915618..7a1e398e38 100644 --- a/ocis-pkg/kql/connect.go +++ b/ocis-pkg/kql/connect.go @@ -3,7 +3,7 @@ package kql import ( "strings" - "github.com/owncloud/ocis/v2/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/ocis-pkg/ast" ) // connectNodes connects given nodes diff --git a/ocis-pkg/kql/dictionary_test.go b/ocis-pkg/kql/dictionary_test.go index 812f831df7..857fd89efa 100644 --- a/ocis-pkg/kql/dictionary_test.go +++ b/ocis-pkg/kql/dictionary_test.go @@ -6,10 +6,10 @@ import ( "time" "github.com/jinzhu/now" - "github.com/owncloud/ocis/v2/ocis-pkg/ast" - "github.com/owncloud/ocis/v2/ocis-pkg/ast/test" - "github.com/owncloud/ocis/v2/ocis-pkg/kql" - "github.com/owncloud/ocis/v2/services/search/pkg/query" + "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/services/search/pkg/query" tAssert "github.com/stretchr/testify/assert" ) diff --git a/ocis-pkg/kql/factory.go b/ocis-pkg/kql/factory.go index 99deef825d..3e76a1443b 100644 --- a/ocis-pkg/kql/factory.go +++ b/ocis-pkg/kql/factory.go @@ -3,7 +3,7 @@ package kql import ( "strings" - "github.com/owncloud/ocis/v2/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/ocis-pkg/ast" ) func base(text []byte, pos position) (*ast.Base, error) { diff --git a/ocis-pkg/kql/kql.go b/ocis-pkg/kql/kql.go index 6e14cc7b6f..a39dc86735 100644 --- a/ocis-pkg/kql/kql.go +++ b/ocis-pkg/kql/kql.go @@ -5,7 +5,7 @@ import ( "errors" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/ocis-pkg/ast" ) // The operator node value definition diff --git a/ocis-pkg/kql/kql_test.go b/ocis-pkg/kql/kql_test.go index 09f1249c5b..d6b03aa1cc 100644 --- a/ocis-pkg/kql/kql_test.go +++ b/ocis-pkg/kql/kql_test.go @@ -3,9 +3,9 @@ package kql_test import ( "testing" - "github.com/owncloud/ocis/v2/ocis-pkg/ast" - "github.com/owncloud/ocis/v2/ocis-pkg/kql" - "github.com/owncloud/ocis/v2/services/search/pkg/query" + "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/ocis-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/ocis-pkg/kql/validate.go index 0712a1a7ec..8adc31827a 100644 --- a/ocis-pkg/kql/validate.go +++ b/ocis-pkg/kql/validate.go @@ -1,8 +1,8 @@ package kql import ( - "github.com/owncloud/ocis/v2/ocis-pkg/ast" - "github.com/owncloud/ocis/v2/services/search/pkg/query" + "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/services/search/pkg/query" ) func validateAst(a *ast.Ast) error { diff --git a/ocis-pkg/l10n/l10n.go b/ocis-pkg/l10n/l10n.go index 0908c187f3..54acfab828 100644 --- a/ocis-pkg/l10n/l10n.go +++ b/ocis-pkg/l10n/l10n.go @@ -9,8 +9,8 @@ import ( "reflect" "github.com/leonelquinteros/gotext" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + "github.com/opencloud-eu/opencloud/ocis-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/ldap/ldap.go b/ocis-pkg/ldap/ldap.go index f9b5786b79..3fe82a9f98 100644 --- a/ocis-pkg/ldap/ldap.go +++ b/ocis-pkg/ldap/ldap.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) const ( diff --git a/ocis-pkg/log/log_test.go b/ocis-pkg/log/log_test.go index ff43cb8e97..9607e3dcdd 100644 --- a/ocis-pkg/log/log_test.go +++ b/ocis-pkg/log/log_test.go @@ -5,8 +5,8 @@ import ( "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/internal/testenv" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/internal/testenv" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) func TestDeprecation(t *testing.T) { diff --git a/ocis-pkg/middleware/account.go b/ocis-pkg/middleware/account.go index aae42be085..908095a6f7 100644 --- a/ocis-pkg/middleware/account.go +++ b/ocis-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/owncloud/ocis/v2/ocis-pkg/account" + "github.com/opencloud-eu/opencloud/ocis-pkg/account" "go-micro.dev/v4/metadata" ) @@ -64,7 +64,7 @@ func ExtractAccountUUID(opts ...account.Option) func(http.Handler) http.Handler ctx := revactx.ContextSetUser(r.Context(), u) // Important: user.Id.OpaqueId is the AccountUUID. Set this way in the account uuid middleware in ocis-proxy. - // https://github.com/owncloud/ocis/v2-proxy/blob/ea254d6036592cf9469d757d1295e0c4309d1e63/pkg/middleware/account_uuid.go#L109 + // https://github.com/opencloud-eu/opencloud-proxy/blob/ea254d6036592cf9469d757d1295e0c4309d1e63/pkg/middleware/account_uuid.go#L109 // TODO: implement token manager in cs3org/reva that uses generic metadata instead of access token from header. ctx = metadata.Set(ctx, AccountID, u.Id.OpaqueId) if u.Opaque != nil { diff --git a/ocis-pkg/middleware/header.go b/ocis-pkg/middleware/header.go index 44dbd706bc..de11d26a08 100644 --- a/ocis-pkg/middleware/header.go +++ b/ocis-pkg/middleware/header.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/cors" + "github.com/opencloud-eu/opencloud/ocis-pkg/cors" rscors "github.com/rs/cors" ) diff --git a/ocis-pkg/middleware/logger.go b/ocis-pkg/middleware/logger.go index 465c025de1..4dde0f897e 100644 --- a/ocis-pkg/middleware/logger.go +++ b/ocis-pkg/middleware/logger.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-chi/chi/v5/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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/ocis-pkg/middleware/oidc.go index 4c8c533467..3eb7954d05 100644 --- a/ocis-pkg/middleware/oidc.go +++ b/ocis-pkg/middleware/oidc.go @@ -7,7 +7,7 @@ import ( "sync" goidc "github.com/coreos/go-oidc/v3/oidc" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" "golang.org/x/oauth2" ) diff --git a/ocis-pkg/middleware/options.go b/ocis-pkg/middleware/options.go index 0331dbc030..01e6b3d2ee 100644 --- a/ocis-pkg/middleware/options.go +++ b/ocis-pkg/middleware/options.go @@ -4,7 +4,7 @@ import ( "net/http" gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/middleware/static.go b/ocis-pkg/middleware/static.go index 3daf8d24ff..27752603cc 100644 --- a/ocis-pkg/middleware/static.go +++ b/ocis-pkg/middleware/static.go @@ -20,7 +20,7 @@ func Static(root string, fs http.FileSystem, ttl int) func(http.Handler) http.Ha ), ) - // TODO: investigate broken caching - https://github.com/owncloud/ocis/v2/issues/1094 + // TODO: investigate broken caching - https://github.com/opencloud-eu/opencloud/issues/1094 // we don't have a last modification date of the static assets, so we use the service start date //lastModified := time.Now().UTC().Format(http.TimeFormat) //expires := time.Now().Add(time.Second * time.Duration(ttl)).UTC().Format(http.TimeFormat) @@ -30,7 +30,7 @@ func Static(root string, fs http.FileSystem, ttl int) func(http.Handler) http.Ha if strings.HasPrefix(r.URL.Path, path.Join(root, "api")) { next.ServeHTTP(w, r) } else { - // TODO: investigate broken caching - https://github.com/owncloud/ocis/v2/issues/1094 + // TODO: investigate broken caching - https://github.com/opencloud-eu/opencloud/issues/1094 //w.Header().Set("Cache-Control", fmt.Sprintf("max-age=%s, must-revalidate", strconv.Itoa(ttl))) //w.Header().Set("Expires", expires) //w.Header().Set("Last-Modified", lastModified) diff --git a/ocis-pkg/oidc/claims_test.go b/ocis-pkg/oidc/claims_test.go index 5a9c60df09..45a68f347f 100644 --- a/ocis-pkg/oidc/claims_test.go +++ b/ocis-pkg/oidc/claims_test.go @@ -5,7 +5,7 @@ import ( "reflect" "testing" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" ) type splitWithEscapingTest struct { diff --git a/ocis-pkg/oidc/client.go b/ocis-pkg/oidc/client.go index 4558a24140..faa299743b 100644 --- a/ocis-pkg/oidc/client.go +++ b/ocis-pkg/oidc/client.go @@ -16,8 +16,8 @@ import ( "github.com/MicahParks/keyfunc/v2" goidc "github.com/coreos/go-oidc/v3/oidc" "github.com/golang-jwt/jwt/v5" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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/ocis-pkg/oidc/client_test.go index 5fa498c2de..22f8794d7d 100644 --- a/ocis-pkg/oidc/client_test.go +++ b/ocis-pkg/oidc/client_test.go @@ -8,7 +8,7 @@ import ( "github.com/MicahParks/keyfunc/v2" "github.com/golang-jwt/jwt/v5" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" ) type signingKey struct { diff --git a/ocis-pkg/oidc/metadata.go b/ocis-pkg/oidc/metadata.go index 662d9ec522..b95a95edd6 100644 --- a/ocis-pkg/oidc/metadata.go +++ b/ocis-pkg/oidc/metadata.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/golang-jwt/jwt/v5" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) const wellknownPath = "/.well-known/openid-configuration" diff --git a/ocis-pkg/oidc/mocks/oidc_client.go b/ocis-pkg/oidc/mocks/oidc_client.go index 450b135de7..c27eb7dd7d 100644 --- a/ocis-pkg/oidc/mocks/oidc_client.go +++ b/ocis-pkg/oidc/mocks/oidc_client.go @@ -10,7 +10,7 @@ import ( oauth2 "golang.org/x/oauth2" - oidc "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + oidc "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" ) // OIDCClient is an autogenerated mock type for the OIDCClient type diff --git a/ocis-pkg/oidc/options.go b/ocis-pkg/oidc/options.go index fbfc5fe7a9..c76078327b 100644 --- a/ocis-pkg/oidc/options.go +++ b/ocis-pkg/oidc/options.go @@ -4,8 +4,8 @@ import ( "net/http" "github.com/MicahParks/keyfunc/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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/register.go b/ocis-pkg/registry/register.go index 5c39d299b2..fef16c9f2b 100644 --- a/ocis-pkg/registry/register.go +++ b/ocis-pkg/registry/register.go @@ -7,7 +7,7 @@ import ( mRegistry "go-micro.dev/v4/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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/ocis-pkg/registry/register_test.go index 2916700425..d3ec4ca8fd 100644 --- a/ocis-pkg/registry/register_test.go +++ b/ocis-pkg/registry/register_test.go @@ -6,7 +6,7 @@ package registry // "testing" // // "github.com/micro/go-micro/v2/registry" -// "github.com/owncloud/ocis/v2/ocis-pkg/log" +// "github.com/opencloud-eu/opencloud/ocis-pkg/log" //) // //func TestRegisterGRPCEndpoint(t *testing.T) { diff --git a/ocis-pkg/registry/registry.go b/ocis-pkg/registry/registry.go index ea3c937167..005aeaa471 100644 --- a/ocis-pkg/registry/registry.go +++ b/ocis-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/owncloud/ocis/v2/ocis-pkg/natsjsregistry" + "github.com/opencloud-eu/opencloud/ocis-pkg/natsjsregistry" mRegistry "go-micro.dev/v4/registry" "go-micro.dev/v4/registry/cache" ) diff --git a/ocis-pkg/roles/manager.go b/ocis-pkg/roles/manager.go index 4ac3db2d5f..10cdd7b87f 100644 --- a/ocis-pkg/roles/manager.go +++ b/ocis-pkg/roles/manager.go @@ -5,9 +5,9 @@ import ( "time" "github.com/cs3org/reva/v2/pkg/store" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + "github.com/opencloud-eu/opencloud/ocis-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" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/ocis-pkg/roles/option.go b/ocis-pkg/roles/option.go index 67538e0c06..d9bfc5d91b 100644 --- a/ocis-pkg/roles/option.go +++ b/ocis-pkg/roles/option.go @@ -1,8 +1,8 @@ package roles import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + "github.com/opencloud-eu/opencloud/ocis-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/ocis-pkg/roles/util.go index 796dcaa223..4c68a5c3ba 100644 --- a/ocis-pkg/roles/util.go +++ b/ocis-pkg/roles/util.go @@ -4,7 +4,7 @@ import ( "context" "encoding/json" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" "go-micro.dev/v4/metadata" ) diff --git a/ocis-pkg/runner/grouprunner_test.go b/ocis-pkg/runner/grouprunner_test.go index 4a5984ba8b..16522f673f 100644 --- a/ocis-pkg/runner/grouprunner_test.go +++ b/ocis-pkg/runner/grouprunner_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/ocis-pkg/runner" + "github.com/opencloud-eu/opencloud/ocis-pkg/runner" ) var _ = Describe("GroupRunner", func() { diff --git a/ocis-pkg/runner/runner_test.go b/ocis-pkg/runner/runner_test.go index b44e398eb6..572def34ff 100644 --- a/ocis-pkg/runner/runner_test.go +++ b/ocis-pkg/runner/runner_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/ocis-pkg/runner" + "github.com/opencloud-eu/opencloud/ocis-pkg/runner" ) // TimedTask will create a task with the specified duration diff --git a/ocis-pkg/service/debug/option.go b/ocis-pkg/service/debug/option.go index 3ed6b162f9..23f634cb15 100644 --- a/ocis-pkg/service/debug/option.go +++ b/ocis-pkg/service/debug/option.go @@ -4,7 +4,7 @@ import ( "context" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) // Option defines a single option function. diff --git a/ocis-pkg/service/debug/service.go b/ocis-pkg/service/debug/service.go index df16ced77d..ccf75b70c0 100644 --- a/ocis-pkg/service/debug/service.go +++ b/ocis-pkg/service/debug/service.go @@ -11,11 +11,11 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "go.opentelemetry.io/contrib/zpages" - "github.com/owncloud/ocis/v2/ocis-pkg/cors" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - graphMiddleware "github.com/owncloud/ocis/v2/services/graph/pkg/middleware" + "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" + graphMiddleware "github.com/opencloud-eu/opencloud/services/graph/pkg/middleware" ) var handleProbe = func(mux *http.ServeMux, pattern string, h http.Handler, name string, logger log.Logger) { diff --git a/ocis-pkg/service/grpc/client.go b/ocis-pkg/service/grpc/client.go index 2b958d7df8..b62c58ba34 100644 --- a/ocis-pkg/service/grpc/client.go +++ b/ocis-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/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-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/option.go b/ocis-pkg/service/grpc/option.go index 035d8c93a8..333e505879 100644 --- a/ocis-pkg/service/grpc/option.go +++ b/ocis-pkg/service/grpc/option.go @@ -3,7 +3,7 @@ package grpc import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" "go-micro.dev/v4/server" "go.opentelemetry.io/otel/trace" ) diff --git a/ocis-pkg/service/grpc/service.go b/ocis-pkg/service/grpc/service.go index f9d53612b0..5bd69ae452 100644 --- a/ocis-pkg/service/grpc/service.go +++ b/ocis-pkg/service/grpc/service.go @@ -18,9 +18,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" - ociscrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" + 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" ) // Service simply wraps the go-micro grpc service. diff --git a/ocis-pkg/service/http/option.go b/ocis-pkg/service/http/option.go index df2095f9ab..8663b4e805 100644 --- a/ocis-pkg/service/http/option.go +++ b/ocis-pkg/service/http/option.go @@ -4,8 +4,8 @@ import ( "context" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" "github.com/urfave/cli/v2" "go.opentelemetry.io/otel/trace" ) diff --git a/ocis-pkg/service/http/service.go b/ocis-pkg/service/http/service.go index cc37ace2b8..53fb193e6d 100644 --- a/ocis-pkg/service/http/service.go +++ b/ocis-pkg/service/http/service.go @@ -5,12 +5,12 @@ import ( "fmt" "strings" - "github.com/owncloud/ocis/v2/ocis-pkg/broker" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/broker" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" mhttps "github.com/go-micro/plugins/v4/server/http" mtracer "github.com/go-micro/plugins/v4/wrapper/trace/opentelemetry" - ociscrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" + ociscrypto "github.com/opencloud-eu/opencloud/ocis-pkg/crypto" "go-micro.dev/v4" "go-micro.dev/v4/server" ) diff --git a/ocis-pkg/shared/errors.go b/ocis-pkg/shared/errors.go index 2c09f0eeed..151c5f15c6 100644 --- a/ocis-pkg/shared/errors.go +++ b/ocis-pkg/shared/errors.go @@ -3,7 +3,7 @@ package shared import ( "fmt" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" + "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" ) func MissingMachineAuthApiKeyError(service string) error { diff --git a/ocis-pkg/x/io/fsx/fallback_test.go b/ocis-pkg/x/io/fsx/fallback_test.go index cc61bf74b8..8b78fb302e 100644 --- a/ocis-pkg/x/io/fsx/fallback_test.go +++ b/ocis-pkg/x/io/fsx/fallback_test.go @@ -7,7 +7,7 @@ import ( "github.com/onsi/gomega" "github.com/spf13/afero" - "github.com/owncloud/ocis/v2/ocis-pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" ) func TestLayeredFS(t *testing.T) { diff --git a/ocis-pkg/x/io/fsx/fsx_test.go b/ocis-pkg/x/io/fsx/fsx_test.go index 238fbd5f64..7ac4a2b460 100644 --- a/ocis-pkg/x/io/fsx/fsx_test.go +++ b/ocis-pkg/x/io/fsx/fsx_test.go @@ -7,7 +7,7 @@ import ( "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/ocis-pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" ) func TestBase(t *testing.T) { diff --git a/ocis-pkg/x/path/filepathx/path_test.go b/ocis-pkg/x/path/filepathx/path_test.go index fdd0640c5f..e9e363c822 100644 --- a/ocis-pkg/x/path/filepathx/path_test.go +++ b/ocis-pkg/x/path/filepathx/path_test.go @@ -3,7 +3,7 @@ package filepathx_test import ( "testing" - "github.com/owncloud/ocis/v2/ocis-pkg/x/path/filepathx" + "github.com/opencloud-eu/opencloud/ocis-pkg/x/path/filepathx" ) func TestJailJoin(t *testing.T) { diff --git a/ocis/cmd/ocis/main.go b/ocis/cmd/ocis/main.go index c4e426d3c6..c27afe7661 100644 --- a/ocis/cmd/ocis/main.go +++ b/ocis/cmd/ocis/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis/pkg/command" + "github.com/opencloud-eu/opencloud/ocis/pkg/command" ) func main() { diff --git a/ocis/pkg/backup/backup_test.go b/ocis/pkg/backup/backup_test.go index 21e20842d7..148f367c2e 100644 --- a/ocis/pkg/backup/backup_test.go +++ b/ocis/pkg/backup/backup_test.go @@ -3,7 +3,7 @@ package backup_test import ( "testing" - "github.com/owncloud/ocis/v2/ocis/pkg/backup" + "github.com/opencloud-eu/opencloud/ocis/pkg/backup" "github.com/test-go/testify/require" ) diff --git a/ocis/pkg/command/backup.go b/ocis/pkg/command/backup.go index b853f48f83..875fe972b5 100644 --- a/ocis/pkg/command/backup.go +++ b/ocis/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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" - "github.com/owncloud/ocis/v2/ocis/pkg/backup" - "github.com/owncloud/ocis/v2/ocis/pkg/register" + "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/ocis/pkg/backup" + "github.com/opencloud-eu/opencloud/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/benchmark.go b/ocis/pkg/command/benchmark.go index 28c7ecde0d..5052b40042 100644 --- a/ocis/pkg/command/benchmark.go +++ b/ocis/pkg/command/benchmark.go @@ -15,9 +15,9 @@ import ( "time" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/ocis/pkg/register" + "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis/pkg/register" "github.com/pkg/xattr" "github.com/rogpeppe/go-internal/lockedfile" "github.com/urfave/cli/v2" diff --git a/ocis/pkg/command/decomposedfs.go b/ocis/pkg/command/decomposedfs.go index d61f9cf90b..278b94aa8e 100644 --- a/ocis/pkg/command/decomposedfs.go +++ b/ocis/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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis/pkg/register" + "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis/pkg/register" "github.com/rs/zerolog" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/init.go b/ocis/pkg/command/init.go index bafd54f856..3ac540d52f 100644 --- a/ocis/pkg/command/init.go +++ b/ocis/pkg/command/init.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - ocisinit "github.com/owncloud/ocis/v2/ocis/pkg/init" - "github.com/owncloud/ocis/v2/ocis/pkg/register" + "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" + ocisinit "github.com/opencloud-eu/opencloud/ocis/pkg/init" + "github.com/opencloud-eu/opencloud/ocis/pkg/register" cli "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/list.go b/ocis/pkg/command/list.go index 7e85591b54..fea8db725f 100644 --- a/ocis/pkg/command/list.go +++ b/ocis/pkg/command/list.go @@ -6,8 +6,8 @@ import ( "net" "net/rpc" - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis/pkg/register" + "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/migrate.go b/ocis/pkg/command/migrate.go index aa845395e2..9f9ec602ce 100644 --- a/ocis/pkg/command/migrate.go +++ b/ocis/pkg/command/migrate.go @@ -30,14 +30,14 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" - oclog "github.com/owncloud/ocis/v2/ocis-pkg/log" - mregistry "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis/pkg/register" - sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/config" - sharingparser "github.com/owncloud/ocis/v2/services/sharing/pkg/config/parser" + "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/ocis/pkg/register" + 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/ocis/pkg/command/revisions.go b/ocis/pkg/command/revisions.go index 569b702382..7299dc7ccb 100644 --- a/ocis/pkg/command/revisions.go +++ b/ocis/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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" - "github.com/owncloud/ocis/v2/ocis/pkg/register" - "github.com/owncloud/ocis/v2/ocis/pkg/revisions" + "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/ocis/pkg/register" + "github.com/opencloud-eu/opencloud/ocis/pkg/revisions" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/root.go b/ocis/pkg/command/root.go index 6dd7136e41..3b075450ad 100644 --- a/ocis/pkg/command/root.go +++ b/ocis/pkg/command/root.go @@ -6,9 +6,9 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis/pkg/register" + "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/server.go b/ocis/pkg/command/server.go index f9c3aed070..c8f69f033d 100644 --- a/ocis/pkg/command/server.go +++ b/ocis/pkg/command/server.go @@ -1,11 +1,11 @@ package command import ( - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" - "github.com/owncloud/ocis/v2/ocis/pkg/register" - "github.com/owncloud/ocis/v2/ocis/pkg/runtime" + "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/ocis/pkg/register" + "github.com/opencloud-eu/opencloud/ocis/pkg/runtime" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/services.go b/ocis/pkg/command/services.go index 378bd4a6f1..760e61d045 100644 --- a/ocis/pkg/command/services.go +++ b/ocis/pkg/command/services.go @@ -3,53 +3,53 @@ package command import ( "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" - "github.com/owncloud/ocis/v2/ocis/pkg/command/helper" - "github.com/owncloud/ocis/v2/ocis/pkg/register" - activitylog "github.com/owncloud/ocis/v2/services/activitylog/pkg/command" - antivirus "github.com/owncloud/ocis/v2/services/antivirus/pkg/command" - appprovider "github.com/owncloud/ocis/v2/services/app-provider/pkg/command" - appregistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/command" - audit "github.com/owncloud/ocis/v2/services/audit/pkg/command" - authapp "github.com/owncloud/ocis/v2/services/auth-app/pkg/command" - authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/command" - authbearer "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/command" - authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/command" - authservice "github.com/owncloud/ocis/v2/services/auth-service/pkg/command" - clientlog "github.com/owncloud/ocis/v2/services/clientlog/pkg/command" - collaboration "github.com/owncloud/ocis/v2/services/collaboration/pkg/command" - eventhistory "github.com/owncloud/ocis/v2/services/eventhistory/pkg/command" - frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/command" - gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/command" - graph "github.com/owncloud/ocis/v2/services/graph/pkg/command" - groups "github.com/owncloud/ocis/v2/services/groups/pkg/command" - idm "github.com/owncloud/ocis/v2/services/idm/pkg/command" - idp "github.com/owncloud/ocis/v2/services/idp/pkg/command" - invitations "github.com/owncloud/ocis/v2/services/invitations/pkg/command" - nats "github.com/owncloud/ocis/v2/services/nats/pkg/command" - notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/command" - ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/command" - ocm "github.com/owncloud/ocis/v2/services/ocm/pkg/command" - ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/command" - policies "github.com/owncloud/ocis/v2/services/policies/pkg/command" - postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/command" - proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/command" - search "github.com/owncloud/ocis/v2/services/search/pkg/command" - settings "github.com/owncloud/ocis/v2/services/settings/pkg/command" - sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/command" - sse "github.com/owncloud/ocis/v2/services/sse/pkg/command" - storagepubliclink "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/command" - storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/command" - storagesystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/command" - storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/command" - thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/command" - userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/command" - users "github.com/owncloud/ocis/v2/services/users/pkg/command" - web "github.com/owncloud/ocis/v2/services/web/pkg/command" - webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/command" - webfinger "github.com/owncloud/ocis/v2/services/webfinger/pkg/command" + "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/ocis/pkg/command/helper" + "github.com/opencloud-eu/opencloud/ocis/pkg/register" + 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" + appregistry "github.com/opencloud-eu/opencloud/services/app-registry/pkg/command" + audit "github.com/opencloud-eu/opencloud/services/audit/pkg/command" + authapp "github.com/opencloud-eu/opencloud/services/auth-app/pkg/command" + authbasic "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/command" + authbearer "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/command" + authmachine "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/command" + authservice "github.com/opencloud-eu/opencloud/services/auth-service/pkg/command" + clientlog "github.com/opencloud-eu/opencloud/services/clientlog/pkg/command" + collaboration "github.com/opencloud-eu/opencloud/services/collaboration/pkg/command" + eventhistory "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/command" + frontend "github.com/opencloud-eu/opencloud/services/frontend/pkg/command" + gateway "github.com/opencloud-eu/opencloud/services/gateway/pkg/command" + graph "github.com/opencloud-eu/opencloud/services/graph/pkg/command" + groups "github.com/opencloud-eu/opencloud/services/groups/pkg/command" + idm "github.com/opencloud-eu/opencloud/services/idm/pkg/command" + idp "github.com/opencloud-eu/opencloud/services/idp/pkg/command" + invitations "github.com/opencloud-eu/opencloud/services/invitations/pkg/command" + nats "github.com/opencloud-eu/opencloud/services/nats/pkg/command" + notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/command" + ocdav "github.com/opencloud-eu/opencloud/services/ocdav/pkg/command" + ocm "github.com/opencloud-eu/opencloud/services/ocm/pkg/command" + ocs "github.com/opencloud-eu/opencloud/services/ocs/pkg/command" + policies "github.com/opencloud-eu/opencloud/services/policies/pkg/command" + postprocessing "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/command" + proxy "github.com/opencloud-eu/opencloud/services/proxy/pkg/command" + search "github.com/opencloud-eu/opencloud/services/search/pkg/command" + settings "github.com/opencloud-eu/opencloud/services/settings/pkg/command" + sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/command" + sse "github.com/opencloud-eu/opencloud/services/sse/pkg/command" + storagepubliclink "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/command" + storageshares "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/command" + storagesystem "github.com/opencloud-eu/opencloud/services/storage-system/pkg/command" + storageusers "github.com/opencloud-eu/opencloud/services/storage-users/pkg/command" + thumbnails "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/command" + userlog "github.com/opencloud-eu/opencloud/services/userlog/pkg/command" + users "github.com/opencloud-eu/opencloud/services/users/pkg/command" + web "github.com/opencloud-eu/opencloud/services/web/pkg/command" + webdav "github.com/opencloud-eu/opencloud/services/webdav/pkg/command" + webfinger "github.com/opencloud-eu/opencloud/services/webfinger/pkg/command" ) var svccmds = []register.Command{ diff --git a/ocis/pkg/command/shares.go b/ocis/pkg/command/shares.go index 20d4665013..d2ca1f6d5b 100644 --- a/ocis/pkg/command/shares.go +++ b/ocis/pkg/command/shares.go @@ -11,12 +11,12 @@ import ( "github.com/cs3org/reva/v2/pkg/share/manager/registry" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" - mregistry "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis/pkg/register" - sharingparser "github.com/owncloud/ocis/v2/services/sharing/pkg/config/parser" + "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/ocis/pkg/register" + sharingparser "github.com/opencloud-eu/opencloud/services/sharing/pkg/config/parser" ) // SharesCommand is the entrypoint for the groups command. diff --git a/ocis/pkg/command/trash.go b/ocis/pkg/command/trash.go index a68b66e6d0..5bc0807f1d 100644 --- a/ocis/pkg/command/trash.go +++ b/ocis/pkg/command/trash.go @@ -2,12 +2,12 @@ package command import ( "fmt" - "github.com/owncloud/ocis/v2/ocis/pkg/trash" + "github.com/opencloud-eu/opencloud/ocis/pkg/trash" - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/config/parser" - "github.com/owncloud/ocis/v2/ocis/pkg/register" + "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/ocis/pkg/register" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/command/version.go b/ocis/pkg/command/version.go index e4c351b2f7..28ab018262 100644 --- a/ocis/pkg/command/version.go +++ b/ocis/pkg/command/version.go @@ -8,10 +8,10 @@ import ( "github.com/urfave/cli/v2" mreg "go-micro.dev/v4/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/ocis/pkg/register" + "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/ocis/pkg/register" ) const ( diff --git a/ocis/pkg/init/init.go b/ocis/pkg/init/init.go index 0808e4cb4c..1221a2d41b 100644 --- a/ocis/pkg/init/init.go +++ b/ocis/pkg/init/init.go @@ -6,7 +6,7 @@ import ( "path" "github.com/gofrs/uuid" - "github.com/owncloud/ocis/v2/ocis-pkg/generators" + "github.com/opencloud-eu/opencloud/ocis-pkg/generators" "gopkg.in/yaml.v2" ) diff --git a/ocis/pkg/register/command.go b/ocis/pkg/register/command.go index 3f02526055..7b17201435 100644 --- a/ocis/pkg/register/command.go +++ b/ocis/pkg/register/command.go @@ -1,7 +1,7 @@ package register import ( - "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/config" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/runtime/cmd/list.go b/ocis/pkg/runtime/cmd/list.go index 7f59da14d3..21c8c1c195 100644 --- a/ocis/pkg/runtime/cmd/list.go +++ b/ocis/pkg/runtime/cmd/list.go @@ -6,7 +6,7 @@ import ( "net" "net/rpc" - "github.com/owncloud/ocis/v2/ocis/pkg/runtime/config" + "github.com/opencloud-eu/opencloud/ocis/pkg/runtime/config" "github.com/spf13/cobra" ) diff --git a/ocis/pkg/runtime/options.go b/ocis/pkg/runtime/options.go index 4c92e673cd..bbe8b12e9e 100644 --- a/ocis/pkg/runtime/options.go +++ b/ocis/pkg/runtime/options.go @@ -1,7 +1,7 @@ package runtime import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" "github.com/urfave/cli/v2" ) diff --git a/ocis/pkg/runtime/runtime.go b/ocis/pkg/runtime/runtime.go index 49ce93c3b7..18e8ae5a3f 100644 --- a/ocis/pkg/runtime/runtime.go +++ b/ocis/pkg/runtime/runtime.go @@ -3,8 +3,8 @@ package runtime import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis/pkg/runtime/service" + "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis/pkg/runtime/service" ) // Runtime represents an oCIS runtime environment. diff --git a/ocis/pkg/runtime/service/option.go b/ocis/pkg/runtime/service/option.go index 7343fc9745..44d300247c 100644 --- a/ocis/pkg/runtime/service/option.go +++ b/ocis/pkg/runtime/service/option.go @@ -1,7 +1,7 @@ package service import ( - "github.com/owncloud/ocis/v2/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/config" ) // Log configures a structure logger. diff --git a/ocis/pkg/runtime/service/service.go b/ocis/pkg/runtime/service/service.go index f07fdf9882..5e0e4aa7ab 100644 --- a/ocis/pkg/runtime/service/service.go +++ b/ocis/pkg/runtime/service/service.go @@ -11,7 +11,7 @@ import ( "strings" "time" - authapp "github.com/owncloud/ocis/v2/services/auth-app/pkg/command" + authapp "github.com/opencloud-eu/opencloud/services/auth-app/pkg/command" "github.com/cenkalti/backoff" "github.com/cs3org/reva/v2/pkg/events/stream" @@ -19,51 +19,51 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/mohae/deepcopy" "github.com/olekukonko/tablewriter" - notifications "github.com/owncloud/ocis/v2/services/notifications/pkg/command" + notifications "github.com/opencloud-eu/opencloud/services/notifications/pkg/command" "github.com/thejerf/suture/v4" - ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - ogrpc "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - activitylog "github.com/owncloud/ocis/v2/services/activitylog/pkg/command" - antivirus "github.com/owncloud/ocis/v2/services/antivirus/pkg/command" - appProvider "github.com/owncloud/ocis/v2/services/app-provider/pkg/command" - appRegistry "github.com/owncloud/ocis/v2/services/app-registry/pkg/command" - audit "github.com/owncloud/ocis/v2/services/audit/pkg/command" - authbasic "github.com/owncloud/ocis/v2/services/auth-basic/pkg/command" - authmachine "github.com/owncloud/ocis/v2/services/auth-machine/pkg/command" - authservice "github.com/owncloud/ocis/v2/services/auth-service/pkg/command" - clientlog "github.com/owncloud/ocis/v2/services/clientlog/pkg/command" - eventhistory "github.com/owncloud/ocis/v2/services/eventhistory/pkg/command" - frontend "github.com/owncloud/ocis/v2/services/frontend/pkg/command" - gateway "github.com/owncloud/ocis/v2/services/gateway/pkg/command" - graph "github.com/owncloud/ocis/v2/services/graph/pkg/command" - groups "github.com/owncloud/ocis/v2/services/groups/pkg/command" - idm "github.com/owncloud/ocis/v2/services/idm/pkg/command" - idp "github.com/owncloud/ocis/v2/services/idp/pkg/command" - invitations "github.com/owncloud/ocis/v2/services/invitations/pkg/command" - nats "github.com/owncloud/ocis/v2/services/nats/pkg/command" - ocdav "github.com/owncloud/ocis/v2/services/ocdav/pkg/command" - ocm "github.com/owncloud/ocis/v2/services/ocm/pkg/command" - ocs "github.com/owncloud/ocis/v2/services/ocs/pkg/command" - policies "github.com/owncloud/ocis/v2/services/policies/pkg/command" - postprocessing "github.com/owncloud/ocis/v2/services/postprocessing/pkg/command" - proxy "github.com/owncloud/ocis/v2/services/proxy/pkg/command" - search "github.com/owncloud/ocis/v2/services/search/pkg/command" - settings "github.com/owncloud/ocis/v2/services/settings/pkg/command" - sharing "github.com/owncloud/ocis/v2/services/sharing/pkg/command" - sse "github.com/owncloud/ocis/v2/services/sse/pkg/command" - storagepublic "github.com/owncloud/ocis/v2/services/storage-publiclink/pkg/command" - storageshares "github.com/owncloud/ocis/v2/services/storage-shares/pkg/command" - storageSystem "github.com/owncloud/ocis/v2/services/storage-system/pkg/command" - storageusers "github.com/owncloud/ocis/v2/services/storage-users/pkg/command" - thumbnails "github.com/owncloud/ocis/v2/services/thumbnails/pkg/command" - userlog "github.com/owncloud/ocis/v2/services/userlog/pkg/command" - users "github.com/owncloud/ocis/v2/services/users/pkg/command" - web "github.com/owncloud/ocis/v2/services/web/pkg/command" - webdav "github.com/owncloud/ocis/v2/services/webdav/pkg/command" - webfinger "github.com/owncloud/ocis/v2/services/webfinger/pkg/command" + 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" + 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" + appRegistry "github.com/opencloud-eu/opencloud/services/app-registry/pkg/command" + audit "github.com/opencloud-eu/opencloud/services/audit/pkg/command" + authbasic "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/command" + authmachine "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/command" + authservice "github.com/opencloud-eu/opencloud/services/auth-service/pkg/command" + clientlog "github.com/opencloud-eu/opencloud/services/clientlog/pkg/command" + eventhistory "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/command" + frontend "github.com/opencloud-eu/opencloud/services/frontend/pkg/command" + gateway "github.com/opencloud-eu/opencloud/services/gateway/pkg/command" + graph "github.com/opencloud-eu/opencloud/services/graph/pkg/command" + groups "github.com/opencloud-eu/opencloud/services/groups/pkg/command" + idm "github.com/opencloud-eu/opencloud/services/idm/pkg/command" + idp "github.com/opencloud-eu/opencloud/services/idp/pkg/command" + invitations "github.com/opencloud-eu/opencloud/services/invitations/pkg/command" + nats "github.com/opencloud-eu/opencloud/services/nats/pkg/command" + ocdav "github.com/opencloud-eu/opencloud/services/ocdav/pkg/command" + ocm "github.com/opencloud-eu/opencloud/services/ocm/pkg/command" + ocs "github.com/opencloud-eu/opencloud/services/ocs/pkg/command" + policies "github.com/opencloud-eu/opencloud/services/policies/pkg/command" + postprocessing "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/command" + proxy "github.com/opencloud-eu/opencloud/services/proxy/pkg/command" + search "github.com/opencloud-eu/opencloud/services/search/pkg/command" + settings "github.com/opencloud-eu/opencloud/services/settings/pkg/command" + sharing "github.com/opencloud-eu/opencloud/services/sharing/pkg/command" + sse "github.com/opencloud-eu/opencloud/services/sse/pkg/command" + storagepublic "github.com/opencloud-eu/opencloud/services/storage-publiclink/pkg/command" + storageshares "github.com/opencloud-eu/opencloud/services/storage-shares/pkg/command" + storageSystem "github.com/opencloud-eu/opencloud/services/storage-system/pkg/command" + storageusers "github.com/opencloud-eu/opencloud/services/storage-users/pkg/command" + thumbnails "github.com/opencloud-eu/opencloud/services/thumbnails/pkg/command" + userlog "github.com/opencloud-eu/opencloud/services/userlog/pkg/command" + users "github.com/opencloud-eu/opencloud/services/users/pkg/command" + web "github.com/opencloud-eu/opencloud/services/web/pkg/command" + webdav "github.com/opencloud-eu/opencloud/services/webdav/pkg/command" + webfinger "github.com/opencloud-eu/opencloud/services/webfinger/pkg/command" ) var ( diff --git a/ocis/pkg/runtime/service/sutureservice.go b/ocis/pkg/runtime/service/sutureservice.go index d0bc3e3bc0..822f3d159e 100644 --- a/ocis/pkg/runtime/service/sutureservice.go +++ b/ocis/pkg/runtime/service/sutureservice.go @@ -3,7 +3,7 @@ package service import ( "context" - ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" "github.com/thejerf/suture/v4" ) diff --git a/protogen/gen/ocis/services/eventhistory/v0/eventhistory.pb.go b/protogen/gen/ocis/services/eventhistory/v0/eventhistory.pb.go index 880b0a33d5..91d1b3764d 100644 --- a/protogen/gen/ocis/services/eventhistory/v0/eventhistory.pb.go +++ b/protogen/gen/ocis/services/eventhistory/v0/eventhistory.pb.go @@ -8,7 +8,7 @@ package v0 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/protogen/gen/ocis/services/eventhistory/v0/eventhistory.pb.micro.go b/protogen/gen/ocis/services/eventhistory/v0/eventhistory.pb.micro.go index 956f32f9c3..343a4a5056 100644 --- a/protogen/gen/ocis/services/eventhistory/v0/eventhistory.pb.micro.go +++ b/protogen/gen/ocis/services/eventhistory/v0/eventhistory.pb.micro.go @@ -6,7 +6,7 @@ package v0 import ( fmt "fmt" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" + _ "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0" proto "google.golang.org/protobuf/proto" math "math" ) diff --git a/protogen/gen/ocis/services/eventhistory/v0/mocks/event_history_service.go b/protogen/gen/ocis/services/eventhistory/v0/mocks/event_history_service.go index f5d298b1af..fd5141c1f4 100644 --- a/protogen/gen/ocis/services/eventhistory/v0/mocks/event_history_service.go +++ b/protogen/gen/ocis/services/eventhistory/v0/mocks/event_history_service.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" ) // EventHistoryService is an autogenerated mock type for the EventHistoryService type diff --git a/protogen/gen/ocis/services/policies/v0/mocks/policies_provider_service.go b/protogen/gen/ocis/services/policies/v0/mocks/policies_provider_service.go index 7ee055c8c1..935ea4303c 100644 --- a/protogen/gen/ocis/services/policies/v0/mocks/policies_provider_service.go +++ b/protogen/gen/ocis/services/policies/v0/mocks/policies_provider_service.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0" ) // PoliciesProviderService is an autogenerated mock type for the PoliciesProviderService type diff --git a/protogen/gen/ocis/services/policies/v0/policies.pb.go b/protogen/gen/ocis/services/policies/v0/policies.pb.go index 9e1fa83dac..222d0d6581 100644 --- a/protogen/gen/ocis/services/policies/v0/policies.pb.go +++ b/protogen/gen/ocis/services/policies/v0/policies.pb.go @@ -8,7 +8,7 @@ package v0 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/policies/v0" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/protogen/gen/ocis/services/policies/v0/policies.pb.micro.go b/protogen/gen/ocis/services/policies/v0/policies.pb.micro.go index 4d813c1684..227af81916 100644 --- a/protogen/gen/ocis/services/policies/v0/policies.pb.micro.go +++ b/protogen/gen/ocis/services/policies/v0/policies.pb.micro.go @@ -6,7 +6,7 @@ package v0 import ( fmt "fmt" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0" + _ "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/policies/v0" _ "google.golang.org/genproto/googleapis/api/annotations" proto "google.golang.org/protobuf/proto" math "math" diff --git a/protogen/gen/ocis/services/search/v0/mocks/search_provider_service.go b/protogen/gen/ocis/services/search/v0/mocks/search_provider_service.go index ba73046b52..980037e90c 100644 --- a/protogen/gen/ocis/services/search/v0/mocks/search_provider_service.go +++ b/protogen/gen/ocis/services/search/v0/mocks/search_provider_service.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" ) // SearchProviderService is an autogenerated mock type for the SearchProviderService type diff --git a/protogen/gen/ocis/services/search/v0/search.pb.go b/protogen/gen/ocis/services/search/v0/search.pb.go index 3b7e21636f..d57773856f 100644 --- a/protogen/gen/ocis/services/search/v0/search.pb.go +++ b/protogen/gen/ocis/services/search/v0/search.pb.go @@ -8,7 +8,7 @@ package v0 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/protogen/gen/ocis/services/search/v0/search.pb.micro.go b/protogen/gen/ocis/services/search/v0/search.pb.micro.go index 4e069f8448..047c71853c 100644 --- a/protogen/gen/ocis/services/search/v0/search.pb.micro.go +++ b/protogen/gen/ocis/services/search/v0/search.pb.micro.go @@ -6,7 +6,7 @@ package v0 import ( fmt "fmt" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" + _ "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0" _ "google.golang.org/genproto/googleapis/api/annotations" proto "google.golang.org/protobuf/proto" _ "google.golang.org/protobuf/types/known/fieldmaskpb" diff --git a/protogen/gen/ocis/services/settings/v0/mocks/value_service.go b/protogen/gen/ocis/services/settings/v0/mocks/value_service.go index c653ddc6de..8a85b6834d 100644 --- a/protogen/gen/ocis/services/settings/v0/mocks/value_service.go +++ b/protogen/gen/ocis/services/settings/v0/mocks/value_service.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" ) // ValueService is an autogenerated mock type for the ValueService type diff --git a/protogen/gen/ocis/services/settings/v0/settings.pb.go b/protogen/gen/ocis/services/settings/v0/settings.pb.go index 1d035ab63a..a99e023511 100644 --- a/protogen/gen/ocis/services/settings/v0/settings.pb.go +++ b/protogen/gen/ocis/services/settings/v0/settings.pb.go @@ -8,7 +8,7 @@ package v0 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" _ "google.golang.org/genproto/googleapis/api/annotations" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" diff --git a/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go b/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go index b78e27e77f..194532788b 100644 --- a/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go +++ b/protogen/gen/ocis/services/settings/v0/settings.pb.micro.go @@ -6,7 +6,7 @@ package v0 import ( fmt "fmt" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + _ "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" _ "google.golang.org/genproto/googleapis/api/annotations" proto "google.golang.org/protobuf/proto" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/protogen/gen/ocis/services/store/v0/store.pb.go b/protogen/gen/ocis/services/store/v0/store.pb.go index d38008316b..ba581a0697 100644 --- a/protogen/gen/ocis/services/store/v0/store.pb.go +++ b/protogen/gen/ocis/services/store/v0/store.pb.go @@ -8,7 +8,7 @@ package v0 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/store/v0" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/protogen/gen/ocis/services/store/v0/store.pb.micro.go b/protogen/gen/ocis/services/store/v0/store.pb.micro.go index 5312134566..e73da493b7 100644 --- a/protogen/gen/ocis/services/store/v0/store.pb.micro.go +++ b/protogen/gen/ocis/services/store/v0/store.pb.micro.go @@ -6,7 +6,7 @@ package v0 import ( fmt "fmt" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/store/v0" + _ "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/store/v0" proto "google.golang.org/protobuf/proto" math "math" ) diff --git a/protogen/gen/ocis/services/thumbnails/v0/mocks/thumbnail_service.go b/protogen/gen/ocis/services/thumbnails/v0/mocks/thumbnail_service.go index 83aad864ee..e13896e397 100644 --- a/protogen/gen/ocis/services/thumbnails/v0/mocks/thumbnail_service.go +++ b/protogen/gen/ocis/services/thumbnails/v0/mocks/thumbnail_service.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/thumbnails/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/thumbnails/v0" ) // ThumbnailService is an autogenerated mock type for the ThumbnailService type diff --git a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go index 5d03a85fad..5a30e5b1b0 100644 --- a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go +++ b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.go @@ -8,7 +8,7 @@ package v0 import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/thumbnails/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/thumbnails/v0" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go index 80cc63622d..def0b84297 100644 --- a/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go +++ b/protogen/gen/ocis/services/thumbnails/v0/thumbnails.pb.micro.go @@ -6,7 +6,7 @@ package v0 import ( fmt "fmt" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" - _ "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/thumbnails/v0" + _ "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/thumbnails/v0" proto "google.golang.org/protobuf/proto" math "math" ) diff --git a/services/activitylog/cmd/activitylog/main.go b/services/activitylog/cmd/activitylog/main.go index dae55b4f16..64571354fe 100644 --- a/services/activitylog/cmd/activitylog/main.go +++ b/services/activitylog/cmd/activitylog/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/command" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/command" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults" ) func main() { diff --git a/services/activitylog/pkg/command/health.go b/services/activitylog/pkg/command/health.go index 7b67d682b7..6e0704ace0 100644 --- a/services/activitylog/pkg/command/health.go +++ b/services/activitylog/pkg/command/health.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/activitylog/pkg/command/root.go b/services/activitylog/pkg/command/root.go index 0874c93890..56fe63d699 100644 --- a/services/activitylog/pkg/command/root.go +++ b/services/activitylog/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 9490e588f9..ec3b7d9bda 100644 --- a/services/activitylog/pkg/command/server.go +++ b/services/activitylog/pkg/command/server.go @@ -12,19 +12,19 @@ import ( "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - ogrpc "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/logging" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/metrics" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/server/http" + "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" + 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" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/logging" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/server/http" ) var _registeredEvents = []events.Unmarshaller{ diff --git a/services/activitylog/pkg/command/version.go b/services/activitylog/pkg/command/version.go index a382b6af6c..6ba2fd2f7f 100644 --- a/services/activitylog/pkg/command/version.go +++ b/services/activitylog/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/activitylog/pkg/config/config.go b/services/activitylog/pkg/config/config.go index 4101ecbcd8..e7fe6c3841 100644 --- a/services/activitylog/pkg/config/config.go +++ b/services/activitylog/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 32f30bd0fc..038dd7155f 100644 --- a/services/activitylog/pkg/config/defaults/defaultconfig.go +++ b/services/activitylog/pkg/config/defaults/defaultconfig.go @@ -1,9 +1,9 @@ package defaults import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" ) // FullDefaultConfig returns the full default config diff --git a/services/activitylog/pkg/config/parser/parse.go b/services/activitylog/pkg/config/parser/parse.go index 917453d163..ad9b7bd992 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 f39dabd38a..4a051afa64 100644 --- a/services/activitylog/pkg/config/tracing.go +++ b/services/activitylog/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 d88662dafe..c735f47397 100644 --- a/services/activitylog/pkg/logging/logging.go +++ b/services/activitylog/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/activitylog/pkg/server/debug/option.go b/services/activitylog/pkg/server/debug/option.go index 3d499becf5..49e38a7feb 100644 --- a/services/activitylog/pkg/server/debug/option.go +++ b/services/activitylog/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/config" ) // Option defines a single option function. diff --git a/services/activitylog/pkg/server/debug/server.go b/services/activitylog/pkg/server/debug/server.go index 95979961a6..cfe4aec00d 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // 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 760cb131b3..eca7c74aeb 100644 --- a/services/activitylog/pkg/server/http/option.go +++ b/services/activitylog/pkg/server/http/option.go @@ -6,11 +6,11 @@ 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/owncloud/ocis/v2/ocis-pkg/log" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/metrics" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/activitylog/pkg/metrics" "github.com/urfave/cli/v2" "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" diff --git a/services/activitylog/pkg/server/http/server.go b/services/activitylog/pkg/server/http/server.go index 86a239b287..90da0bea10 100644 --- a/services/activitylog/pkg/server/http/server.go +++ b/services/activitylog/pkg/server/http/server.go @@ -7,13 +7,13 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/account" - "github.com/owncloud/ocis/v2/ocis-pkg/cors" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/service/http" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - svc "github.com/owncloud/ocis/v2/services/activitylog/pkg/service" + "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" + 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 6fe5db0d30..e5aa50053d 100644 --- a/services/activitylog/pkg/service/http.go +++ b/services/activitylog/pkg/service/http.go @@ -19,11 +19,11 @@ import ( "google.golang.org/grpc/metadata" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/ast" - "github.com/owncloud/ocis/v2/ocis-pkg/kql" - "github.com/owncloud/ocis/v2/ocis-pkg/l10n" - ehmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" + "github.com/opencloud-eu/opencloud/ocis-pkg/ast" + "github.com/opencloud-eu/opencloud/ocis-pkg/kql" + "github.com/opencloud-eu/opencloud/ocis-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" ) var ( diff --git a/services/activitylog/pkg/service/options.go b/services/activitylog/pkg/service/options.go index 0aa97abfc5..df91229a96 100644 --- a/services/activitylog/pkg/service/options.go +++ b/services/activitylog/pkg/service/options.go @@ -5,10 +5,10 @@ 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/owncloud/ocis/v2/ocis-pkg/log" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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" microstore "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" ) diff --git a/services/activitylog/pkg/service/response.go b/services/activitylog/pkg/service/response.go index b6e27bc373..e74893b1ab 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/owncloud/ocis/v2/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" ) // Translations diff --git a/services/activitylog/pkg/service/service.go b/services/activitylog/pkg/service/service.go index a98f541f7b..2a40e64680 100644 --- a/services/activitylog/pkg/service/service.go +++ b/services/activitylog/pkg/service/service.go @@ -18,10 +18,10 @@ import ( "github.com/go-chi/chi/v5" microstore "go-micro.dev/v4/store" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/activitylog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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" ) // Nats runs into max payload exceeded errors at around 7k activities. Let's keep a buffer. diff --git a/services/antivirus/cmd/antivirus/main.go b/services/antivirus/cmd/antivirus/main.go index 8f0332ad1d..dfa798fabf 100644 --- a/services/antivirus/cmd/antivirus/main.go +++ b/services/antivirus/cmd/antivirus/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/command" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/command" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/defaults" ) func main() { diff --git a/services/antivirus/pkg/command/health.go b/services/antivirus/pkg/command/health.go index d348184caf..d4b442d79c 100644 --- a/services/antivirus/pkg/command/health.go +++ b/services/antivirus/pkg/command/health.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config/parser" + "github.com/opencloud-eu/opencloud/ocis-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 4683d3bc52..ae7c14929e 100644 --- a/services/antivirus/pkg/command/root.go +++ b/services/antivirus/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 d259f0f5e6..4cf17c8d1d 100644 --- a/services/antivirus/pkg/command/server.go +++ b/services/antivirus/pkg/command/server.go @@ -7,13 +7,13 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/service" + "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/services/antivirus/pkg/config" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/service" ) // Server is the entrypoint for the server command. diff --git a/services/antivirus/pkg/command/version.go b/services/antivirus/pkg/command/version.go index 3286c932c9..678c6d8b52 100644 --- a/services/antivirus/pkg/command/version.go +++ b/services/antivirus/pkg/command/version.go @@ -3,9 +3,9 @@ package command import ( "fmt" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/antivirus/pkg/config/defaults/defaultconfig.go b/services/antivirus/pkg/config/defaults/defaultconfig.go index 24be86e502..c262d6d2c3 100644 --- a/services/antivirus/pkg/config/defaults/defaultconfig.go +++ b/services/antivirus/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "time" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration which is needed for doc generation. diff --git a/services/antivirus/pkg/config/parser/parse.go b/services/antivirus/pkg/config/parser/parse.go index fab4c2f0c0..3dbd81b8e7 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 2cea5a4263..4fa48090ef 100644 --- a/services/antivirus/pkg/config/tracing.go +++ b/services/antivirus/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/antivirus/pkg/scanners/icap_test.go b/services/antivirus/pkg/scanners/icap_test.go index 85b597f7bf..220b14c954 100644 --- a/services/antivirus/pkg/scanners/icap_test.go +++ b/services/antivirus/pkg/scanners/icap_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/mock" ic "github.com/egirna/icap-client" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/scanners" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/scanners/mocks" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/scanners" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/scanners/mocks" ) func TestICAP_Scan(t *testing.T) { diff --git a/services/antivirus/pkg/server/debug/option.go b/services/antivirus/pkg/server/debug/option.go index 1118208c8e..1abf1716bb 100644 --- a/services/antivirus/pkg/server/debug/option.go +++ b/services/antivirus/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" ) // Option defines a single option function. diff --git a/services/antivirus/pkg/server/debug/server.go b/services/antivirus/pkg/server/debug/server.go index 687e470139..9e7b5ac398 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // Server initializes the debug service and server. diff --git a/services/antivirus/pkg/service/service.go b/services/antivirus/pkg/service/service.go index 099228dd0a..049f4388b9 100644 --- a/services/antivirus/pkg/service/service.go +++ b/services/antivirus/pkg/service/service.go @@ -19,9 +19,9 @@ import ( "github.com/cs3org/reva/v2/pkg/rhttp" "go.opentelemetry.io/otel/trace" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/config" - "github.com/owncloud/ocis/v2/services/antivirus/pkg/scanners" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/config" + "github.com/opencloud-eu/opencloud/services/antivirus/pkg/scanners" ) var ( diff --git a/services/app-provider/cmd/app-provider/main.go b/services/app-provider/cmd/app-provider/main.go index 1d7474d45b..b5125c5087 100644 --- a/services/app-provider/cmd/app-provider/main.go +++ b/services/app-provider/cmd/app-provider/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/command" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/app-provider/pkg/command" + "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config/defaults" ) func main() { diff --git a/services/app-provider/pkg/command/health.go b/services/app-provider/pkg/command/health.go index 23db3c5011..20e042d144 100644 --- a/services/app-provider/pkg/command/health.go +++ b/services/app-provider/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/app-provider/pkg/command/root.go b/services/app-provider/pkg/command/root.go index 42ac00c494..f0e088fc2d 100644 --- a/services/app-provider/pkg/command/root.go +++ b/services/app-provider/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 8267ed8ea6..b7a128d073 100644 --- a/services/app-provider/pkg/command/server.go +++ b/services/app-provider/pkg/command/server.go @@ -11,15 +11,15 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/logging" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/revaconfig" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/server/debug" + "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/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" + "github.com/opencloud-eu/opencloud/services/app-provider/pkg/revaconfig" + "github.com/opencloud-eu/opencloud/services/app-provider/pkg/server/debug" ) // Server is the entry point for the server command. diff --git a/services/app-provider/pkg/command/version.go b/services/app-provider/pkg/command/version.go index ee143919f5..70b12ce800 100644 --- a/services/app-provider/pkg/command/version.go +++ b/services/app-provider/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config" + "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/app-provider/pkg/config/config.go b/services/app-provider/pkg/config/config.go index 1c422ab21d..857c01682f 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 bc9d84da05..ad80ea5aeb 100644 --- a/services/app-provider/pkg/config/defaults/defaultconfig.go +++ b/services/app-provider/pkg/config/defaults/defaultconfig.go @@ -1,9 +1,9 @@ package defaults import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/app-provider/pkg/config/parser/parse.go b/services/app-provider/pkg/config/parser/parse.go index 575041aec3..49a7108400 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 441d0cb5da..052d99d4e5 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/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 cf1470f493..e01c4e94d1 100644 --- a/services/app-provider/pkg/logging/logging.go +++ b/services/app-provider/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/app-provider/pkg/revaconfig/config.go b/services/app-provider/pkg/revaconfig/config.go index b1d1fda580..fda5a77ccc 100644 --- a/services/app-provider/pkg/revaconfig/config.go +++ b/services/app-provider/pkg/revaconfig/config.go @@ -2,7 +2,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config" + "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" ) // AppProviderConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/app-provider/pkg/server/debug/option.go b/services/app-provider/pkg/server/debug/option.go index 8fa6342dc9..2545119c48 100644 --- a/services/app-provider/pkg/server/debug/option.go +++ b/services/app-provider/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/app-provider/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/app-provider/pkg/config" ) // Option defines a single option function. diff --git a/services/app-provider/pkg/server/debug/server.go b/services/app-provider/pkg/server/debug/server.go index 3ce3b8d3c9..54914a8ec6 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/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/services/app-registry/cmd/app-registry/main.go b/services/app-registry/cmd/app-registry/main.go index ddb4faa295..7dd9732db8 100644 --- a/services/app-registry/cmd/app-registry/main.go +++ b/services/app-registry/cmd/app-registry/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/command" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/app-registry/pkg/command" + "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config/defaults" ) func main() { diff --git a/services/app-registry/pkg/command/health.go b/services/app-registry/pkg/command/health.go index f8331072cc..ec740ac589 100644 --- a/services/app-registry/pkg/command/health.go +++ b/services/app-registry/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/app-registry/pkg/command/root.go b/services/app-registry/pkg/command/root.go index 41582af228..a54bb2161c 100644 --- a/services/app-registry/pkg/command/root.go +++ b/services/app-registry/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 651b96c65c..95f344fc8b 100644 --- a/services/app-registry/pkg/command/server.go +++ b/services/app-registry/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/logging" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/revaconfig" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/server/debug" + "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/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" + "github.com/opencloud-eu/opencloud/services/app-registry/pkg/revaconfig" + "github.com/opencloud-eu/opencloud/services/app-registry/pkg/server/debug" "github.com/urfave/cli/v2" ) diff --git a/services/app-registry/pkg/command/version.go b/services/app-registry/pkg/command/version.go index c4e1adc1f0..8de6f03cd7 100644 --- a/services/app-registry/pkg/command/version.go +++ b/services/app-registry/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config" + "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/app-registry/pkg/config/config.go b/services/app-registry/pkg/config/config.go index 15c212539b..86c52c34d9 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 1c51f77c7f..251b7e3ca9 100644 --- a/services/app-registry/pkg/config/defaults/defaultconfig.go +++ b/services/app-registry/pkg/config/defaults/defaultconfig.go @@ -1,9 +1,9 @@ package defaults import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/app-registry/pkg/config/parser/parse.go b/services/app-registry/pkg/config/parser/parse.go index 4fb879c6b8..27d3249575 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 93f983cda9..bea58e3f1a 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/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 d07c2a1d46..5312d9e66a 100644 --- a/services/app-registry/pkg/logging/logging.go +++ b/services/app-registry/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/app-registry/pkg/revaconfig/config.go b/services/app-registry/pkg/revaconfig/config.go index 68215a3280..33a5586121 100644 --- a/services/app-registry/pkg/revaconfig/config.go +++ b/services/app-registry/pkg/revaconfig/config.go @@ -2,8 +2,8 @@ package revaconfig import ( "github.com/mitchellh/mapstructure" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" ) // AppRegistryConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/app-registry/pkg/server/debug/option.go b/services/app-registry/pkg/server/debug/option.go index ea63c5116e..95082da760 100644 --- a/services/app-registry/pkg/server/debug/option.go +++ b/services/app-registry/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/app-registry/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/app-registry/pkg/config" ) // Option defines a single option function. diff --git a/services/app-registry/pkg/server/debug/server.go b/services/app-registry/pkg/server/debug/server.go index 3ce3b8d3c9..54914a8ec6 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/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/services/audit/cmd/audit/main.go b/services/audit/cmd/audit/main.go index 56413c60b5..7034fa314e 100644 --- a/services/audit/cmd/audit/main.go +++ b/services/audit/cmd/audit/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/audit/pkg/command" - "github.com/owncloud/ocis/v2/services/audit/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/audit/pkg/command" + "github.com/opencloud-eu/opencloud/services/audit/pkg/config/defaults" ) func main() { diff --git a/services/audit/pkg/command/health.go b/services/audit/pkg/command/health.go index faf43b8e08..b4e5e23da2 100644 --- a/services/audit/pkg/command/health.go +++ b/services/audit/pkg/command/health.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/audit/pkg/config" + "github.com/opencloud-eu/opencloud/services/audit/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/audit/pkg/command/root.go b/services/audit/pkg/command/root.go index c52fd880de..d5b2d692fe 100644 --- a/services/audit/pkg/command/root.go +++ b/services/audit/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/audit/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 61503c7fb1..bf4e3beb5f 100644 --- a/services/audit/pkg/command/server.go +++ b/services/audit/pkg/command/server.go @@ -9,13 +9,13 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/audit/pkg/config" - "github.com/owncloud/ocis/v2/services/audit/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/audit/pkg/logging" - "github.com/owncloud/ocis/v2/services/audit/pkg/server/debug" - svc "github.com/owncloud/ocis/v2/services/audit/pkg/service" - "github.com/owncloud/ocis/v2/services/audit/pkg/types" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/audit/pkg/server/debug" + svc "github.com/opencloud-eu/opencloud/services/audit/pkg/service" + "github.com/opencloud-eu/opencloud/services/audit/pkg/types" ) // Server is the entrypoint for the server command. diff --git a/services/audit/pkg/command/version.go b/services/audit/pkg/command/version.go index 8b08928c3f..52b33d8e88 100644 --- a/services/audit/pkg/command/version.go +++ b/services/audit/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/audit/pkg/config" + "github.com/opencloud-eu/opencloud/services/audit/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/audit/pkg/config/config.go b/services/audit/pkg/config/config.go index a211ccc36c..fa676a2a14 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/audit/pkg/config/defaults/defaultconfig.go b/services/audit/pkg/config/defaults/defaultconfig.go index a85abaec72..5d4282e679 100644 --- a/services/audit/pkg/config/defaults/defaultconfig.go +++ b/services/audit/pkg/config/defaults/defaultconfig.go @@ -1,7 +1,7 @@ package defaults import ( - "github.com/owncloud/ocis/v2/services/audit/pkg/config" + "github.com/opencloud-eu/opencloud/services/audit/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/audit/pkg/config/parser/parse.go b/services/audit/pkg/config/parser/parse.go index 6eb0d12dd7..d51644040b 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/services/audit/pkg/config" - "github.com/owncloud/ocis/v2/services/audit/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/services/audit/pkg/config" + "github.com/opencloud-eu/opencloud/services/audit/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 01f0569fa4..d7e88da87a 100644 --- a/services/audit/pkg/logging/logging.go +++ b/services/audit/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/audit/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/audit/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/audit/pkg/server/debug/option.go b/services/audit/pkg/server/debug/option.go index 9449006241..5a688ca8d6 100644 --- a/services/audit/pkg/server/debug/option.go +++ b/services/audit/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/audit/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/audit/pkg/config" ) // Option defines a single option function. diff --git a/services/audit/pkg/server/debug/server.go b/services/audit/pkg/server/debug/server.go index fb423a820b..991586f444 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // Server initializes the debug service and server. diff --git a/services/audit/pkg/service/service.go b/services/audit/pkg/service/service.go index 14690f7c70..6667f09b4d 100644 --- a/services/audit/pkg/service/service.go +++ b/services/audit/pkg/service/service.go @@ -7,9 +7,9 @@ import ( "os" "github.com/cs3org/reva/v2/pkg/events" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/audit/pkg/config" - "github.com/owncloud/ocis/v2/services/audit/pkg/types" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/audit/pkg/config" + "github.com/opencloud-eu/opencloud/services/audit/pkg/types" ) // Log is used to log to different outputs diff --git a/services/audit/pkg/service/service_test.go b/services/audit/pkg/service/service_test.go index b18209409b..5032243e84 100644 --- a/services/audit/pkg/service/service_test.go +++ b/services/audit/pkg/service/service_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" "github.com/cs3org/reva/v2/pkg/events" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/audit/pkg/types" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/audit/pkg/types" group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" diff --git a/services/auth-app/cmd/auth-app/main.go b/services/auth-app/cmd/auth-app/main.go index ada20d1afd..47a34876ff 100644 --- a/services/auth-app/cmd/auth-app/main.go +++ b/services/auth-app/cmd/auth-app/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/command" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/command" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/defaults" ) func main() { diff --git a/services/auth-app/pkg/command/create.go b/services/auth-app/pkg/command/create.go index 5e2b897f9e..6a18f4feb1 100644 --- a/services/auth-app/pkg/command/create.go +++ b/services/auth-app/pkg/command/create.go @@ -16,11 +16,11 @@ 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/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config/parser" + "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/services/auth-app/pkg/config" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config/parser" "github.com/urfave/cli/v2" "google.golang.org/grpc/metadata" ) diff --git a/services/auth-app/pkg/command/health.go b/services/auth-app/pkg/command/health.go index fad375e207..e75c6a95da 100644 --- a/services/auth-app/pkg/command/health.go +++ b/services/auth-app/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/auth-app/pkg/command/root.go b/services/auth-app/pkg/command/root.go index a3c2c87df0..d7a1def3da 100644 --- a/services/auth-app/pkg/command/root.go +++ b/services/auth-app/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 6debb8a115..ae92418d73 100644 --- a/services/auth-app/pkg/command/server.go +++ b/services/auth-app/pkg/command/server.go @@ -10,18 +10,18 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - ogrpc "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/logging" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/revaconfig" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/server/http" + "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" + 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" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/logging" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/revaconfig" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/server/http" "github.com/urfave/cli/v2" ) diff --git a/services/auth-app/pkg/command/version.go b/services/auth-app/pkg/command/version.go index b7c644c552..657e7672e1 100644 --- a/services/auth-app/pkg/command/version.go +++ b/services/auth-app/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/auth-app/pkg/config/config.go b/services/auth-app/pkg/config/config.go index ef7cc1ebe8..04ca7e3a59 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 01215d1fe5..34a4da9853 100644 --- a/services/auth-app/pkg/config/defaults/defaultconfig.go +++ b/services/auth-app/pkg/config/defaults/defaultconfig.go @@ -3,9 +3,9 @@ package defaults import ( "strings" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/auth-app/pkg/config/parser/parse.go b/services/auth-app/pkg/config/parser/parse.go index d9c71d9275..d30c05a4ec 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 f082a4c82c..5bcd12e6d8 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/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 b01a179327..949c0a4094 100644 --- a/services/auth-app/pkg/logging/logging.go +++ b/services/auth-app/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/auth-app/pkg/revaconfig/config.go b/services/auth-app/pkg/revaconfig/config.go index da75275314..f7ac8ca3e0 100644 --- a/services/auth-app/pkg/revaconfig/config.go +++ b/services/auth-app/pkg/revaconfig/config.go @@ -3,8 +3,8 @@ package revaconfig import ( "path/filepath" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" ) // AuthAppConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/auth-app/pkg/server/debug/option.go b/services/auth-app/pkg/server/debug/option.go index 81f5152678..4af9f19d26 100644 --- a/services/auth-app/pkg/server/debug/option.go +++ b/services/auth-app/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/auth-app/pkg/config" ) // Option defines a single option function. diff --git a/services/auth-app/pkg/server/debug/server.go b/services/auth-app/pkg/server/debug/server.go index 3ce3b8d3c9..54914a8ec6 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/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" + "github.com/opencloud-eu/opencloud/ocis-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 1d141e9e34..54015fa2a6 100644 --- a/services/auth-app/pkg/server/http/option.go +++ b/services/auth-app/pkg/server/http/option.go @@ -5,9 +5,9 @@ import ( gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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" "go.opentelemetry.io/otel/trace" ) diff --git a/services/auth-app/pkg/server/http/server.go b/services/auth-app/pkg/server/http/server.go index 4c18d1e2fb..18b8bd1900 100644 --- a/services/auth-app/pkg/server/http/server.go +++ b/services/auth-app/pkg/server/http/server.go @@ -7,13 +7,13 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/account" - "github.com/owncloud/ocis/v2/ocis-pkg/cors" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/service/http" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - svc "github.com/owncloud/ocis/v2/services/auth-app/pkg/service" + "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" + 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 967001c7cd..b3561685b5 100644 --- a/services/auth-app/pkg/service/option.go +++ b/services/auth-app/pkg/service/option.go @@ -6,9 +6,9 @@ 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/owncloud/ocis/v2/ocis-pkg/log" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 c4515a5751..376d1c8361 100644 --- a/services/auth-app/pkg/service/service.go +++ b/services/auth-app/pkg/service/service.go @@ -19,10 +19,10 @@ 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/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/roles" - "github.com/owncloud/ocis/v2/services/auth-app/pkg/config" - settings "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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/cmd/auth-basic/main.go b/services/auth-basic/cmd/auth-basic/main.go index 6235d5da74..84d5056556 100644 --- a/services/auth-basic/cmd/auth-basic/main.go +++ b/services/auth-basic/cmd/auth-basic/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/command" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/command" + "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config/defaults" ) func main() { diff --git a/services/auth-basic/pkg/command/health.go b/services/auth-basic/pkg/command/health.go index 269847ebb8..7369fdfadd 100644 --- a/services/auth-basic/pkg/command/health.go +++ b/services/auth-basic/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/auth-basic/pkg/command/root.go b/services/auth-basic/pkg/command/root.go index 46823bc174..b529e6ef9d 100644 --- a/services/auth-basic/pkg/command/root.go +++ b/services/auth-basic/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 d451083b1f..9cb06159a8 100644 --- a/services/auth-basic/pkg/command/server.go +++ b/services/auth-basic/pkg/command/server.go @@ -9,16 +9,16 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/ldap" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/logging" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/revaconfig" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/server/debug" + "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/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" + "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/revaconfig" + "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/server/debug" "github.com/urfave/cli/v2" ) diff --git a/services/auth-basic/pkg/command/version.go b/services/auth-basic/pkg/command/version.go index f2bbc5eb3e..9982f512c9 100644 --- a/services/auth-basic/pkg/command/version.go +++ b/services/auth-basic/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config" + "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/auth-basic/pkg/config/config.go b/services/auth-basic/pkg/config/config.go index 65aa3bc222..a461554c87 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 b21153fc33..e2e07df9c0 100644 --- a/services/auth-basic/pkg/config/defaults/defaultconfig.go +++ b/services/auth-basic/pkg/config/defaults/defaultconfig.go @@ -3,10 +3,10 @@ package defaults import ( "path/filepath" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config" + "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/services/auth-basic/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/auth-basic/pkg/config/parser/parse.go b/services/auth-basic/pkg/config/parser/parse.go index 77a36f5025..4770330ab5 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 250c70812f..1c5b5bd6aa 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/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 07957bcd72..8460b2fb3a 100644 --- a/services/auth-basic/pkg/logging/logging.go +++ b/services/auth-basic/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/auth-basic/pkg/revaconfig/config.go b/services/auth-basic/pkg/revaconfig/config.go index fa69b81590..5253701f3f 100644 --- a/services/auth-basic/pkg/revaconfig/config.go +++ b/services/auth-basic/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config" + "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" ) // AuthBasicConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/auth-basic/pkg/server/debug/option.go b/services/auth-basic/pkg/server/debug/option.go index e9a4f98296..ab7c1fac68 100644 --- a/services/auth-basic/pkg/server/debug/option.go +++ b/services/auth-basic/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/auth-basic/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/config" ) // Option defines a single option function. diff --git a/services/auth-basic/pkg/server/debug/server.go b/services/auth-basic/pkg/server/debug/server.go index 3ce3b8d3c9..54914a8ec6 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/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/services/auth-bearer/cmd/auth-bearer/main.go b/services/auth-bearer/cmd/auth-bearer/main.go index 8cab6c04a1..822ce045d2 100644 --- a/services/auth-bearer/cmd/auth-bearer/main.go +++ b/services/auth-bearer/cmd/auth-bearer/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/command" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/command" + "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config/defaults" ) func main() { diff --git a/services/auth-bearer/pkg/command/health.go b/services/auth-bearer/pkg/command/health.go index b562eaa4a3..f38a7848c1 100644 --- a/services/auth-bearer/pkg/command/health.go +++ b/services/auth-bearer/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/auth-bearer/pkg/command/root.go b/services/auth-bearer/pkg/command/root.go index c22b4f9ae3..bc5985abc8 100644 --- a/services/auth-bearer/pkg/command/root.go +++ b/services/auth-bearer/pkg/command/root.go @@ -4,9 +4,9 @@ import ( "context" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + ociscfg "github.com/opencloud-eu/opencloud/ocis-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 7e5e0b447d..7f8970ea35 100644 --- a/services/auth-bearer/pkg/command/server.go +++ b/services/auth-bearer/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/logging" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/revaconfig" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/server/debug" + "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/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" + "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/revaconfig" + "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/server/debug" "github.com/urfave/cli/v2" ) diff --git a/services/auth-bearer/pkg/command/version.go b/services/auth-bearer/pkg/command/version.go index 1f1af58f68..a8146380f3 100644 --- a/services/auth-bearer/pkg/command/version.go +++ b/services/auth-bearer/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config" + "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/auth-bearer/pkg/config/config.go b/services/auth-bearer/pkg/config/config.go index c09ddbaae7..6eff5d40be 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 457eae88f0..07d83d538d 100644 --- a/services/auth-bearer/pkg/config/defaults/defaultconfig.go +++ b/services/auth-bearer/pkg/config/defaults/defaultconfig.go @@ -1,9 +1,9 @@ package defaults import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/auth-bearer/pkg/config/parser/parse.go b/services/auth-bearer/pkg/config/parser/parse.go index 77e3df436b..6699d0d503 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 92fff0ffc5..931e471707 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/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 e4ebcff3c0..01996a5ea8 100644 --- a/services/auth-bearer/pkg/logging/logging.go +++ b/services/auth-bearer/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/auth-bearer/pkg/revaconfig/config.go b/services/auth-bearer/pkg/revaconfig/config.go index fbea0184ec..9549f8f7b1 100644 --- a/services/auth-bearer/pkg/revaconfig/config.go +++ b/services/auth-bearer/pkg/revaconfig/config.go @@ -2,7 +2,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config" + "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" ) // AuthBearerConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/auth-bearer/pkg/server/debug/option.go b/services/auth-bearer/pkg/server/debug/option.go index 2fde7978b6..92f79b6e15 100644 --- a/services/auth-bearer/pkg/server/debug/option.go +++ b/services/auth-bearer/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/auth-bearer/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/config" ) // Option defines a single option function. diff --git a/services/auth-bearer/pkg/server/debug/server.go b/services/auth-bearer/pkg/server/debug/server.go index 3ce3b8d3c9..54914a8ec6 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/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/services/auth-machine/cmd/auth-machine/main.go b/services/auth-machine/cmd/auth-machine/main.go index f2b0bdc360..c9bf4b6dd8 100644 --- a/services/auth-machine/cmd/auth-machine/main.go +++ b/services/auth-machine/cmd/auth-machine/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/command" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/command" + "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config/defaults" ) func main() { diff --git a/services/auth-machine/pkg/command/health.go b/services/auth-machine/pkg/command/health.go index 2e04d3a5b5..bc67d69cb0 100644 --- a/services/auth-machine/pkg/command/health.go +++ b/services/auth-machine/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/auth-machine/pkg/command/root.go b/services/auth-machine/pkg/command/root.go index 733789b979..b0dc4bb300 100644 --- a/services/auth-machine/pkg/command/root.go +++ b/services/auth-machine/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 21e8e3ccdd..8d3b9e940a 100644 --- a/services/auth-machine/pkg/command/server.go +++ b/services/auth-machine/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/logging" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/revaconfig" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/server/debug" + "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/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" + "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/revaconfig" + "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/server/debug" "github.com/urfave/cli/v2" ) diff --git a/services/auth-machine/pkg/command/version.go b/services/auth-machine/pkg/command/version.go index 6912c33824..cadb60b34b 100644 --- a/services/auth-machine/pkg/command/version.go +++ b/services/auth-machine/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config" + "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/auth-machine/pkg/config/config.go b/services/auth-machine/pkg/config/config.go index 4c1c01b0c8..dc3c07534c 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 3123334d56..1c759103ca 100644 --- a/services/auth-machine/pkg/config/defaults/defaultconfig.go +++ b/services/auth-machine/pkg/config/defaults/defaultconfig.go @@ -1,9 +1,9 @@ package defaults import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/auth-machine/pkg/config/parser/parse.go b/services/auth-machine/pkg/config/parser/parse.go index 1f6b850d9a..da5369b5b2 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 6728fdb791..5e8df881c0 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/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 2b3cffb4e4..176567aaed 100644 --- a/services/auth-machine/pkg/logging/logging.go +++ b/services/auth-machine/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/auth-machine/pkg/revaconfig/config.go b/services/auth-machine/pkg/revaconfig/config.go index 0dc3238296..1a55f9a91b 100644 --- a/services/auth-machine/pkg/revaconfig/config.go +++ b/services/auth-machine/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config" + "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" ) // AuthMachineConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/auth-machine/pkg/server/debug/option.go b/services/auth-machine/pkg/server/debug/option.go index 2208627e31..2e6ba2cf8c 100644 --- a/services/auth-machine/pkg/server/debug/option.go +++ b/services/auth-machine/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/auth-machine/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/config" ) // Option defines a single option function. diff --git a/services/auth-machine/pkg/server/debug/server.go b/services/auth-machine/pkg/server/debug/server.go index 3ce3b8d3c9..54914a8ec6 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/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/services/auth-service/cmd/auth-service/main.go b/services/auth-service/cmd/auth-service/main.go index 70b2c3d7f9..9b7f9689ec 100644 --- a/services/auth-service/cmd/auth-service/main.go +++ b/services/auth-service/cmd/auth-service/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/command" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/auth-service/pkg/command" + "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config/defaults" ) func main() { diff --git a/services/auth-service/pkg/command/health.go b/services/auth-service/pkg/command/health.go index 7470b581db..ea14260af3 100644 --- a/services/auth-service/pkg/command/health.go +++ b/services/auth-service/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/auth-service/pkg/command/root.go b/services/auth-service/pkg/command/root.go index f37d4584c7..305dcce621 100644 --- a/services/auth-service/pkg/command/root.go +++ b/services/auth-service/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 69681fc755..6be512854c 100644 --- a/services/auth-service/pkg/command/server.go +++ b/services/auth-service/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/logging" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/revaconfig" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/server/debug" + "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/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" + "github.com/opencloud-eu/opencloud/services/auth-service/pkg/revaconfig" + "github.com/opencloud-eu/opencloud/services/auth-service/pkg/server/debug" "github.com/urfave/cli/v2" ) diff --git a/services/auth-service/pkg/command/version.go b/services/auth-service/pkg/command/version.go index 8bd660262d..d6438d3a27 100644 --- a/services/auth-service/pkg/command/version.go +++ b/services/auth-service/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config" + "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/auth-service/pkg/config/config.go b/services/auth-service/pkg/config/config.go index d3be2fe265..d01c1d5265 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 3e62156751..2de42059d1 100644 --- a/services/auth-service/pkg/config/defaults/defaultconfig.go +++ b/services/auth-service/pkg/config/defaults/defaultconfig.go @@ -1,9 +1,9 @@ package defaults import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/auth-service/pkg/config/parser/parse.go b/services/auth-service/pkg/config/parser/parse.go index 5eb858c534..59d5405335 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 331fbdf6a9..b3227c78fc 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/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 46345d8d91..fbaea8fe24 100644 --- a/services/auth-service/pkg/logging/logging.go +++ b/services/auth-service/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/auth-service/pkg/revaconfig/config.go b/services/auth-service/pkg/revaconfig/config.go index 4baaff7949..686f5efd42 100644 --- a/services/auth-service/pkg/revaconfig/config.go +++ b/services/auth-service/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config" + "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" ) // AuthMachineConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/auth-service/pkg/server/debug/option.go b/services/auth-service/pkg/server/debug/option.go index b11a774e6d..561b2c0922 100644 --- a/services/auth-service/pkg/server/debug/option.go +++ b/services/auth-service/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/auth-service/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/auth-service/pkg/config" ) // Option defines a single option function. diff --git a/services/auth-service/pkg/server/debug/server.go b/services/auth-service/pkg/server/debug/server.go index 3ce3b8d3c9..54914a8ec6 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/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/services/clientlog/cmd/clientlog/main.go b/services/clientlog/cmd/clientlog/main.go index 9c6595c600..e806917e99 100644 --- a/services/clientlog/cmd/clientlog/main.go +++ b/services/clientlog/cmd/clientlog/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/command" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/command" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/defaults" ) func main() { diff --git a/services/clientlog/pkg/command/health.go b/services/clientlog/pkg/command/health.go index 69e2b10ec2..a120eaf505 100644 --- a/services/clientlog/pkg/command/health.go +++ b/services/clientlog/pkg/command/health.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/clientlog/pkg/command/root.go b/services/clientlog/pkg/command/root.go index ca9b26166b..b9a995907b 100644 --- a/services/clientlog/pkg/command/root.go +++ b/services/clientlog/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 9a7a05cf31..96f46d27c6 100644 --- a/services/clientlog/pkg/command/server.go +++ b/services/clientlog/pkg/command/server.go @@ -10,16 +10,16 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/logging" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/metrics" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/service" + "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/services/clientlog/pkg/config" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/logging" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/service" ) // all events we care about diff --git a/services/clientlog/pkg/command/version.go b/services/clientlog/pkg/command/version.go index 73c8776baa..284b5fa181 100644 --- a/services/clientlog/pkg/command/version.go +++ b/services/clientlog/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/clientlog/pkg/config/config.go b/services/clientlog/pkg/config/config.go index d3f8f61113..aafd310547 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 b0a2951bdc..5eeab2e1f5 100644 --- a/services/clientlog/pkg/config/defaults/defaultconfig.go +++ b/services/clientlog/pkg/config/defaults/defaultconfig.go @@ -1,9 +1,9 @@ package defaults import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" ) // FullDefaultConfig returns the full default config diff --git a/services/clientlog/pkg/config/parser/parse.go b/services/clientlog/pkg/config/parser/parse.go index 16a73bef01..44acdbfdeb 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 f4320a0860..4c00e30ddf 100644 --- a/services/clientlog/pkg/config/tracing.go +++ b/services/clientlog/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 ca7adb4cb4..d9fe1bb834 100644 --- a/services/clientlog/pkg/logging/logging.go +++ b/services/clientlog/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/clientlog/pkg/server/debug/option.go b/services/clientlog/pkg/server/debug/option.go index 1dafbb244f..d9a1dede47 100644 --- a/services/clientlog/pkg/server/debug/option.go +++ b/services/clientlog/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" ) // Option defines a single option function. diff --git a/services/clientlog/pkg/server/debug/server.go b/services/clientlog/pkg/server/debug/server.go index fb423a820b..991586f444 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // Server initializes the debug service and server. diff --git a/services/clientlog/pkg/service/options.go b/services/clientlog/pkg/service/options.go index 26509a3ed0..451dfe7f8f 100644 --- a/services/clientlog/pkg/service/options.go +++ b/services/clientlog/pkg/service/options.go @@ -4,8 +4,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/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 849c78ce8e..5a8daefa5f 100644 --- a/services/clientlog/pkg/service/service.go +++ b/services/clientlog/pkg/service/service.go @@ -20,8 +20,8 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/clientlog/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/clientlog/pkg/config" ) // ClientlogService is the service responsible for user activities diff --git a/services/collaboration/mocks/connector_service.go b/services/collaboration/mocks/connector_service.go index 4285ec1d8d..1ae8e5ea3d 100644 --- a/services/collaboration/mocks/connector_service.go +++ b/services/collaboration/mocks/connector_service.go @@ -3,7 +3,7 @@ package mocks import ( - connector "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector" + connector "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector" mock "github.com/stretchr/testify/mock" ) diff --git a/services/collaboration/mocks/content_connector_service.go b/services/collaboration/mocks/content_connector_service.go index 887c9de10c..0def28071f 100644 --- a/services/collaboration/mocks/content_connector_service.go +++ b/services/collaboration/mocks/content_connector_service.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - connector "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector" + connector "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector" http "net/http" diff --git a/services/collaboration/mocks/file_connector_service.go b/services/collaboration/mocks/file_connector_service.go index b822ed2e22..b1404f2322 100644 --- a/services/collaboration/mocks/file_connector_service.go +++ b/services/collaboration/mocks/file_connector_service.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - connector "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector" + connector "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector" io "io" diff --git a/services/collaboration/pkg/command/health.go b/services/collaboration/pkg/command/health.go index a0fc40bfc7..3dce84d860 100644 --- a/services/collaboration/pkg/command/health.go +++ b/services/collaboration/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/collaboration/pkg/command/root.go b/services/collaboration/pkg/command/root.go index 11035c8007..d79f5f8d65 100644 --- a/services/collaboration/pkg/command/root.go +++ b/services/collaboration/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 51c788bc23..80e17a0bd1 100644 --- a/services/collaboration/pkg/command/server.go +++ b/services/collaboration/pkg/command/server.go @@ -8,17 +8,17 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" "github.com/cs3org/reva/v2/pkg/store" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - registry "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/helpers" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/logging" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/server/grpc" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/server/http" + "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/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/helpers" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/logging" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/server/grpc" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/server/http" "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" ) diff --git a/services/collaboration/pkg/command/version.go b/services/collaboration/pkg/command/version.go index ce31ba5c25..86d810723b 100644 --- a/services/collaboration/pkg/command/version.go +++ b/services/collaboration/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/collaboration/pkg/config/config.go b/services/collaboration/pkg/config/config.go index ecedf4b275..e04a1b8ccb 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/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 8da179805f..3a9200dc47 100644 --- a/services/collaboration/pkg/config/cs3api.go +++ b/services/collaboration/pkg/config/cs3api.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/ocis-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 def74b8627..c8ad824c5c 100644 --- a/services/collaboration/pkg/config/defaults/defaultconfig.go +++ b/services/collaboration/pkg/config/defaults/defaultconfig.go @@ -3,9 +3,9 @@ package defaults import ( "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/collaboration/pkg/config/http.go b/services/collaboration/pkg/config/http.go index 3908a9e839..b2f2ceeea8 100644 --- a/services/collaboration/pkg/config/http.go +++ b/services/collaboration/pkg/config/http.go @@ -1,7 +1,7 @@ package config import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 ee38fc3182..a1e7d15522 100644 --- a/services/collaboration/pkg/config/parser/parse.go +++ b/services/collaboration/pkg/config/parser/parse.go @@ -5,12 +5,12 @@ import ( "fmt" "net/url" - ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - ocisdefaults "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config/defaults" + 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" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config/defaults" ) // ParseConfig loads configuration from known paths. diff --git a/services/collaboration/pkg/connector/contentconnector.go b/services/collaboration/pkg/connector/contentconnector.go index 0332b09bfd..e1f6a80f39 100644 --- a/services/collaboration/pkg/connector/contentconnector.go +++ b/services/collaboration/pkg/connector/contentconnector.go @@ -17,9 +17,9 @@ 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/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware" + "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/middleware" "github.com/rs/zerolog" "go.opentelemetry.io/otel/propagation" ) diff --git a/services/collaboration/pkg/connector/contentconnector_test.go b/services/collaboration/pkg/connector/contentconnector_test.go index dfe99f09a1..09de27dc1c 100644 --- a/services/collaboration/pkg/connector/contentconnector_test.go +++ b/services/collaboration/pkg/connector/contentconnector_test.go @@ -11,7 +11,7 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/services/collaboration/mocks" + "github.com/opencloud-eu/opencloud/services/collaboration/mocks" "github.com/stretchr/testify/mock" appproviderv1beta1 "github.com/cs3org/go-cs3apis/cs3/app/provider/v1beta1" @@ -19,9 +19,9 @@ import ( providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/rgrpc/status" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/middleware" cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" ) diff --git a/services/collaboration/pkg/connector/fileconnector.go b/services/collaboration/pkg/connector/fileconnector.go index 21522e53b5..7fd2dadd52 100644 --- a/services/collaboration/pkg/connector/fileconnector.go +++ b/services/collaboration/pkg/connector/fileconnector.go @@ -27,11 +27,11 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" "github.com/golang/protobuf/proto" "github.com/google/uuid" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector/fileinfo" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/helpers" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/wopisrc" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector/fileinfo" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/helpers" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/middleware" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/wopisrc" "github.com/rs/zerolog" microstore "go-micro.dev/v4/store" ) diff --git a/services/collaboration/pkg/connector/fileconnector_test.go b/services/collaboration/pkg/connector/fileconnector_test.go index 73e68d0a0b..f59f6e586b 100644 --- a/services/collaboration/pkg/connector/fileconnector_test.go +++ b/services/collaboration/pkg/connector/fileconnector_test.go @@ -22,13 +22,13 @@ import ( cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - collabmocks "github.com/owncloud/ocis/v2/services/collaboration/mocks" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector/fileinfo" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware" - "github.com/owncloud/ocis/v2/services/graph/mocks" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector/fileinfo" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/middleware" + "github.com/opencloud-eu/opencloud/services/graph/mocks" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/collaboration/pkg/connector/httpadapter.go b/services/collaboration/pkg/connector/httpadapter.go index 5cb594731e..531eb8188c 100644 --- a/services/collaboration/pkg/connector/httpadapter.go +++ b/services/collaboration/pkg/connector/httpadapter.go @@ -8,9 +8,9 @@ import ( gatewayv1beta1 "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector/utf7" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/locks" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector/utf7" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/locks" "github.com/rs/zerolog" microstore "go-micro.dev/v4/store" ) diff --git a/services/collaboration/pkg/connector/httpadapter_test.go b/services/collaboration/pkg/connector/httpadapter_test.go index 7a5921b8a5..f03dbc9a5b 100644 --- a/services/collaboration/pkg/connector/httpadapter_test.go +++ b/services/collaboration/pkg/connector/httpadapter_test.go @@ -10,9 +10,9 @@ import ( typesv1beta1 "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/services/collaboration/mocks" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector/fileinfo" + "github.com/opencloud-eu/opencloud/services/collaboration/mocks" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector/fileinfo" "github.com/stretchr/testify/mock" ) diff --git a/services/collaboration/pkg/connector/utf7/utf7_test.go b/services/collaboration/pkg/connector/utf7/utf7_test.go index b13a067234..09c81ddca3 100644 --- a/services/collaboration/pkg/connector/utf7/utf7_test.go +++ b/services/collaboration/pkg/connector/utf7/utf7_test.go @@ -3,7 +3,7 @@ package utf7_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector/utf7" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/connector/utf7" ) var _ = Describe("Utf7", func() { diff --git a/services/collaboration/pkg/helpers/discovery.go b/services/collaboration/pkg/helpers/discovery.go index db7b51aee6..1abdd8f941 100644 --- a/services/collaboration/pkg/helpers/discovery.go +++ b/services/collaboration/pkg/helpers/discovery.go @@ -8,8 +8,8 @@ import ( "strings" "github.com/beevik/etree" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 6fb44ffcc8..0c57f01593 100644 --- a/services/collaboration/pkg/helpers/discovery_test.go +++ b/services/collaboration/pkg/helpers/discovery_test.go @@ -7,9 +7,9 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/helpers" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/helpers" ) var _ = Describe("Discovery", func() { diff --git a/services/collaboration/pkg/helpers/registration.go b/services/collaboration/pkg/helpers/registration.go index 33430a5d17..1266bf4a67 100644 --- a/services/collaboration/pkg/helpers/registration.go +++ b/services/collaboration/pkg/helpers/registration.go @@ -10,10 +10,10 @@ import ( "github.com/cs3org/reva/v2/pkg/mime" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" + "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/services/collaboration/pkg/config" ) // RegisterOcisService will register this service. diff --git a/services/collaboration/pkg/logging/logging.go b/services/collaboration/pkg/logging/logging.go index 4bbd15e279..d5dc1352aa 100644 --- a/services/collaboration/pkg/logging/logging.go +++ b/services/collaboration/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/collaboration/pkg/middleware/accesslog.go b/services/collaboration/pkg/middleware/accesslog.go index ea990e4f5a..6ec371d0a6 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" "go.opentelemetry.io/otel/trace" ) diff --git a/services/collaboration/pkg/middleware/proofkeys.go b/services/collaboration/pkg/middleware/proofkeys.go index d3efc1e9b7..efa8ada25a 100644 --- a/services/collaboration/pkg/middleware/proofkeys.go +++ b/services/collaboration/pkg/middleware/proofkeys.go @@ -5,8 +5,8 @@ import ( "net/url" "time" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/proofkeys" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/proofkeys" "github.com/rs/zerolog" ) diff --git a/services/collaboration/pkg/middleware/wopicontext.go b/services/collaboration/pkg/middleware/wopicontext.go index aeb0149c7a..8c1dc680e0 100644 --- a/services/collaboration/pkg/middleware/wopicontext.go +++ b/services/collaboration/pkg/middleware/wopicontext.go @@ -16,8 +16,8 @@ import ( ctxpkg "github.com/cs3org/reva/v2/pkg/ctx" rjwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" "github.com/golang-jwt/jwt/v5" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/helpers" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/helpers" "github.com/rs/zerolog" microstore "go-micro.dev/v4/store" "google.golang.org/grpc/metadata" diff --git a/services/collaboration/pkg/middleware/wopicontext_test.go b/services/collaboration/pkg/middleware/wopicontext_test.go index 0a8c1c661d..b5f783a307 100644 --- a/services/collaboration/pkg/middleware/wopicontext_test.go +++ b/services/collaboration/pkg/middleware/wopicontext_test.go @@ -15,10 +15,10 @@ import ( rjwt "github.com/cs3org/reva/v2/pkg/token/manager/jwt" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/helpers" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/wopisrc" + "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" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/wopisrc" ) var _ = Describe("Wopi Context Middleware", func() { diff --git a/services/collaboration/pkg/server/debug/option.go b/services/collaboration/pkg/server/debug/option.go index 283d90d4a3..1bc6eedd80 100644 --- a/services/collaboration/pkg/server/debug/option.go +++ b/services/collaboration/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" ) // Option defines a single option function. diff --git a/services/collaboration/pkg/server/debug/server.go b/services/collaboration/pkg/server/debug/server.go index ca1b0cc482..7d1f382768 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // 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 4fda3077e4..33ff39589a 100644 --- a/services/collaboration/pkg/server/grpc/option.go +++ b/services/collaboration/pkg/server/grpc/option.go @@ -3,8 +3,8 @@ package grpc import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 db383e6635..4997086577 100644 --- a/services/collaboration/pkg/server/grpc/server.go +++ b/services/collaboration/pkg/server/grpc/server.go @@ -2,8 +2,8 @@ package grpc import ( appproviderv1beta1 "github.com/cs3org/go-cs3apis/cs3/app/provider/v1beta1" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - svc "github.com/owncloud/ocis/v2/services/collaboration/pkg/service/grpc/v0" + "github.com/opencloud-eu/opencloud/ocis-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 11491a2797..73754b629b 100644 --- a/services/collaboration/pkg/server/http/option.go +++ b/services/collaboration/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/connector" + "github.com/opencloud-eu/opencloud/ocis-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" "go.opentelemetry.io/otel/trace" ) diff --git a/services/collaboration/pkg/server/http/server.go b/services/collaboration/pkg/server/http/server.go index 0dec460404..bb0e0fecaf 100644 --- a/services/collaboration/pkg/server/http/server.go +++ b/services/collaboration/pkg/server/http/server.go @@ -6,13 +6,13 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/account" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/service/http" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - colabmiddleware "github.com/owncloud/ocis/v2/services/collaboration/pkg/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" + 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 c2e5e70c87..c87d43f7a3 100644 --- a/services/collaboration/pkg/service/grpc/v0/option.go +++ b/services/collaboration/pkg/service/grpc/v0/option.go @@ -5,8 +5,8 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" microstore "go-micro.dev/v4/store" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" ) // Option defines a single option function. diff --git a/services/collaboration/pkg/service/grpc/v0/service.go b/services/collaboration/pkg/service/grpc/v0/service.go index f1b3ae1b93..f82bd747b0 100644 --- a/services/collaboration/pkg/service/grpc/v0/service.go +++ b/services/collaboration/pkg/service/grpc/v0/service.go @@ -18,11 +18,11 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" microstore "go-micro.dev/v4/store" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/helpers" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/middleware" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/wopisrc" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/wopisrc" ) // NewHandler creates a new grpc service implementing the OpenInApp interface diff --git a/services/collaboration/pkg/service/grpc/v0/service_test.go b/services/collaboration/pkg/service/grpc/v0/service_test.go index 414c45ed8d..d04986feeb 100644 --- a/services/collaboration/pkg/service/grpc/v0/service_test.go +++ b/services/collaboration/pkg/service/grpc/v0/service_test.go @@ -20,10 +20,10 @@ import ( . "github.com/onsi/gomega" "github.com/stretchr/testify/mock" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/collaboration/mocks" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - service "github.com/owncloud/ocis/v2/services/collaboration/pkg/service/grpc/v0" + "github.com/opencloud-eu/opencloud/ocis-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" ) // Based on https://github.com/cs3org/reva/blob/b99ad4865401144a981d4cfd1ae28b5a018ea51d/pkg/token/manager/jwt/jwt.go#L82 diff --git a/services/collaboration/pkg/wopisrc/wopisrc.go b/services/collaboration/pkg/wopisrc/wopisrc.go index 7438aa9f1e..47a38ea6ba 100644 --- a/services/collaboration/pkg/wopisrc/wopisrc.go +++ b/services/collaboration/pkg/wopisrc/wopisrc.go @@ -6,7 +6,7 @@ import ( "path" "github.com/golang-jwt/jwt/v5" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" ) // GenerateWopiSrc generates a WOPI src URL for the given file reference. diff --git a/services/collaboration/pkg/wopisrc/wopisrc_test.go b/services/collaboration/pkg/wopisrc/wopisrc_test.go index 1b4bab0d70..0a893cb643 100644 --- a/services/collaboration/pkg/wopisrc/wopisrc_test.go +++ b/services/collaboration/pkg/wopisrc/wopisrc_test.go @@ -3,8 +3,8 @@ package wopisrc_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/config" - "github.com/owncloud/ocis/v2/services/collaboration/pkg/wopisrc" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/config" + "github.com/opencloud-eu/opencloud/services/collaboration/pkg/wopisrc" ) var _ = Describe("Wopisrc Test", func() { diff --git a/services/eventhistory/cmd/eventhistory/main.go b/services/eventhistory/cmd/eventhistory/main.go index 47eb6483c1..990b2c024e 100644 --- a/services/eventhistory/cmd/eventhistory/main.go +++ b/services/eventhistory/cmd/eventhistory/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/command" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/command" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/defaults" ) func main() { diff --git a/services/eventhistory/pkg/command/health.go b/services/eventhistory/pkg/command/health.go index 2d39a1d513..43b91f2ce2 100644 --- a/services/eventhistory/pkg/command/health.go +++ b/services/eventhistory/pkg/command/health.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/eventhistory/pkg/command/root.go b/services/eventhistory/pkg/command/root.go index a1d27a5636..5d3152189d 100644 --- a/services/eventhistory/pkg/command/root.go +++ b/services/eventhistory/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 1fc33fdb3a..98cf738ddc 100644 --- a/services/eventhistory/pkg/command/server.go +++ b/services/eventhistory/pkg/command/server.go @@ -10,16 +10,16 @@ import ( "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - ogrpc "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/logging" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/metrics" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/server/grpc" + "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/services/eventhistory/pkg/config" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/logging" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/server/grpc" ) // Server is the entrypoint for the server command. diff --git a/services/eventhistory/pkg/command/version.go b/services/eventhistory/pkg/command/version.go index 8962d1a21b..ba492b66cf 100644 --- a/services/eventhistory/pkg/command/version.go +++ b/services/eventhistory/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/eventhistory/pkg/config/config.go b/services/eventhistory/pkg/config/config.go index ded8be6b57..1615931323 100644 --- a/services/eventhistory/pkg/config/config.go +++ b/services/eventhistory/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 1865be43fb..6cea21e836 100644 --- a/services/eventhistory/pkg/config/defaults/defaultconfig.go +++ b/services/eventhistory/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "time" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" ) // FullDefaultConfig returns the full default config diff --git a/services/eventhistory/pkg/config/parser/parse.go b/services/eventhistory/pkg/config/parser/parse.go index e21eae15f4..42b77aa8da 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 e8b6c038c7..3adedba5ff 100644 --- a/services/eventhistory/pkg/config/tracing.go +++ b/services/eventhistory/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 07c704fb07..dea1fa04df 100644 --- a/services/eventhistory/pkg/logging/logging.go +++ b/services/eventhistory/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/eventhistory/pkg/server/debug/option.go b/services/eventhistory/pkg/server/debug/option.go index a3966b315d..22e81d3302 100644 --- a/services/eventhistory/pkg/server/debug/option.go +++ b/services/eventhistory/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/config" ) // Option defines a single option function. diff --git a/services/eventhistory/pkg/server/debug/server.go b/services/eventhistory/pkg/server/debug/server.go index 24f2e67915..ec4670a908 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // 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 0519117ee3..67f17fe753 100644 --- a/services/eventhistory/pkg/server/grpc/option.go +++ b/services/eventhistory/pkg/server/grpc/option.go @@ -4,9 +4,9 @@ import ( "context" "github.com/cs3org/reva/v2/pkg/events" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/metrics" + "github.com/opencloud-eu/opencloud/ocis-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" "go.opentelemetry.io/otel/trace" ) diff --git a/services/eventhistory/pkg/server/grpc/server.go b/services/eventhistory/pkg/server/grpc/server.go index 58bda2de20..fbf816ad1f 100644 --- a/services/eventhistory/pkg/server/grpc/server.go +++ b/services/eventhistory/pkg/server/grpc/server.go @@ -1,10 +1,10 @@ package grpc import ( - "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - svc "github.com/owncloud/ocis/v2/services/eventhistory/pkg/service" + "github.com/opencloud-eu/opencloud/ocis-pkg/service/grpc" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" + ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" + svc "github.com/opencloud-eu/opencloud/services/eventhistory/pkg/service" ) // NewService initializes the grpc service and server. diff --git a/services/eventhistory/pkg/service/service.go b/services/eventhistory/pkg/service/service.go index ba2a492986..59ff6bb1c9 100644 --- a/services/eventhistory/pkg/service/service.go +++ b/services/eventhistory/pkg/service/service.go @@ -8,10 +8,10 @@ import ( "regexp" "github.com/cs3org/reva/v2/pkg/events" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - ehmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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" "go-micro.dev/v4/store" ) diff --git a/services/eventhistory/pkg/service/service_test.go b/services/eventhistory/pkg/service/service_test.go index 84dc58a465..6965aab07a 100644 --- a/services/eventhistory/pkg/service/service_test.go +++ b/services/eventhistory/pkg/service/service_test.go @@ -14,10 +14,10 @@ import ( "github.com/google/uuid" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/config" - "github.com/owncloud/ocis/v2/services/eventhistory/pkg/service" + "github.com/opencloud-eu/opencloud/ocis-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" microevents "go-micro.dev/v4/events" microstore "go-micro.dev/v4/store" ) diff --git a/services/frontend/cmd/frontend/main.go b/services/frontend/cmd/frontend/main.go index a3e887680f..4d5273e793 100644 --- a/services/frontend/cmd/frontend/main.go +++ b/services/frontend/cmd/frontend/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/frontend/pkg/command" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/command" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/config/defaults" ) func main() { diff --git a/services/frontend/pkg/command/events.go b/services/frontend/pkg/command/events.go index 8875d73efc..f0e1fac152 100644 --- a/services/frontend/pkg/command/events.go +++ b/services/frontend/pkg/command/events.go @@ -18,14 +18,14 @@ import ( "go-micro.dev/v4/metadata" "google.golang.org/protobuf/types/known/fieldmaskpb" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config" - "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "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" + 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" ) var _registeredEvents = []events.Unmarshaller{ diff --git a/services/frontend/pkg/command/health.go b/services/frontend/pkg/command/health.go index 5f39b3bd30..77b8c11487 100644 --- a/services/frontend/pkg/command/health.go +++ b/services/frontend/pkg/command/health.go @@ -7,10 +7,10 @@ import ( "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/frontend/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" ) // Health is the entrypoint for the health command. diff --git a/services/frontend/pkg/command/root.go b/services/frontend/pkg/command/root.go index 0e906f15ea..1f38bd393f 100644 --- a/services/frontend/pkg/command/root.go +++ b/services/frontend/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 263cb0a567..6229b81636 100644 --- a/services/frontend/pkg/command/server.go +++ b/services/frontend/pkg/command/server.go @@ -11,15 +11,15 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/frontend/pkg/logging" - "github.com/owncloud/ocis/v2/services/frontend/pkg/revaconfig" - "github.com/owncloud/ocis/v2/services/frontend/pkg/server/debug" + "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/services/frontend/pkg/config" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/logging" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/revaconfig" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/server/debug" ) // Server is the entry point for the server command. diff --git a/services/frontend/pkg/command/version.go b/services/frontend/pkg/command/version.go index 348b33d6ab..65df1c5680 100644 --- a/services/frontend/pkg/command/version.go +++ b/services/frontend/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/frontend/pkg/config/config.go b/services/frontend/pkg/config/config.go index b4e3c721f2..abafe4eeee 100644 --- a/services/frontend/pkg/config/config.go +++ b/services/frontend/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" ) type Config struct { diff --git a/services/frontend/pkg/config/defaults/defaultconfig.go b/services/frontend/pkg/config/defaults/defaultconfig.go index 47523b5160..7f056d6fd3 100644 --- a/services/frontend/pkg/config/defaults/defaultconfig.go +++ b/services/frontend/pkg/config/defaults/defaultconfig.go @@ -3,9 +3,9 @@ package defaults import ( "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/frontend/pkg/config/parser/parse.go b/services/frontend/pkg/config/parser/parse.go index baca0098cf..f90a9200fa 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config/defaults" + 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" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 7e908e34d6..d4f412dcb9 100644 --- a/services/frontend/pkg/config/tracing.go +++ b/services/frontend/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 ae1c806d18..081cea2632 100644 --- a/services/frontend/pkg/logging/logging.go +++ b/services/frontend/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/frontend/pkg/revaconfig/config.go b/services/frontend/pkg/revaconfig/config.go index 3cd7ad87ad..93662ff111 100644 --- a/services/frontend/pkg/revaconfig/config.go +++ b/services/frontend/pkg/revaconfig/config.go @@ -10,11 +10,11 @@ import ( "slices" "strconv" - "github.com/owncloud/ocis/v2/ocis-pkg/capabilities" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config" + "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/services/frontend/pkg/config" ) // FrontendConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/frontend/pkg/server/debug/option.go b/services/frontend/pkg/server/debug/option.go index 913fe9a70b..62ad7cee27 100644 --- a/services/frontend/pkg/server/debug/option.go +++ b/services/frontend/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/frontend/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/frontend/pkg/config" ) // Option defines a single option function. diff --git a/services/frontend/pkg/server/debug/server.go b/services/frontend/pkg/server/debug/server.go index e7a3edba5a..835273dfcc 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // Server initializes the debug service and server. diff --git a/services/gateway/cmd/gateway/main.go b/services/gateway/cmd/gateway/main.go index 766b15bcf9..f9392d3b21 100644 --- a/services/gateway/cmd/gateway/main.go +++ b/services/gateway/cmd/gateway/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/gateway/pkg/command" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/command" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/config/defaults" ) func main() { diff --git a/services/gateway/pkg/command/health.go b/services/gateway/pkg/command/health.go index e2b5231ce9..70cb2eefa7 100644 --- a/services/gateway/pkg/command/health.go +++ b/services/gateway/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/gateway/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/gateway/pkg/command/root.go b/services/gateway/pkg/command/root.go index 940a43259c..8070b9b55d 100644 --- a/services/gateway/pkg/command/root.go +++ b/services/gateway/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 44e1bfa709..bc84eef83a 100644 --- a/services/gateway/pkg/command/server.go +++ b/services/gateway/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/gateway/pkg/logging" - "github.com/owncloud/ocis/v2/services/gateway/pkg/revaconfig" - "github.com/owncloud/ocis/v2/services/gateway/pkg/server/debug" + "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/services/gateway/pkg/config" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/logging" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/revaconfig" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/server/debug" "github.com/urfave/cli/v2" ) diff --git a/services/gateway/pkg/command/version.go b/services/gateway/pkg/command/version.go index 52768b243e..e234d57675 100644 --- a/services/gateway/pkg/command/version.go +++ b/services/gateway/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/gateway/pkg/config/config.go b/services/gateway/pkg/config/config.go index 53699fccce..f539cb2c55 100644 --- a/services/gateway/pkg/config/config.go +++ b/services/gateway/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" ) type Config struct { diff --git a/services/gateway/pkg/config/defaults/defaultconfig.go b/services/gateway/pkg/config/defaults/defaultconfig.go index 5d003bb379..c2e039b0c4 100644 --- a/services/gateway/pkg/config/defaults/defaultconfig.go +++ b/services/gateway/pkg/config/defaults/defaultconfig.go @@ -3,9 +3,9 @@ package defaults import ( "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/gateway/pkg/config/parser/parse.go b/services/gateway/pkg/config/parser/parse.go index f86f8f4c61..9ef434f256 100644 --- a/services/gateway/pkg/config/parser/parse.go +++ b/services/gateway/pkg/config/parser/parse.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - defaults2 "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config/defaults" + 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" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/config/defaults" ) // ParseConfig loads configuration from known paths. diff --git a/services/gateway/pkg/config/tracing.go b/services/gateway/pkg/config/tracing.go index 31346b0f83..2caf008b03 100644 --- a/services/gateway/pkg/config/tracing.go +++ b/services/gateway/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 2f6971e59a..5fe717e63b 100644 --- a/services/gateway/pkg/logging/logging.go +++ b/services/gateway/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/gateway/pkg/revaconfig/config.go b/services/gateway/pkg/revaconfig/config.go index 73d36b0116..e6ae1eb2b6 100644 --- a/services/gateway/pkg/revaconfig/config.go +++ b/services/gateway/pkg/revaconfig/config.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/cs3org/reva/v2/pkg/utils" - pkgconfig "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config" + pkgconfig "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" ) // GatewayConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/gateway/pkg/server/debug/option.go b/services/gateway/pkg/server/debug/option.go index 4ff6334a9b..1297ef2441 100644 --- a/services/gateway/pkg/server/debug/option.go +++ b/services/gateway/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/gateway/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/gateway/pkg/config" ) // Option defines a single option function. diff --git a/services/gateway/pkg/server/debug/server.go b/services/gateway/pkg/server/debug/server.go index 15985427f1..d91770cc4f 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // Server initializes the debug service and server. diff --git a/services/graph/cmd/graph/main.go b/services/graph/cmd/graph/main.go index b0d9189e0a..799a689921 100644 --- a/services/graph/cmd/graph/main.go +++ b/services/graph/cmd/graph/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/graph/pkg/command" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/graph/pkg/command" + "github.com/opencloud-eu/opencloud/services/graph/pkg/config/defaults" ) func main() { diff --git a/services/graph/mocks/drives_drive_item_provider.go b/services/graph/mocks/drives_drive_item_provider.go index 9d5093bc30..0d9f124824 100644 --- a/services/graph/mocks/drives_drive_item_provider.go +++ b/services/graph/mocks/drives_drive_item_provider.go @@ -13,7 +13,7 @@ import ( providerv1beta1 "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - svc "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + svc "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" ) // DrivesDriveItemProvider is an autogenerated mock type for the DrivesDriveItemProvider type diff --git a/services/graph/mocks/permissions.go b/services/graph/mocks/permissions.go index f2cd34c891..fb594ff3d5 100644 --- a/services/graph/mocks/permissions.go +++ b/services/graph/mocks/permissions.go @@ -9,7 +9,7 @@ import ( mock "github.com/stretchr/testify/mock" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" ) // Permissions is an autogenerated mock type for the Permissions type diff --git a/services/graph/mocks/role_service.go b/services/graph/mocks/role_service.go index b571e06869..1cb877596e 100644 --- a/services/graph/mocks/role_service.go +++ b/services/graph/mocks/role_service.go @@ -11,7 +11,7 @@ import ( mock "github.com/stretchr/testify/mock" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + v0 "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" ) // RoleService is an autogenerated mock type for the RoleService type diff --git a/services/graph/pkg/command/health.go b/services/graph/pkg/command/health.go index b3cf03e9be..b760538d60 100644 --- a/services/graph/pkg/command/health.go +++ b/services/graph/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/graph/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/graph/pkg/command/root.go b/services/graph/pkg/command/root.go index 537adb2499..709b01637d 100644 --- a/services/graph/pkg/command/root.go +++ b/services/graph/pkg/command/root.go @@ -3,11 +3,11 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" + "github.com/opencloud-eu/opencloud/services/graph/pkg/config" ) // GetCommands provides all commands for this service diff --git a/services/graph/pkg/command/server.go b/services/graph/pkg/command/server.go index c8820d4efd..ab784ab644 100644 --- a/services/graph/pkg/command/server.go +++ b/services/graph/pkg/command/server.go @@ -5,15 +5,15 @@ import ( "fmt" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/graph/pkg/logging" - "github.com/owncloud/ocis/v2/services/graph/pkg/metrics" - "github.com/owncloud/ocis/v2/services/graph/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/graph/pkg/server/http" + "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/services/graph/pkg/config" + "github.com/opencloud-eu/opencloud/services/graph/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/graph/pkg/logging" + "github.com/opencloud-eu/opencloud/services/graph/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/graph/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/graph/pkg/server/http" "github.com/urfave/cli/v2" ) diff --git a/services/graph/pkg/command/unified_roles.go b/services/graph/pkg/command/unified_roles.go index ee31e5cb7f..ae2902bff8 100644 --- a/services/graph/pkg/command/unified_roles.go +++ b/services/graph/pkg/command/unified_roles.go @@ -8,10 +8,10 @@ import ( "github.com/olekukonko/tablewriter" "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/ocis-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" ) var ( diff --git a/services/graph/pkg/command/version.go b/services/graph/pkg/command/version.go index fd95546f0f..3afe916098 100644 --- a/services/graph/pkg/command/version.go +++ b/services/graph/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" + "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/graph/pkg/config/config.go b/services/graph/pkg/config/config.go index 497f5ab053..0b127950cf 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 023dc1a65e..5bd8edaac5 100644 --- a/services/graph/pkg/config/defaults/defaultconfig.go +++ b/services/graph/pkg/config/defaults/defaultconfig.go @@ -5,11 +5,11 @@ import ( "strings" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "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/services/graph/pkg/config" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) var ( diff --git a/services/graph/pkg/config/http.go b/services/graph/pkg/config/http.go index ccc0ad53d3..f74c665957 100644 --- a/services/graph/pkg/config/http.go +++ b/services/graph/pkg/config/http.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/ocis-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 3bcd06f4f7..d0fb1930bc 100644 --- a/services/graph/pkg/config/parser/parse.go +++ b/services/graph/pkg/config/parser/parse.go @@ -6,13 +6,13 @@ import ( "github.com/go-ldap/ldap/v3" - ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - defaults2 "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + 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" + "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" ) // ParseConfig loads configuration from known paths. diff --git a/services/graph/pkg/config/tracing.go b/services/graph/pkg/config/tracing.go index 657430fca6..0c3f2d7c50 100644 --- a/services/graph/pkg/config/tracing.go +++ b/services/graph/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/graph/pkg/errorcode/cs3_test.go b/services/graph/pkg/errorcode/cs3_test.go index 45ec797c87..0649e92ce4 100644 --- a/services/graph/pkg/errorcode/cs3_test.go +++ b/services/graph/pkg/errorcode/cs3_test.go @@ -8,7 +8,7 @@ import ( cs3rpc "github.com/cs3org/go-cs3apis/cs3/rpc/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) func TestFromCS3Status(t *testing.T) { diff --git a/services/graph/pkg/errorcode/errorcode_test.go b/services/graph/pkg/errorcode/errorcode_test.go index 003bdfc8f9..650105b2a5 100644 --- a/services/graph/pkg/errorcode/errorcode_test.go +++ b/services/graph/pkg/errorcode/errorcode_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) type customErr struct{} diff --git a/services/graph/pkg/identity/backend.go b/services/graph/pkg/identity/backend.go index 976f97d5ce..9a194ad5d7 100644 --- a/services/graph/pkg/identity/backend.go +++ b/services/graph/pkg/identity/backend.go @@ -9,7 +9,7 @@ import ( cs3group "github.com/cs3org/go-cs3apis/cs3/identity/group/v1beta1" cs3user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) // Errors used by the interfaces diff --git a/services/graph/pkg/identity/cache.go b/services/graph/pkg/identity/cache.go index 4a653b199d..70639e2e4d 100644 --- a/services/graph/pkg/identity/cache.go +++ b/services/graph/pkg/identity/cache.go @@ -12,7 +12,7 @@ import ( revautils "github.com/cs3org/reva/v2/pkg/utils" "github.com/jellydator/ttlcache/v3" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) // IdentityCache implements a simple ttl based cache for looking up users and groups by ID diff --git a/services/graph/pkg/identity/cs3.go b/services/graph/pkg/identity/cs3.go index e188b4adaa..5a98592572 100644 --- a/services/graph/pkg/identity/cs3.go +++ b/services/graph/pkg/identity/cs3.go @@ -12,9 +12,9 @@ import ( 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/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) var ( diff --git a/services/graph/pkg/identity/ldap.go b/services/graph/pkg/identity/ldap.go index 199fc5f28b..d40e6bab82 100644 --- a/services/graph/pkg/identity/ldap.go +++ b/services/graph/pkg/identity/ldap.go @@ -16,9 +16,9 @@ import ( "github.com/libregraph/idm/pkg/ldapdn" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/graph/pkg/config" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) const ( diff --git a/services/graph/pkg/identity/ldap/reconnect.go b/services/graph/pkg/identity/ldap/reconnect.go index d33fc13d7a..9c2cc06911 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) var ( diff --git a/services/graph/pkg/identity/ldap_education_class.go b/services/graph/pkg/identity/ldap_education_class.go index 88ade7912d..c5c0169d61 100644 --- a/services/graph/pkg/identity/ldap_education_class.go +++ b/services/graph/pkg/identity/ldap_education_class.go @@ -8,7 +8,7 @@ import ( "github.com/go-ldap/ldap/v3" "github.com/libregraph/idm/pkg/ldapdn" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) type educationClassAttributeMap struct { diff --git a/services/graph/pkg/identity/ldap_education_class_test.go b/services/graph/pkg/identity/ldap_education_class_test.go index b57dccc739..5469f544be 100644 --- a/services/graph/pkg/identity/ldap_education_class_test.go +++ b/services/graph/pkg/identity/ldap_education_class_test.go @@ -7,7 +7,7 @@ import ( "github.com/go-ldap/ldap/v3" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" + "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/services/graph/pkg/identity/ldap_education_school.go b/services/graph/pkg/identity/ldap_education_school.go index fe0ef5d13a..ff0c361b8b 100644 --- a/services/graph/pkg/identity/ldap_education_school.go +++ b/services/graph/pkg/identity/ldap_education_school.go @@ -9,9 +9,9 @@ import ( "github.com/go-ldap/ldap/v3" "github.com/gofrs/uuid" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/graph/pkg/config" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) type educationConfig struct { diff --git a/services/graph/pkg/identity/ldap_education_school_test.go b/services/graph/pkg/identity/ldap_education_school_test.go index 7ee07bc85b..2fe34d1651 100644 --- a/services/graph/pkg/identity/ldap_education_school_test.go +++ b/services/graph/pkg/identity/ldap_education_school_test.go @@ -8,9 +8,9 @@ import ( "github.com/go-ldap/ldap/v3" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" + "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/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/services/graph/pkg/identity/ldap_education_user.go b/services/graph/pkg/identity/ldap_education_user.go index 5da5d9b3b2..f48b9ae8c0 100644 --- a/services/graph/pkg/identity/ldap_education_user.go +++ b/services/graph/pkg/identity/ldap_education_user.go @@ -7,7 +7,7 @@ import ( "github.com/go-ldap/ldap/v3" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) type educationUserAttributeMap struct { diff --git a/services/graph/pkg/identity/ldap_education_user_test.go b/services/graph/pkg/identity/ldap_education_user_test.go index a84a1df28b..b2cf112228 100644 --- a/services/graph/pkg/identity/ldap_education_user_test.go +++ b/services/graph/pkg/identity/ldap_education_user_test.go @@ -6,7 +6,7 @@ import ( "github.com/go-ldap/ldap/v3" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" + "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/services/graph/pkg/identity/ldap_group.go b/services/graph/pkg/identity/ldap_group.go index ff7d74c338..0322e6f87e 100644 --- a/services/graph/pkg/identity/ldap_group.go +++ b/services/graph/pkg/identity/ldap_group.go @@ -14,7 +14,7 @@ import ( "github.com/libregraph/idm/pkg/ldapdn" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) type groupAttributeMap struct { diff --git a/services/graph/pkg/identity/ldap_group_test.go b/services/graph/pkg/identity/ldap_group_test.go index a7efaf9558..2fb7b62734 100644 --- a/services/graph/pkg/identity/ldap_group_test.go +++ b/services/graph/pkg/identity/ldap_group_test.go @@ -8,7 +8,7 @@ import ( "github.com/CiscoM31/godata" "github.com/go-ldap/ldap/v3" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" + "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/services/graph/pkg/identity/ldap_test.go b/services/graph/pkg/identity/ldap_test.go index f9465c0f60..97c36f206c 100644 --- a/services/graph/pkg/identity/ldap_test.go +++ b/services/graph/pkg/identity/ldap_test.go @@ -10,9 +10,9 @@ import ( "github.com/CiscoM31/godata" "github.com/go-ldap/ldap/v3" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/graph/pkg/config" + "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" "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 c30e2177c5..f2f4d38a4e 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/owncloud/ocis/v2/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" ) var ( diff --git a/services/graph/pkg/linktype/linktype.go b/services/graph/pkg/linktype/linktype.go index e049701d23..71efea7468 100644 --- a/services/graph/pkg/linktype/linktype.go +++ b/services/graph/pkg/linktype/linktype.go @@ -8,7 +8,7 @@ import ( "github.com/cs3org/reva/v2/pkg/storage/utils/grants" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) // NoPermissionMatchError is the message returned by a failed conversion diff --git a/services/graph/pkg/linktype/linktype_test.go b/services/graph/pkg/linktype/linktype_test.go index b21eb8ce1b..4b06357d64 100644 --- a/services/graph/pkg/linktype/linktype_test.go +++ b/services/graph/pkg/linktype/linktype_test.go @@ -7,7 +7,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/linktype" + "github.com/opencloud-eu/opencloud/services/graph/pkg/linktype" ) var _ = Describe("LinktypeFromPermission", func() { diff --git a/services/graph/pkg/logging/logging.go b/services/graph/pkg/logging/logging.go index 90602d4173..10a1707d9d 100644 --- a/services/graph/pkg/logging/logging.go +++ b/services/graph/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/graph/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/graph/pkg/middleware/auth.go b/services/graph/pkg/middleware/auth.go index 0c7fee4ee9..0e50a47542 100644 --- a/services/graph/pkg/middleware/auth.go +++ b/services/graph/pkg/middleware/auth.go @@ -10,10 +10,10 @@ 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/owncloud/ocis/v2/ocis-pkg/account" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - opkgm "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "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/services/graph/pkg/errorcode" ) // authOptions initializes the available default options. diff --git a/services/graph/pkg/middleware/requireadmin.go b/services/graph/pkg/middleware/requireadmin.go index 6b9d639ea2..8299644de5 100644 --- a/services/graph/pkg/middleware/requireadmin.go +++ b/services/graph/pkg/middleware/requireadmin.go @@ -4,10 +4,10 @@ import ( "net/http" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/roles" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - settings "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/roles" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" + settings "github.com/opencloud-eu/opencloud/services/settings/pkg/service/v0" ) // RequireAdmin middleware is used to require the user in context to be an admin / have account management permissions diff --git a/services/graph/pkg/middleware/token.go b/services/graph/pkg/middleware/token.go index 2765961806..e22de0978f 100644 --- a/services/graph/pkg/middleware/token.go +++ b/services/graph/pkg/middleware/token.go @@ -5,7 +5,7 @@ import ( "crypto/subtle" "net/http" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) var ( diff --git a/services/graph/pkg/server/debug/option.go b/services/graph/pkg/server/debug/option.go index a4b779eb2b..1795ffd520 100644 --- a/services/graph/pkg/server/debug/option.go +++ b/services/graph/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/graph/pkg/config" ) // Option defines a single option function. diff --git a/services/graph/pkg/server/debug/server.go b/services/graph/pkg/server/debug/server.go index be4b6ddf28..f4d6de2df3 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // 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 53a4b184e3..d1572c5469 100644 --- a/services/graph/pkg/server/http/option.go +++ b/services/graph/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/metrics" + "github.com/opencloud-eu/opencloud/ocis-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" "go.opentelemetry.io/otel/trace" ) diff --git a/services/graph/pkg/server/http/server.go b/services/graph/pkg/server/http/server.go index 0600705691..de91d0cd1a 100644 --- a/services/graph/pkg/server/http/server.go +++ b/services/graph/pkg/server/http/server.go @@ -12,19 +12,19 @@ import ( "go-micro.dev/v4" "go-micro.dev/v4/events" - "github.com/owncloud/ocis/v2/ocis-pkg/account" - "github.com/owncloud/ocis/v2/ocis-pkg/cors" - "github.com/owncloud/ocis/v2/ocis-pkg/keycloak" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/service/http" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - graphMiddleware "github.com/owncloud/ocis/v2/services/graph/pkg/middleware" - svc "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "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" + 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" + graphMiddleware "github.com/opencloud-eu/opencloud/services/graph/pkg/middleware" + svc "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" ) // Server initializes the http service and server. diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions.go b/services/graph/pkg/service/v0/api_driveitem_permissions.go index 9cb643cb32..e3954621c2 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions.go @@ -27,16 +27,16 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/ocis-pkg/l10n" - l10n_pkg "github.com/owncloud/ocis/v2/services/graph/pkg/l10n" + "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + l10n_pkg "github.com/opencloud-eu/opencloud/services/graph/pkg/l10n" - "github.com/owncloud/ocis/v2/ocis-pkg/conversions" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" - "github.com/owncloud/ocis/v2/services/graph/pkg/validate" + "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/services/graph/pkg/validate" ) const ( diff --git a/services/graph/pkg/service/v0/api_driveitem_permissions_links.go b/services/graph/pkg/service/v0/api_driveitem_permissions_links.go index 1a66adf399..73dadfb655 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions_links.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions_links.go @@ -16,8 +16,8 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/linktype" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/linktype" ) func (s DriveItemPermissionsService) CreateLink(ctx context.Context, driveItemID *storageprovider.ResourceId, createLink libregraph.DriveItemCreateLink) (libregraph.Permission, error) { 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 f9e5e420d6..c4af159657 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 @@ -16,13 +16,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" - "github.com/owncloud/ocis/v2/services/graph/pkg/linktype" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-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" "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 2761a23a5b..911800496d 100644 --- a/services/graph/pkg/service/v0/api_driveitem_permissions_test.go +++ b/services/graph/pkg/service/v0/api_driveitem_permissions_test.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" + "github.com/opencloud-eu/opencloud/services/graph/pkg/config" "github.com/stretchr/testify/mock" "github.com/tidwall/gjson" "google.golang.org/grpc" @@ -33,14 +33,14 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" - "github.com/owncloud/ocis/v2/services/graph/pkg/linktype" - svc "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/ocis-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" + svc "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) var _ = Describe("DriveItemPermissionsService", func() { 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 4c7d209a28..9ff30c142d 100644 --- a/services/graph/pkg/service/v0/api_drives_drive_item.go +++ b/services/graph/pkg/service/v0/api_drives_drive_item.go @@ -18,8 +18,8 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) const ( diff --git a/services/graph/pkg/service/v0/api_drives_drive_item_ocm.go b/services/graph/pkg/service/v0/api_drives_drive_item_ocm.go index 2b3751fbd8..59ffd95fb9 100644 --- a/services/graph/pkg/service/v0/api_drives_drive_item_ocm.go +++ b/services/graph/pkg/service/v0/api_drives_drive_item_ocm.go @@ -8,7 +8,7 @@ import ( storageprovider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" "google.golang.org/protobuf/types/known/fieldmaskpb" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) var ( 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 7cdc245fb3..990ec49e1e 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,11 +23,11 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/status" cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" - "github.com/owncloud/ocis/v2/ocis-pkg/conversions" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - svc "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" + "github.com/opencloud-eu/opencloud/ocis-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" ) var _ = Describe("DrivesDriveItemService", func() { diff --git a/services/graph/pkg/service/v0/application.go b/services/graph/pkg/service/v0/application.go index 0c9cb0dae4..fb8d27dc21 100644 --- a/services/graph/pkg/service/v0/application.go +++ b/services/graph/pkg/service/v0/application.go @@ -7,8 +7,8 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) // ListApplications implements the Service interface. diff --git a/services/graph/pkg/service/v0/application_test.go b/services/graph/pkg/service/v0/application_test.go index 38dc96dd3c..d4e36f156c 100644 --- a/services/graph/pkg/service/v0/application_test.go +++ b/services/graph/pkg/service/v0/application_test.go @@ -14,14 +14,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settings "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-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" + "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" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/approleassignments.go b/services/graph/pkg/service/v0/approleassignments.go index ce70a8b133..34e2eb57d2 100644 --- a/services/graph/pkg/service/v0/approleassignments.go +++ b/services/graph/pkg/service/v0/approleassignments.go @@ -10,9 +10,9 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + 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/graph/pkg/errorcode" merrors "go-micro.dev/v4/errors" ) diff --git a/services/graph/pkg/service/v0/approleassignments_test.go b/services/graph/pkg/service/v0/approleassignments_test.go index e27a5b84b6..49124ba969 100644 --- a/services/graph/pkg/service/v0/approleassignments_test.go +++ b/services/graph/pkg/service/v0/approleassignments_test.go @@ -18,14 +18,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settings "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-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" + "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" "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 10b8488113..ef2bae9b03 100644 --- a/services/graph/pkg/service/v0/base.go +++ b/services/graph/pkg/service/v0/base.go @@ -25,12 +25,12 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" - "github.com/owncloud/ocis/v2/services/graph/pkg/linktype" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/graph/pkg/linktype" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) // BaseGraphProvider is the interface that wraps shared methods between the different graph providers diff --git a/services/graph/pkg/service/v0/driveitems.go b/services/graph/pkg/service/v0/driveitems.go index 1fcda72e4e..f19812f27e 100644 --- a/services/graph/pkg/service/v0/driveitems.go +++ b/services/graph/pkg/service/v0/driveitems.go @@ -28,8 +28,8 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) // CreateUploadSession create an upload session to allow your app to upload files up to the maximum file size. diff --git a/services/graph/pkg/service/v0/driveitems_test.go b/services/graph/pkg/service/v0/driveitems_test.go index 36579c6837..72e76765a1 100644 --- a/services/graph/pkg/service/v0/driveitems_test.go +++ b/services/graph/pkg/service/v0/driveitems_test.go @@ -25,12 +25,12 @@ import ( "github.com/cs3org/reva/v2/pkg/utils" cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-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" + identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" + service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" ) type itemsList struct { diff --git a/services/graph/pkg/service/v0/drives.go b/services/graph/pkg/service/v0/drives.go index d2e324018f..2038459d35 100644 --- a/services/graph/pkg/service/v0/drives.go +++ b/services/graph/pkg/service/v0/drives.go @@ -28,11 +28,11 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/protobuf/proto" - "github.com/owncloud/ocis/v2/ocis-pkg/l10n" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - settingsServiceExt "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/opencloud-eu/opencloud/ocis-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" + settingsServiceExt "github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults" ) const ( diff --git a/services/graph/pkg/service/v0/educationclasses.go b/services/graph/pkg/service/v0/educationclasses.go index 061b2638a6..ae85181622 100644 --- a/services/graph/pkg/service/v0/educationclasses.go +++ b/services/graph/pkg/service/v0/educationclasses.go @@ -11,7 +11,7 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/events" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" "github.com/go-chi/chi/v5" "github.com/go-chi/render" diff --git a/services/graph/pkg/service/v0/educationclasses_test.go b/services/graph/pkg/service/v0/educationclasses_test.go index 732db58d6d..fba69ab06a 100644 --- a/services/graph/pkg/service/v0/educationclasses_test.go +++ b/services/graph/pkg/service/v0/educationclasses_test.go @@ -18,13 +18,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/educationschools.go b/services/graph/pkg/service/v0/educationschools.go index dce131fdde..320eb86f4c 100644 --- a/services/graph/pkg/service/v0/educationschools.go +++ b/services/graph/pkg/service/v0/educationschools.go @@ -11,8 +11,8 @@ import ( "github.com/CiscoM31/godata" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/identity" "github.com/go-chi/chi/v5" "github.com/go-chi/render" diff --git a/services/graph/pkg/service/v0/educationschools_test.go b/services/graph/pkg/service/v0/educationschools_test.go index 3b291bcb70..c3efe195d5 100644 --- a/services/graph/pkg/service/v0/educationschools_test.go +++ b/services/graph/pkg/service/v0/educationschools_test.go @@ -22,12 +22,12 @@ import ( "google.golang.org/grpc" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-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" ) type schoolList struct { diff --git a/services/graph/pkg/service/v0/educationuser.go b/services/graph/pkg/service/v0/educationuser.go index 629eead6e3..095d63e055 100644 --- a/services/graph/pkg/service/v0/educationuser.go +++ b/services/graph/pkg/service/v0/educationuser.go @@ -16,7 +16,7 @@ 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/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) // GetEducationUsers implements the Service interface. diff --git a/services/graph/pkg/service/v0/educationuser_test.go b/services/graph/pkg/service/v0/educationuser_test.go index 640f94e055..a87096597f 100644 --- a/services/graph/pkg/service/v0/educationuser_test.go +++ b/services/graph/pkg/service/v0/educationuser_test.go @@ -20,13 +20,13 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-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" "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 e8a6bc24c5..23c28bc942 100644 --- a/services/graph/pkg/service/v0/graph.go +++ b/services/graph/pkg/service/v0/graph.go @@ -19,12 +19,12 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/storagespace" - "github.com/owncloud/ocis/v2/ocis-pkg/keycloak" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/identity" ) // Permissions is the interface used to access the permissions service diff --git a/services/graph/pkg/service/v0/graph_suite_test.go b/services/graph/pkg/service/v0/graph_suite_test.go index 70dfcce145..b85850a41f 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/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-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 5087de6d84..75d754d8af 100644 --- a/services/graph/pkg/service/v0/graph_test.go +++ b/services/graph/pkg/service/v0/graph_test.go @@ -29,15 +29,15 @@ import ( "github.com/tidwall/gjson" "google.golang.org/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/ocis-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" + "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" + service "github.com/opencloud-eu/opencloud/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) var _ = Describe("Graph", func() { diff --git a/services/graph/pkg/service/v0/groups.go b/services/graph/pkg/service/v0/groups.go index 8f6f707a55..c209f8dbf4 100644 --- a/services/graph/pkg/service/v0/groups.go +++ b/services/graph/pkg/service/v0/groups.go @@ -10,7 +10,7 @@ import ( "github.com/CiscoM31/godata" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/events" diff --git a/services/graph/pkg/service/v0/groups_test.go b/services/graph/pkg/service/v0/groups_test.go index b83f3b1626..3407205eb9 100644 --- a/services/graph/pkg/service/v0/groups_test.go +++ b/services/graph/pkg/service/v0/groups_test.go @@ -18,15 +18,15 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settings "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-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" + "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" "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 e6560fb1a2..289deb6b35 100644 --- a/services/graph/pkg/service/v0/option.go +++ b/services/graph/pkg/service/v0/option.go @@ -7,14 +7,14 @@ 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/owncloud/ocis/v2/ocis-pkg/keycloak" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/roles" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" - searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" + "github.com/opencloud-eu/opencloud/ocis-pkg/keycloak" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/graph/pkg/config" + "github.com/opencloud-eu/opencloud/services/graph/pkg/identity" "go.opentelemetry.io/otel/trace" ) diff --git a/services/graph/pkg/service/v0/password.go b/services/graph/pkg/service/v0/password.go index 8b1c840b1e..09c7bc997e 100644 --- a/services/graph/pkg/service/v0/password.go +++ b/services/graph/pkg/service/v0/password.go @@ -12,7 +12,7 @@ import ( revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/events" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) // ChangeOwnPassword implements the Service interface. It allows the user to change diff --git a/services/graph/pkg/service/v0/password_test.go b/services/graph/pkg/service/v0/password_test.go index 6447de5a19..4cfc087492 100644 --- a/services/graph/pkg/service/v0/password_test.go +++ b/services/graph/pkg/service/v0/password_test.go @@ -18,14 +18,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" - identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/personaldata.go b/services/graph/pkg/service/v0/personaldata.go index 09d90e8f2e..aa19de4031 100644 --- a/services/graph/pkg/service/v0/personaldata.go +++ b/services/graph/pkg/service/v0/personaldata.go @@ -10,7 +10,7 @@ import ( "path/filepath" "strconv" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" @@ -21,8 +21,8 @@ import ( "github.com/cs3org/reva/v2/pkg/rhttp" "github.com/cs3org/reva/v2/pkg/utils" "github.com/go-chi/chi/v5" - ehmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" + ehmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/eventhistory/v0" + ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" ) var ( diff --git a/services/graph/pkg/service/v0/rolemanagement.go b/services/graph/pkg/service/v0/rolemanagement.go index 6f76913626..c97f61a3a3 100644 --- a/services/graph/pkg/service/v0/rolemanagement.go +++ b/services/graph/pkg/service/v0/rolemanagement.go @@ -7,8 +7,8 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) // GetRoleDefinitions a list of permission roles than can be used when sharing with users or groups diff --git a/services/graph/pkg/service/v0/service.go b/services/graph/pkg/service/v0/service.go index 03cc754efd..0bcccdda0c 100644 --- a/services/graph/pkg/service/v0/service.go +++ b/services/graph/pkg/service/v0/service.go @@ -22,15 +22,15 @@ import ( "github.com/cs3org/reva/v2/pkg/store" "github.com/cs3org/reva/v2/pkg/utils" - ocisldap "github.com/owncloud/ocis/v2/ocis-pkg/ldap" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/roles" - "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity/ldap" - graphm "github.com/owncloud/ocis/v2/services/graph/pkg/middleware" + 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" + 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" + graphm "github.com/opencloud-eu/opencloud/services/graph/pkg/middleware" ) const ( diff --git a/services/graph/pkg/service/v0/sharedbyme.go b/services/graph/pkg/service/v0/sharedbyme.go index 22a9be3026..1a20f3e1e4 100644 --- a/services/graph/pkg/service/v0/sharedbyme.go +++ b/services/graph/pkg/service/v0/sharedbyme.go @@ -7,7 +7,7 @@ import ( "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" ) type driveItemsByResourceID map[string]libregraph.DriveItem diff --git a/services/graph/pkg/service/v0/sharedbyme_test.go b/services/graph/pkg/service/v0/sharedbyme_test.go index aa34296294..3a9d2c52c5 100644 --- a/services/graph/pkg/service/v0/sharedbyme_test.go +++ b/services/graph/pkg/service/v0/sharedbyme_test.go @@ -24,14 +24,14 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/linktype" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/ocis-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" + identitymocks "github.com/opencloud-eu/opencloud/services/graph/pkg/identity/mocks" + "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" "github.com/stretchr/testify/mock" "google.golang.org/grpc" ) diff --git a/services/graph/pkg/service/v0/sharedwithme.go b/services/graph/pkg/service/v0/sharedwithme.go index 0a51d8b088..b6f24b027c 100644 --- a/services/graph/pkg/service/v0/sharedwithme.go +++ b/services/graph/pkg/service/v0/sharedwithme.go @@ -9,8 +9,8 @@ import ( "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) // ListSharedWithMe lists the files shared with the current user. diff --git a/services/graph/pkg/service/v0/sharedwithme_test.go b/services/graph/pkg/service/v0/sharedwithme_test.go index 795ebefd89..0f6b136232 100644 --- a/services/graph/pkg/service/v0/sharedwithme_test.go +++ b/services/graph/pkg/service/v0/sharedwithme_test.go @@ -27,13 +27,13 @@ import ( "google.golang.org/protobuf/proto" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" - // "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/ocis-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" + // "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) var _ = Describe("SharedWithMe", func() { diff --git a/services/graph/pkg/service/v0/spacetemplates.go b/services/graph/pkg/service/v0/spacetemplates.go index 99c64ec41b..a441148766 100644 --- a/services/graph/pkg/service/v0/spacetemplates.go +++ b/services/graph/pkg/service/v0/spacetemplates.go @@ -14,8 +14,8 @@ 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/owncloud/ocis/v2/ocis-pkg/l10n" - l10n_pkg "github.com/owncloud/ocis/v2/services/graph/pkg/l10n" + "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + l10n_pkg "github.com/opencloud-eu/opencloud/services/graph/pkg/l10n" ) var ( diff --git a/services/graph/pkg/service/v0/tags.go b/services/graph/pkg/service/v0/tags.go index b8310c970e..fa77964833 100644 --- a/services/graph/pkg/service/v0/tags.go +++ b/services/graph/pkg/service/v0/tags.go @@ -12,8 +12,8 @@ import ( "github.com/cs3org/reva/v2/pkg/tags" "github.com/go-chi/render" libregraph "github.com/owncloud/libre-graph-api-go" - searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + searchsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" "go-micro.dev/v4/metadata" ) diff --git a/services/graph/pkg/service/v0/users.go b/services/graph/pkg/service/v0/users.go index 3bdc88ccc7..ae0267963d 100644 --- a/services/graph/pkg/service/v0/users.go +++ b/services/graph/pkg/service/v0/users.go @@ -25,12 +25,12 @@ import ( "github.com/go-chi/render" "github.com/google/uuid" libregraph "github.com/owncloud/libre-graph-api-go" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" - ocissettingssvc "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0" - "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + 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/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/graph/pkg/identity" + ocissettingssvc "github.com/opencloud-eu/opencloud/services/settings/pkg/service/v0" + "github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults" ) // GetMe implements the Service interface. diff --git a/services/graph/pkg/service/v0/users_filter.go b/services/graph/pkg/service/v0/users_filter.go index 04cba45c37..b594e9232e 100644 --- a/services/graph/pkg/service/v0/users_filter.go +++ b/services/graph/pkg/service/v0/users_filter.go @@ -6,8 +6,8 @@ import ( "github.com/CiscoM31/godata" libregraph "github.com/owncloud/libre-graph-api-go" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" + settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" ) const ( diff --git a/services/graph/pkg/service/v0/users_test.go b/services/graph/pkg/service/v0/users_test.go index 9d3dbb84c8..b69e373783 100644 --- a/services/graph/pkg/service/v0/users_test.go +++ b/services/graph/pkg/service/v0/users_test.go @@ -26,15 +26,15 @@ import ( "go-micro.dev/v4/client" "google.golang.org/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settings "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - settingsmocks "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0/mocks" - "github.com/owncloud/ocis/v2/services/graph/mocks" - "github.com/owncloud/ocis/v2/services/graph/pkg/config" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - identitymocks "github.com/owncloud/ocis/v2/services/graph/pkg/identity/mocks" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-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" + "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" ) type userList struct { diff --git a/services/graph/pkg/service/v0/utils.go b/services/graph/pkg/service/v0/utils.go index 5a0936b8e1..945900cdf1 100644 --- a/services/graph/pkg/service/v0/utils.go +++ b/services/graph/pkg/service/v0/utils.go @@ -18,10 +18,10 @@ import ( libregraph "github.com/owncloud/libre-graph-api-go" "golang.org/x/sync/errgroup" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/ocis-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" ) // StrictJSONUnmarshal is a wrapper around json.Unmarshal that returns an error if the json contains unknown fields. diff --git a/services/graph/pkg/service/v0/utils_test.go b/services/graph/pkg/service/v0/utils_test.go index b9dbc49631..8564afdc2e 100644 --- a/services/graph/pkg/service/v0/utils_test.go +++ b/services/graph/pkg/service/v0/utils_test.go @@ -17,11 +17,11 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "google.golang.org/protobuf/testing/protocmp" - "github.com/owncloud/ocis/v2/ocis-pkg/conversions" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/identity" - service "github.com/owncloud/ocis/v2/services/graph/pkg/service/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" + "github.com/opencloud-eu/opencloud/ocis-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" ) var _ = Describe("Utils", func() { diff --git a/services/graph/pkg/unifiedrole/conversion_test.go b/services/graph/pkg/unifiedrole/conversion_test.go index 99730c3444..ef92f78a5e 100644 --- a/services/graph/pkg/unifiedrole/conversion_test.go +++ b/services/graph/pkg/unifiedrole/conversion_test.go @@ -9,8 +9,8 @@ import ( "github.com/onsi/gomega/types" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/conversions" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) func TestPermissionsToCS3ResourcePermissions(t *testing.T) { diff --git a/services/graph/pkg/unifiedrole/filter_test.go b/services/graph/pkg/unifiedrole/filter_test.go index ce30d64421..0ab1312ac3 100644 --- a/services/graph/pkg/unifiedrole/filter_test.go +++ b/services/graph/pkg/unifiedrole/filter_test.go @@ -6,7 +6,7 @@ import ( . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) func TestRoleFilterIDs(t *testing.T) { diff --git a/services/graph/pkg/unifiedrole/roles.go b/services/graph/pkg/unifiedrole/roles.go index 4768348f5c..53a14b234a 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/owncloud/ocis/v2/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" ) const ( diff --git a/services/graph/pkg/unifiedrole/roles_test.go b/services/graph/pkg/unifiedrole/roles_test.go index 5fe83a0030..50f9e703f1 100644 --- a/services/graph/pkg/unifiedrole/roles_test.go +++ b/services/graph/pkg/unifiedrole/roles_test.go @@ -8,7 +8,7 @@ import ( libregraph "github.com/owncloud/libre-graph-api-go" "google.golang.org/protobuf/proto" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) func TestGetDefinition(t *testing.T) { diff --git a/services/graph/pkg/validate/libregraph.go b/services/graph/pkg/validate/libregraph.go index 7d3c77c7d3..cb84a2999b 100644 --- a/services/graph/pkg/validate/libregraph.go +++ b/services/graph/pkg/validate/libregraph.go @@ -7,7 +7,7 @@ import ( "github.com/go-playground/validator/v10" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" ) type contextKey int diff --git a/services/graph/pkg/validate/libregraph_test.go b/services/graph/pkg/validate/libregraph_test.go index ecf3cfdd83..8932848fe9 100644 --- a/services/graph/pkg/validate/libregraph_test.go +++ b/services/graph/pkg/validate/libregraph_test.go @@ -8,9 +8,9 @@ import ( . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/conversions" - "github.com/owncloud/ocis/v2/services/graph/pkg/unifiedrole" - "github.com/owncloud/ocis/v2/services/graph/pkg/validate" + "github.com/opencloud-eu/opencloud/ocis-pkg/conversions" + "github.com/opencloud-eu/opencloud/services/graph/pkg/unifiedrole" + "github.com/opencloud-eu/opencloud/services/graph/pkg/validate" ) type validatableFactory[T any] func() (T, bool) diff --git a/services/groups/cmd/groups/main.go b/services/groups/cmd/groups/main.go index c1d4afadbe..047ce782d2 100644 --- a/services/groups/cmd/groups/main.go +++ b/services/groups/cmd/groups/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/groups/pkg/command" - "github.com/owncloud/ocis/v2/services/groups/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/groups/pkg/command" + "github.com/opencloud-eu/opencloud/services/groups/pkg/config/defaults" ) func main() { diff --git a/services/groups/pkg/command/health.go b/services/groups/pkg/command/health.go index 8a48fe36c8..475d71c31a 100644 --- a/services/groups/pkg/command/health.go +++ b/services/groups/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/groups/pkg/config" - "github.com/owncloud/ocis/v2/services/groups/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/groups/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/groups/pkg/command/root.go b/services/groups/pkg/command/root.go index ba2a991b40..0c6bbd4fac 100644 --- a/services/groups/pkg/command/root.go +++ b/services/groups/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/groups/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 3e3a911c96..949476f9fb 100644 --- a/services/groups/pkg/command/server.go +++ b/services/groups/pkg/command/server.go @@ -9,16 +9,16 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/ldap" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/groups/pkg/config" - "github.com/owncloud/ocis/v2/services/groups/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/groups/pkg/logging" - "github.com/owncloud/ocis/v2/services/groups/pkg/revaconfig" - "github.com/owncloud/ocis/v2/services/groups/pkg/server/debug" + "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/services/groups/pkg/config" + "github.com/opencloud-eu/opencloud/services/groups/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/groups/pkg/logging" + "github.com/opencloud-eu/opencloud/services/groups/pkg/revaconfig" + "github.com/opencloud-eu/opencloud/services/groups/pkg/server/debug" "github.com/urfave/cli/v2" ) diff --git a/services/groups/pkg/command/version.go b/services/groups/pkg/command/version.go index 270cb99c6e..3499f77905 100644 --- a/services/groups/pkg/command/version.go +++ b/services/groups/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/groups/pkg/config" + "github.com/opencloud-eu/opencloud/services/groups/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/groups/pkg/config/config.go b/services/groups/pkg/config/config.go index 2219fbab2b..161443a7ec 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" ) type Config struct { diff --git a/services/groups/pkg/config/defaults/defaultconfig.go b/services/groups/pkg/config/defaults/defaultconfig.go index 1a93ea1525..bef3e44ffd 100644 --- a/services/groups/pkg/config/defaults/defaultconfig.go +++ b/services/groups/pkg/config/defaults/defaultconfig.go @@ -3,10 +3,10 @@ package defaults import ( "path/filepath" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/groups/pkg/config" + "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/services/groups/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/groups/pkg/config/parser/parse.go b/services/groups/pkg/config/parser/parse.go index ed312dfc44..55c9ce5bd9 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/groups/pkg/config" - "github.com/owncloud/ocis/v2/services/groups/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/services/groups/pkg/config" + "github.com/opencloud-eu/opencloud/services/groups/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 c0d5da7047..0304cec212 100644 --- a/services/groups/pkg/config/tracing.go +++ b/services/groups/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 ad28529c59..b36963a9d1 100644 --- a/services/groups/pkg/logging/logging.go +++ b/services/groups/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/groups/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/groups/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/groups/pkg/revaconfig/config.go b/services/groups/pkg/revaconfig/config.go index 60de17da13..f70a036dc1 100644 --- a/services/groups/pkg/revaconfig/config.go +++ b/services/groups/pkg/revaconfig/config.go @@ -1,7 +1,7 @@ package revaconfig import ( - "github.com/owncloud/ocis/v2/services/groups/pkg/config" + "github.com/opencloud-eu/opencloud/services/groups/pkg/config" ) // GroupsConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/groups/pkg/server/debug/option.go b/services/groups/pkg/server/debug/option.go index 54c9e8fa82..4472a24b5f 100644 --- a/services/groups/pkg/server/debug/option.go +++ b/services/groups/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/groups/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/groups/pkg/config" ) // Option defines a single option function. diff --git a/services/groups/pkg/server/debug/server.go b/services/groups/pkg/server/debug/server.go index 3ce3b8d3c9..54914a8ec6 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/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/services/idm/cmd/idm/main.go b/services/idm/cmd/idm/main.go index e61c15349d..6ea0627250 100644 --- a/services/idm/cmd/idm/main.go +++ b/services/idm/cmd/idm/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/idm/pkg/command" - "github.com/owncloud/ocis/v2/services/idm/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/idm/pkg/command" + "github.com/opencloud-eu/opencloud/services/idm/pkg/config/defaults" ) func main() { diff --git a/services/idm/pkg/command/health.go b/services/idm/pkg/command/health.go index 328ac39690..f1694b699c 100644 --- a/services/idm/pkg/command/health.go +++ b/services/idm/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/idm/pkg/config" - "github.com/owncloud/ocis/v2/services/idm/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/idm/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/idm/pkg/command/resetpw.go b/services/idm/pkg/command/resetpw.go index bdc3704486..ee586da2d8 100644 --- a/services/idm/pkg/command/resetpw.go +++ b/services/idm/pkg/command/resetpw.go @@ -11,11 +11,11 @@ import ( "github.com/go-ldap/ldap/v3" "github.com/libregraph/idm/pkg/ldbbolt" "github.com/libregraph/idm/server" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/idm/pkg/config" - "github.com/owncloud/ocis/v2/services/idm/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/idm/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" bolt "go.etcd.io/bbolt" "golang.org/x/term" diff --git a/services/idm/pkg/command/root.go b/services/idm/pkg/command/root.go index 6e6c9c4dc8..f24bfaf831 100644 --- a/services/idm/pkg/command/root.go +++ b/services/idm/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/idm/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 237d2a0ec9..2e52e5e66d 100644 --- a/services/idm/pkg/command/server.go +++ b/services/idm/pkg/command/server.go @@ -16,14 +16,14 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - pkgcrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/idm" - "github.com/owncloud/ocis/v2/services/idm/pkg/config" - "github.com/owncloud/ocis/v2/services/idm/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/idm/pkg/logging" - "github.com/owncloud/ocis/v2/services/idm/pkg/server/debug" + "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/services/idm" + "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" + "github.com/opencloud-eu/opencloud/services/idm/pkg/server/debug" ) // Server is the entrypoint for the server command. diff --git a/services/idm/pkg/command/version.go b/services/idm/pkg/command/version.go index b9834afe39..859e5f20af 100644 --- a/services/idm/pkg/command/version.go +++ b/services/idm/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/idm/pkg/config" + "github.com/opencloud-eu/opencloud/services/idm/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/idm/pkg/config/config.go b/services/idm/pkg/config/config.go index df1782c4fe..20868bc803 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 78bc0be0af..dec1a79855 100644 --- a/services/idm/pkg/config/defaults/defaultconfig.go +++ b/services/idm/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/idm/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/idm/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/idm/pkg/config/parser/parse.go b/services/idm/pkg/config/parser/parse.go index 105792280a..eb15b05dac 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/idm/pkg/config" - "github.com/owncloud/ocis/v2/services/idm/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/services/idm/pkg/config" + "github.com/opencloud-eu/opencloud/services/idm/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 1c2faed96a..f5fa0c5a69 100644 --- a/services/idm/pkg/logging/logging.go +++ b/services/idm/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/idm/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/idm/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/idm/pkg/server/debug/option.go b/services/idm/pkg/server/debug/option.go index 3ed1956c11..2388ebbba1 100644 --- a/services/idm/pkg/server/debug/option.go +++ b/services/idm/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/idm/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/idm/pkg/config" ) // Option defines a single option function. diff --git a/services/idm/pkg/server/debug/server.go b/services/idm/pkg/server/debug/server.go index 8099c7bf2b..df48a7a357 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/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/services/idp/cmd/idp/main.go b/services/idp/cmd/idp/main.go index de20d3a5b3..0c0f4d1141 100644 --- a/services/idp/cmd/idp/main.go +++ b/services/idp/cmd/idp/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/idp/pkg/command" - "github.com/owncloud/ocis/v2/services/idp/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/idp/pkg/command" + "github.com/opencloud-eu/opencloud/services/idp/pkg/config/defaults" ) func main() { diff --git a/services/idp/pkg/assets/option.go b/services/idp/pkg/assets/option.go index 76899e6553..1cb430c39a 100644 --- a/services/idp/pkg/assets/option.go +++ b/services/idp/pkg/assets/option.go @@ -3,10 +3,10 @@ package assets import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/x/io/fsx" - "github.com/owncloud/ocis/v2/services/idp" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/x/io/fsx" + "github.com/opencloud-eu/opencloud/services/idp" + "github.com/opencloud-eu/opencloud/services/idp/pkg/config" ) // New returns a new http filesystem to serve assets. diff --git a/services/idp/pkg/backends/cs3/bootstrap/cs3.go b/services/idp/pkg/backends/cs3/bootstrap/cs3.go index 10c093a397..6ac0db32a1 100644 --- a/services/idp/pkg/backends/cs3/bootstrap/cs3.go +++ b/services/idp/pkg/backends/cs3/bootstrap/cs3.go @@ -26,7 +26,7 @@ import ( "github.com/libregraph/lico/identity" "github.com/libregraph/lico/identity/managers" - cs3 "github.com/owncloud/ocis/v2/services/idp/pkg/backends/cs3/identifier" + cs3 "github.com/opencloud-eu/opencloud/services/idp/pkg/backends/cs3/identifier" ) // Identity managers. diff --git a/services/idp/pkg/command/health.go b/services/idp/pkg/command/health.go index 461bd5cbef..b7ea9d68a8 100644 --- a/services/idp/pkg/command/health.go +++ b/services/idp/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" - "github.com/owncloud/ocis/v2/services/idp/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/idp/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/idp/pkg/command/root.go b/services/idp/pkg/command/root.go index b6707989cd..9f84c7b2cb 100644 --- a/services/idp/pkg/command/root.go +++ b/services/idp/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 355f2f6ca0..0e28eb1892 100644 --- a/services/idp/pkg/command/server.go +++ b/services/idp/pkg/command/server.go @@ -15,15 +15,15 @@ import ( "path/filepath" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" - "github.com/owncloud/ocis/v2/services/idp/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/idp/pkg/logging" - "github.com/owncloud/ocis/v2/services/idp/pkg/metrics" - "github.com/owncloud/ocis/v2/services/idp/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/idp/pkg/server/http" + "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/services/idp/pkg/config" + "github.com/opencloud-eu/opencloud/services/idp/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/idp/pkg/logging" + "github.com/opencloud-eu/opencloud/services/idp/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/idp/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/idp/pkg/server/http" "github.com/urfave/cli/v2" ) diff --git a/services/idp/pkg/command/version.go b/services/idp/pkg/command/version.go index 392d9178f6..a3b6689910 100644 --- a/services/idp/pkg/command/version.go +++ b/services/idp/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" + "github.com/opencloud-eu/opencloud/services/idp/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/idp/pkg/config/config.go b/services/idp/pkg/config/config.go index 4d17011d1a..8ffbfeae72 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 6a129bd454..6984b3a002 100644 --- a/services/idp/pkg/config/defaults/defaultconfig.go +++ b/services/idp/pkg/config/defaults/defaultconfig.go @@ -5,10 +5,10 @@ import ( "path/filepath" "strings" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" + "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/services/idp/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/idp/pkg/config/parser/parse.go b/services/idp/pkg/config/parser/parse.go index 9f13ae4107..cbdd73827c 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" - "github.com/owncloud/ocis/v2/services/idp/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/services/idp/pkg/config" + "github.com/opencloud-eu/opencloud/services/idp/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 5510ebf573..caa9fe986b 100644 --- a/services/idp/pkg/config/tracing.go +++ b/services/idp/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 6d14e74404..67311dc911 100644 --- a/services/idp/pkg/logging/logging.go +++ b/services/idp/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/idp/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/idp/pkg/server/debug/option.go b/services/idp/pkg/server/debug/option.go index 1f4cb85bc4..2b1a2a467d 100644 --- a/services/idp/pkg/server/debug/option.go +++ b/services/idp/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/idp/pkg/config" ) // Option defines a single option function. diff --git a/services/idp/pkg/server/debug/server.go b/services/idp/pkg/server/debug/server.go index 5358b266e8..b1c1345a8c 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // 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 2e0242e22b..9d68578ebf 100644 --- a/services/idp/pkg/server/http/option.go +++ b/services/idp/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" - "github.com/owncloud/ocis/v2/services/idp/pkg/metrics" + "github.com/opencloud-eu/opencloud/ocis-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" "go.opentelemetry.io/otel/trace" ) diff --git a/services/idp/pkg/server/http/server.go b/services/idp/pkg/server/http/server.go index cdd1f23c4b..e259a30dc6 100644 --- a/services/idp/pkg/server/http/server.go +++ b/services/idp/pkg/server/http/server.go @@ -5,12 +5,12 @@ import ( "os" chimiddleware "github.com/go-chi/chi/v5/middleware" - pkgcrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/service/http" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - svc "github.com/owncloud/ocis/v2/services/idp/pkg/service/v0" + 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" + svc "github.com/opencloud-eu/opencloud/services/idp/pkg/service/v0" "go-micro.dev/v4" ) diff --git a/services/idp/pkg/service/v0/instrument.go b/services/idp/pkg/service/v0/instrument.go index ddc7c24c05..ddf75dd954 100644 --- a/services/idp/pkg/service/v0/instrument.go +++ b/services/idp/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/v2/services/idp/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/idp/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/services/idp/pkg/service/v0/logging.go b/services/idp/pkg/service/v0/logging.go index b7a6933c86..e95ef180f8 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 f336c73218..bf10005298 100644 --- a/services/idp/pkg/service/v0/option.go +++ b/services/idp/pkg/service/v0/option.go @@ -3,8 +3,8 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 19c3603cdb..1ea74618f4 100644 --- a/services/idp/pkg/service/v0/service.go +++ b/services/idp/pkg/service/v0/service.go @@ -18,13 +18,13 @@ import ( libreGraphBackendSupport "github.com/libregraph/lico/bootstrap/backends/libregraph" licoconfig "github.com/libregraph/lico/config" "github.com/libregraph/lico/server" - "github.com/owncloud/ocis/v2/ocis-pkg/ldap" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/services/idp/pkg/assets" - cs3BackendSupport "github.com/owncloud/ocis/v2/services/idp/pkg/backends/cs3/bootstrap" - "github.com/owncloud/ocis/v2/services/idp/pkg/config" - "github.com/owncloud/ocis/v2/services/idp/pkg/middleware" + "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/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" + "github.com/opencloud-eu/opencloud/services/idp/pkg/middleware" "github.com/riandyrn/otelchi" "go.opentelemetry.io/otel/trace" "gopkg.in/yaml.v2" diff --git a/services/invitations/cmd/invitations/main.go b/services/invitations/cmd/invitations/main.go index 8c9a45aeab..265c5c7506 100644 --- a/services/invitations/cmd/invitations/main.go +++ b/services/invitations/cmd/invitations/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/invitations/pkg/command" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/command" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/config/defaults" ) func main() { diff --git a/services/invitations/pkg/backends/keycloak/backend.go b/services/invitations/pkg/backends/keycloak/backend.go index 85d98aceaa..88b567da46 100644 --- a/services/invitations/pkg/backends/keycloak/backend.go +++ b/services/invitations/pkg/backends/keycloak/backend.go @@ -6,9 +6,9 @@ import ( "github.com/google/uuid" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/keycloak" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/invitations/pkg/invitations" + "github.com/opencloud-eu/opencloud/ocis-pkg/keycloak" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/invitations" ) const ( diff --git a/services/invitations/pkg/backends/keycloak/backend_test.go b/services/invitations/pkg/backends/keycloak/backend_test.go index 4d4a197c33..f24dc48656 100644 --- a/services/invitations/pkg/backends/keycloak/backend_test.go +++ b/services/invitations/pkg/backends/keycloak/backend_test.go @@ -7,11 +7,11 @@ import ( "context" "testing" - kcpkg "github.com/owncloud/ocis/v2/ocis-pkg/keycloak" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/invitations/pkg/backends/keycloak" - "github.com/owncloud/ocis/v2/services/invitations/pkg/backends/keycloak/mocks" - "github.com/owncloud/ocis/v2/services/invitations/pkg/invitations" + kcpkg "github.com/opencloud-eu/opencloud/ocis-pkg/keycloak" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/services/invitations/pkg/backends/keycloak/mocks/client.go b/services/invitations/pkg/backends/keycloak/mocks/client.go index c6bdfbc7cc..a8a9529f82 100644 --- a/services/invitations/pkg/backends/keycloak/mocks/client.go +++ b/services/invitations/pkg/backends/keycloak/mocks/client.go @@ -6,7 +6,7 @@ import ( context "context" libregraph "github.com/owncloud/libre-graph-api-go" - keycloak "github.com/owncloud/ocis/v2/ocis-pkg/keycloak" + keycloak "github.com/opencloud-eu/opencloud/ocis-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 d9c6de1619..8fd09aeb65 100644 --- a/services/invitations/pkg/command/health.go +++ b/services/invitations/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/invitations/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/invitations/pkg/command/root.go b/services/invitations/pkg/command/root.go index 7425baf0d3..3b27a3f689 100644 --- a/services/invitations/pkg/command/root.go +++ b/services/invitations/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 c2137e9d2d..a4e2bf2c51 100644 --- a/services/invitations/pkg/command/server.go +++ b/services/invitations/pkg/command/server.go @@ -5,16 +5,16 @@ import ( "fmt" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/invitations/pkg/logging" - "github.com/owncloud/ocis/v2/services/invitations/pkg/metrics" - "github.com/owncloud/ocis/v2/services/invitations/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/invitations/pkg/server/http" - "github.com/owncloud/ocis/v2/services/invitations/pkg/service/v0" + "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/services/invitations/pkg/config" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/logging" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/server/http" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/service/v0" "github.com/urfave/cli/v2" ) diff --git a/services/invitations/pkg/command/version.go b/services/invitations/pkg/command/version.go index 01a85f800f..51dc0abd93 100644 --- a/services/invitations/pkg/command/version.go +++ b/services/invitations/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/invitations/pkg/config/config.go b/services/invitations/pkg/config/config.go index f0635190e3..b39f394a23 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/invitations/pkg/config/defaults/defaultconfig.go b/services/invitations/pkg/config/defaults/defaultconfig.go index 7c4f4cfde9..4d54d45162 100644 --- a/services/invitations/pkg/config/defaults/defaultconfig.go +++ b/services/invitations/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "strings" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" ) func FullDefaultConfig() *config.Config { diff --git a/services/invitations/pkg/config/http.go b/services/invitations/pkg/config/http.go index 966463da69..d2d4b1dcad 100644 --- a/services/invitations/pkg/config/http.go +++ b/services/invitations/pkg/config/http.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/ocis-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 d1e09361bc..322ef2e94a 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 20d19fa94c..b1b0f169e1 100644 --- a/services/invitations/pkg/config/tracing.go +++ b/services/invitations/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 bade349ebe..affc9a12e9 100644 --- a/services/invitations/pkg/logging/logging.go +++ b/services/invitations/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/invitations/pkg/metrics/options.go b/services/invitations/pkg/metrics/options.go index 4a1279c8e7..10ec24b6c3 100644 --- a/services/invitations/pkg/metrics/options.go +++ b/services/invitations/pkg/metrics/options.go @@ -1,7 +1,7 @@ package metrics import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 6f7626a9de..92b638ff6d 100644 --- a/services/invitations/pkg/server/debug/option.go +++ b/services/invitations/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" ) // Option defines a single option function. diff --git a/services/invitations/pkg/server/debug/server.go b/services/invitations/pkg/server/debug/server.go index 4a831899dd..e48ed33ac9 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // 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 12b06cfbbc..6ca6c09d77 100644 --- a/services/invitations/pkg/server/http/option.go +++ b/services/invitations/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config" - svc "github.com/owncloud/ocis/v2/services/invitations/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-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 5c50b00507..595979a80f 100644 --- a/services/invitations/pkg/server/http/server.go +++ b/services/invitations/pkg/server/http/server.go @@ -8,14 +8,14 @@ import ( "github.com/go-chi/chi/v5" chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/go-chi/render" - "github.com/owncloud/ocis/v2/ocis-pkg/account" - "github.com/owncloud/ocis/v2/ocis-pkg/cors" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - ohttp "github.com/owncloud/ocis/v2/ocis-pkg/service/http" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/invitations/pkg/invitations" - svc "github.com/owncloud/ocis/v2/services/invitations/pkg/service/v0" + "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/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/invitations" + svc "github.com/opencloud-eu/opencloud/services/invitations/pkg/service/v0" "go-micro.dev/v4" ) diff --git a/services/invitations/pkg/service/v0/instrument.go b/services/invitations/pkg/service/v0/instrument.go index 42c31b5097..c748f05cec 100644 --- a/services/invitations/pkg/service/v0/instrument.go +++ b/services/invitations/pkg/service/v0/instrument.go @@ -3,8 +3,8 @@ package service import ( "context" - "github.com/owncloud/ocis/v2/services/invitations/pkg/invitations" - "github.com/owncloud/ocis/v2/services/invitations/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/invitations" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/services/invitations/pkg/service/v0/logging.go b/services/invitations/pkg/service/v0/logging.go index 0115d9c80c..0394decae0 100644 --- a/services/invitations/pkg/service/v0/logging.go +++ b/services/invitations/pkg/service/v0/logging.go @@ -3,8 +3,8 @@ package service import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/invitations/pkg/invitations" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/invitations" ) // NewLogging returns a service that logs messages. diff --git a/services/invitations/pkg/service/v0/option.go b/services/invitations/pkg/service/v0/option.go index 35641c0a5f..c938930928 100644 --- a/services/invitations/pkg/service/v0/option.go +++ b/services/invitations/pkg/service/v0/option.go @@ -1,8 +1,8 @@ package service import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/config" ) // Option defines a single option function. diff --git a/services/invitations/pkg/service/v0/service.go b/services/invitations/pkg/service/v0/service.go index 791c8c39d2..49f68f20b6 100644 --- a/services/invitations/pkg/service/v0/service.go +++ b/services/invitations/pkg/service/v0/service.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/invitations/pkg/backends/keycloak" - "github.com/owncloud/ocis/v2/services/invitations/pkg/config" - "github.com/owncloud/ocis/v2/services/invitations/pkg/invitations" + "github.com/opencloud-eu/opencloud/ocis-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" ) const ( diff --git a/services/invitations/pkg/service/v0/tracing.go b/services/invitations/pkg/service/v0/tracing.go index 5082772ee3..d55ad07ab5 100644 --- a/services/invitations/pkg/service/v0/tracing.go +++ b/services/invitations/pkg/service/v0/tracing.go @@ -3,7 +3,7 @@ package service import ( "context" - "github.com/owncloud/ocis/v2/services/invitations/pkg/invitations" + "github.com/opencloud-eu/opencloud/services/invitations/pkg/invitations" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" ) diff --git a/services/nats/cmd/nats/main.go b/services/nats/cmd/nats/main.go index 347a2cc3e9..a34a9a5432 100644 --- a/services/nats/cmd/nats/main.go +++ b/services/nats/cmd/nats/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/nats/pkg/command" - "github.com/owncloud/ocis/v2/services/nats/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/nats/pkg/command" + "github.com/opencloud-eu/opencloud/services/nats/pkg/config/defaults" ) func main() { diff --git a/services/nats/pkg/command/health.go b/services/nats/pkg/command/health.go index 75e5ab838e..28e5e1e3c4 100644 --- a/services/nats/pkg/command/health.go +++ b/services/nats/pkg/command/health.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/nats/pkg/config" + "github.com/opencloud-eu/opencloud/services/nats/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/nats/pkg/command/root.go b/services/nats/pkg/command/root.go index 483d91b63c..ef9b83e321 100644 --- a/services/nats/pkg/command/root.go +++ b/services/nats/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/nats/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 6ad8a69317..18cc1fa8b0 100644 --- a/services/nats/pkg/command/server.go +++ b/services/nats/pkg/command/server.go @@ -10,13 +10,13 @@ import ( "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - pkgcrypto "github.com/owncloud/ocis/v2/ocis-pkg/crypto" - "github.com/owncloud/ocis/v2/services/nats/pkg/config" - "github.com/owncloud/ocis/v2/services/nats/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/nats/pkg/logging" - "github.com/owncloud/ocis/v2/services/nats/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/nats/pkg/server/nats" + "github.com/opencloud-eu/opencloud/ocis-pkg/config/configlog" + pkgcrypto "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/nats/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/nats/pkg/server/nats" ) // Server is the entrypoint for the server command. diff --git a/services/nats/pkg/command/version.go b/services/nats/pkg/command/version.go index 7e82763e15..b7db8b15a7 100644 --- a/services/nats/pkg/command/version.go +++ b/services/nats/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/nats/pkg/config" + "github.com/opencloud-eu/opencloud/services/nats/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/nats/pkg/config/config.go b/services/nats/pkg/config/config.go index 421e936afa..0499d36e20 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 9f2add0314..0a56fa39d1 100644 --- a/services/nats/pkg/config/defaults/defaultconfig.go +++ b/services/nats/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "path/filepath" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/nats/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/nats/pkg/config" ) // NOTE: Most of this configuration is not needed to keep it as simple as possible diff --git a/services/nats/pkg/config/parser/parse.go b/services/nats/pkg/config/parser/parse.go index 07dfdd3707..6963b51000 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/services/nats/pkg/config" - "github.com/owncloud/ocis/v2/services/nats/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/services/nats/pkg/config" + "github.com/opencloud-eu/opencloud/services/nats/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 6c5643c1fb..f6d515e5c2 100644 --- a/services/nats/pkg/logging/logging.go +++ b/services/nats/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/nats/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/nats/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/nats/pkg/logging/nats.go b/services/nats/pkg/logging/nats.go index 548895cf5c..6b68b02263 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 977b85f3b9..46fe727dce 100644 --- a/services/nats/pkg/server/debug/option.go +++ b/services/nats/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/nats/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/nats/pkg/config" ) // Option defines a single option function. diff --git a/services/nats/pkg/server/debug/server.go b/services/nats/pkg/server/debug/server.go index e133a8bdd2..61d8722011 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // Server initializes the debug service and server. diff --git a/services/notifications/cmd/notifications/main.go b/services/notifications/cmd/notifications/main.go index 73f31b88fc..4c9c89b598 100644 --- a/services/notifications/cmd/notifications/main.go +++ b/services/notifications/cmd/notifications/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/notifications/pkg/command" - "github.com/owncloud/ocis/v2/services/notifications/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/command" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/config/defaults" ) func main() { diff --git a/services/notifications/pkg/channels/channels.go b/services/notifications/pkg/channels/channels.go index 89ecb87df9..93c487912f 100644 --- a/services/notifications/pkg/channels/channels.go +++ b/services/notifications/pkg/channels/channels.go @@ -10,8 +10,8 @@ import ( "github.com/pkg/errors" mail "github.com/xhit/go-simple-mail/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/notifications/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" ) // Channel defines the methods of a communication channel. diff --git a/services/notifications/pkg/command/health.go b/services/notifications/pkg/command/health.go index bcc1df71ab..42a326e840 100644 --- a/services/notifications/pkg/command/health.go +++ b/services/notifications/pkg/command/health.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/notifications/pkg/config" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/notifications/pkg/command/root.go b/services/notifications/pkg/command/root.go index d61b299dc1..c3faab2240 100644 --- a/services/notifications/pkg/command/root.go +++ b/services/notifications/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/notifications/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/notifications/pkg/command/send_email.go b/services/notifications/pkg/command/send_email.go index 8da57ce844..651e7eb9a5 100644 --- a/services/notifications/pkg/command/send_email.go +++ b/services/notifications/pkg/command/send_email.go @@ -3,7 +3,7 @@ package command import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/events/stream" - "github.com/owncloud/ocis/v2/services/notifications/pkg/config" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" "github.com/pkg/errors" "github.com/urfave/cli/v2" ) diff --git a/services/notifications/pkg/command/server.go b/services/notifications/pkg/command/server.go index 309bc603f0..b83eb3452e 100644 --- a/services/notifications/pkg/command/server.go +++ b/services/notifications/pkg/command/server.go @@ -4,7 +4,7 @@ import ( "context" "fmt" "github.com/cs3org/reva/v2/pkg/store" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" + ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" microstore "go-micro.dev/v4/store" "reflect" @@ -15,17 +15,17 @@ import ( "github.com/cs3org/reva/v2/pkg/events/stream" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/notifications/pkg/channels" - "github.com/owncloud/ocis/v2/services/notifications/pkg/config" - "github.com/owncloud/ocis/v2/services/notifications/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/notifications/pkg/logging" - "github.com/owncloud/ocis/v2/services/notifications/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/notifications/pkg/service" + "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" + 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" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/logging" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/service" ) // Server is the entrypoint for the server command. diff --git a/services/notifications/pkg/command/version.go b/services/notifications/pkg/command/version.go index 3d288bb776..e02e9136e6 100644 --- a/services/notifications/pkg/command/version.go +++ b/services/notifications/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/notifications/pkg/config" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/notifications/pkg/config/config.go b/services/notifications/pkg/config/config.go index 08f41f260e..59715e2eae 100644 --- a/services/notifications/pkg/config/config.go +++ b/services/notifications/pkg/config/config.go @@ -5,7 +5,7 @@ import ( "context" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 69b94c91d7..0741175cf1 100644 --- a/services/notifications/pkg/config/defaults/defaultconfig.go +++ b/services/notifications/pkg/config/defaults/defaultconfig.go @@ -1,9 +1,9 @@ package defaults import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/notifications/pkg/config" + "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" ) diff --git a/services/notifications/pkg/config/parser/parse.go b/services/notifications/pkg/config/parser/parse.go index c1beebca03..eaf20392a4 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/notifications/pkg/config" - "github.com/owncloud/ocis/v2/services/notifications/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/notifications/pkg/logging" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 fa778f5ec9..16fa701f87 100644 --- a/services/notifications/pkg/config/tracing.go +++ b/services/notifications/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 73ff67fe90..e35cab2040 100644 --- a/services/notifications/pkg/email/composer.go +++ b/services/notifications/pkg/email/composer.go @@ -7,7 +7,7 @@ import ( "strings" "text/template" - "github.com/owncloud/ocis/v2/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" ) var ( diff --git a/services/notifications/pkg/email/email.go b/services/notifications/pkg/email/email.go index 968fa78de5..9611df63b6 100644 --- a/services/notifications/pkg/email/email.go +++ b/services/notifications/pkg/email/email.go @@ -15,7 +15,7 @@ import ( "strings" "syscall" - "github.com/owncloud/ocis/v2/services/notifications/pkg/channels" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/channels" ) var ( diff --git a/services/notifications/pkg/email/templates.go b/services/notifications/pkg/email/templates.go index c0d940f3a1..c640b8ed4e 100644 --- a/services/notifications/pkg/email/templates.go +++ b/services/notifications/pkg/email/templates.go @@ -1,6 +1,6 @@ package email -import "github.com/owncloud/ocis/v2/ocis-pkg/l10n" +import "github.com/opencloud-eu/opencloud/ocis-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 4b5c4341b0..20a290c7f6 100644 --- a/services/notifications/pkg/logging/logging.go +++ b/services/notifications/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/notifications/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/notifications/pkg/server/debug/option.go b/services/notifications/pkg/server/debug/option.go index 9ecb9364fe..9f2a708b9c 100644 --- a/services/notifications/pkg/server/debug/option.go +++ b/services/notifications/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/notifications/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/config" ) // Option defines a single option function. diff --git a/services/notifications/pkg/server/debug/server.go b/services/notifications/pkg/server/debug/server.go index 50db21ecdb..3b3ad9fe6c 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // Server initializes the debug service and server. diff --git a/services/notifications/pkg/service/filter.go b/services/notifications/pkg/service/filter.go index ac0194ed7a..fcfe616410 100644 --- a/services/notifications/pkg/service/filter.go +++ b/services/notifications/pkg/service/filter.go @@ -4,9 +4,9 @@ import ( "context" "errors" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 a0ba9c4436..90ff8d4992 100644 --- a/services/notifications/pkg/service/filter_test.go +++ b/services/notifications/pkg/service/filter_test.go @@ -3,9 +3,9 @@ package service import ( "context" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settings "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + "github.com/opencloud-eu/opencloud/ocis-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" diff --git a/services/notifications/pkg/service/job.go b/services/notifications/pkg/service/job.go index 56c60d9ebc..780bf51bce 100644 --- a/services/notifications/pkg/service/job.go +++ b/services/notifications/pkg/service/job.go @@ -3,10 +3,10 @@ package service import ( "context" "github.com/cs3org/reva/v2/pkg/events" - "github.com/owncloud/ocis/v2/ocis-pkg/l10n" - ehmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" - "github.com/owncloud/ocis/v2/services/notifications/pkg/channels" - "github.com/owncloud/ocis/v2/services/notifications/pkg/email" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/rs/zerolog" ) diff --git a/services/notifications/pkg/service/notification_suite_test.go b/services/notifications/pkg/service/notification_suite_test.go index 7f282054fb..0dcde57955 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/owncloud/ocis/v2/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-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 d362d355f9..4e6ecacd5a 100644 --- a/services/notifications/pkg/service/persistence.go +++ b/services/notifications/pkg/service/persistence.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/eventhistory/v0" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" + "github.com/opencloud-eu/opencloud/ocis-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" "go-micro.dev/v4/store" ) diff --git a/services/notifications/pkg/service/sciencemesh.go b/services/notifications/pkg/service/sciencemesh.go index a1c260414a..dc34a5eb12 100644 --- a/services/notifications/pkg/service/sciencemesh.go +++ b/services/notifications/pkg/service/sciencemesh.go @@ -5,8 +5,8 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/services/notifications/pkg/channels" - "github.com/owncloud/ocis/v2/services/notifications/pkg/email" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/channels" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/email" ) func (s eventsNotifier) handleScienceMeshInviteTokenGenerated(e events.ScienceMeshInviteTokenGenerated) { diff --git a/services/notifications/pkg/service/service.go b/services/notifications/pkg/service/service.go index acf4545c52..4219512d83 100644 --- a/services/notifications/pkg/service/service.go +++ b/services/notifications/pkg/service/service.go @@ -4,7 +4,7 @@ import ( "context" "errors" "fmt" - ehsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/eventhistory/v0" + ehsvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/eventhistory/v0" "go-micro.dev/v4/store" "net/url" "os" @@ -24,13 +24,13 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" - "github.com/owncloud/ocis/v2/ocis-pkg/l10n" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/notifications/pkg/channels" - "github.com/owncloud/ocis/v2/services/notifications/pkg/email" - "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/opencloud-eu/opencloud/ocis-pkg/l10n" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults" ) // validate is the package level validator instance diff --git a/services/notifications/pkg/service/service_test.go b/services/notifications/pkg/service/service_test.go index 9ba58acb4a..141e855fe6 100644 --- a/services/notifications/pkg/service/service_test.go +++ b/services/notifications/pkg/service/service_test.go @@ -3,7 +3,7 @@ package service_test import ( "context" "github.com/cs3org/reva/v2/pkg/store" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" + settingsmsg "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/settings/v0" "time" gateway "github.com/cs3org/go-cs3apis/cs3/gateway/v1beta1" @@ -16,12 +16,12 @@ import ( cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/graph/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/notifications/pkg/channels" - "github.com/owncloud/ocis/v2/services/notifications/pkg/service" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/service" "github.com/stretchr/testify/mock" "go-micro.dev/v4/client" "google.golang.org/grpc" diff --git a/services/notifications/pkg/service/shares.go b/services/notifications/pkg/service/shares.go index 1c3b53c0fb..adb031760d 100644 --- a/services/notifications/pkg/service/shares.go +++ b/services/notifications/pkg/service/shares.go @@ -5,8 +5,8 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/services/notifications/pkg/email" - "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/email" + "github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults" "github.com/rs/zerolog" "google.golang.org/protobuf/types/known/fieldmaskpb" ) diff --git a/services/notifications/pkg/service/spaces.go b/services/notifications/pkg/service/spaces.go index 8607acbafd..8d1c77ab18 100644 --- a/services/notifications/pkg/service/spaces.go +++ b/services/notifications/pkg/service/spaces.go @@ -6,8 +6,8 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/services/notifications/pkg/email" - "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/opencloud-eu/opencloud/services/notifications/pkg/email" + "github.com/opencloud-eu/opencloud/services/settings/pkg/store/defaults" "github.com/rs/zerolog" ) diff --git a/services/notifications/pkg/service/splitter.go b/services/notifications/pkg/service/splitter.go index 866e1860f3..b588809e93 100644 --- a/services/notifications/pkg/service/splitter.go +++ b/services/notifications/pkg/service/splitter.go @@ -3,10 +3,10 @@ package service import ( "context" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/settings/pkg/store/defaults" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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" micrometadata "go-micro.dev/v4/metadata" ) diff --git a/services/notifications/pkg/service/splitter_test.go b/services/notifications/pkg/service/splitter_test.go index 14832121fd..4715ba214a 100644 --- a/services/notifications/pkg/service/splitter_test.go +++ b/services/notifications/pkg/service/splitter_test.go @@ -3,10 +3,10 @@ package service import ( "context" user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - settingsmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/settings/v0" - settings "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - v0 "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + "github.com/opencloud-eu/opencloud/ocis-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" diff --git a/services/ocdav/cmd/ocdav/main.go b/services/ocdav/cmd/ocdav/main.go index 5a6d24390f..1534587111 100644 --- a/services/ocdav/cmd/ocdav/main.go +++ b/services/ocdav/cmd/ocdav/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/command" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/ocdav/pkg/command" + "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/defaults" ) func main() { diff --git a/services/ocdav/pkg/command/health.go b/services/ocdav/pkg/command/health.go index c207e17f2d..3bfdebd4e6 100644 --- a/services/ocdav/pkg/command/health.go +++ b/services/ocdav/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/ocdav/pkg/command/root.go b/services/ocdav/pkg/command/root.go index 6dd8518683..a7a58cc322 100644 --- a/services/ocdav/pkg/command/root.go +++ b/services/ocdav/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 e6eaaf4c71..a6820ffdbd 100644 --- a/services/ocdav/pkg/command/server.go +++ b/services/ocdav/pkg/command/server.go @@ -7,15 +7,15 @@ import ( "github.com/cs3org/reva/v2/pkg/micro/ocdav" "github.com/cs3org/reva/v2/pkg/sharedconf" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/broker" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/logging" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/server/debug" + "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/services/ocdav/pkg/config" + "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/ocdav/pkg/logging" + "github.com/opencloud-eu/opencloud/services/ocdav/pkg/server/debug" "github.com/urfave/cli/v2" ) diff --git a/services/ocdav/pkg/command/version.go b/services/ocdav/pkg/command/version.go index 6025ef4824..bcad60e4a2 100644 --- a/services/ocdav/pkg/command/version.go +++ b/services/ocdav/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config" + "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/ocdav/pkg/config/config.go b/services/ocdav/pkg/config/config.go index 05cb2dafa8..52f5408cb6 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" ) type Config struct { diff --git a/services/ocdav/pkg/config/defaults/defaultconfig.go b/services/ocdav/pkg/config/defaults/defaultconfig.go index b9f8dd00df..a40d0d7680 100644 --- a/services/ocdav/pkg/config/defaults/defaultconfig.go +++ b/services/ocdav/pkg/config/defaults/defaultconfig.go @@ -1,10 +1,10 @@ package defaults import ( - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config" + "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/services/ocdav/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/ocdav/pkg/config/parser/parse.go b/services/ocdav/pkg/config/parser/parse.go index ada294bfaf..b31ccd9f6c 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" + "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 069958a0b4..2c95fb3fdf 100644 --- a/services/ocdav/pkg/config/tracing.go +++ b/services/ocdav/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 bab4106173..953bb0e3ab 100644 --- a/services/ocdav/pkg/logging/logging.go +++ b/services/ocdav/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/ocdav/pkg/server/debug/option.go b/services/ocdav/pkg/server/debug/option.go index 76dc12aa51..3aecf2e09e 100644 --- a/services/ocdav/pkg/server/debug/option.go +++ b/services/ocdav/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/ocdav/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/ocdav/pkg/config" ) // Option defines a single option function. diff --git a/services/ocdav/pkg/server/debug/server.go b/services/ocdav/pkg/server/debug/server.go index 3ce3b8d3c9..54914a8ec6 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/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/service/debug" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" ) // Server initializes the debug service and server. diff --git a/services/ocm/cmd/ocm/main.go b/services/ocm/cmd/ocm/main.go index 77a2913ba6..085d9745a7 100644 --- a/services/ocm/cmd/ocm/main.go +++ b/services/ocm/cmd/ocm/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/ocm/pkg/command" - "github.com/owncloud/ocis/v2/services/ocm/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/command" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/config/defaults" ) func main() { diff --git a/services/ocm/pkg/command/health.go b/services/ocm/pkg/command/health.go index 7f41a24b15..3e4cb6cd6c 100644 --- a/services/ocm/pkg/command/health.go +++ b/services/ocm/pkg/command/health.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/ocm/pkg/config" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/ocm/pkg/command/root.go b/services/ocm/pkg/command/root.go index e524c73bd3..03c6bfb0f1 100644 --- a/services/ocm/pkg/command/root.go +++ b/services/ocm/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/ocm/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 3b8dd053b0..b5fad3e6b4 100644 --- a/services/ocm/pkg/command/server.go +++ b/services/ocm/pkg/command/server.go @@ -9,15 +9,15 @@ import ( "github.com/cs3org/reva/v2/cmd/revad/runtime" "github.com/gofrs/uuid" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/ocm/pkg/config" - "github.com/owncloud/ocis/v2/services/ocm/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/ocm/pkg/logging" - "github.com/owncloud/ocis/v2/services/ocm/pkg/revaconfig" - "github.com/owncloud/ocis/v2/services/ocm/pkg/server/debug" + "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/services/ocm/pkg/config" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/logging" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/revaconfig" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/server/debug" "github.com/urfave/cli/v2" ) diff --git a/services/ocm/pkg/command/version.go b/services/ocm/pkg/command/version.go index 13639cff09..943460afc7 100644 --- a/services/ocm/pkg/command/version.go +++ b/services/ocm/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/ocm/pkg/config" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/ocm/pkg/config/config.go b/services/ocm/pkg/config/config.go index c961c1aebb..d129ba4ce8 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 aab7f2f2a6..e31e0be018 100644 --- a/services/ocm/pkg/config/defaults/defaultconfig.go +++ b/services/ocm/pkg/config/defaults/defaultconfig.go @@ -4,10 +4,10 @@ import ( "path/filepath" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/ocm/pkg/config" + "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/services/ocm/pkg/config" ) // FullDefaultConfig returns the full default config diff --git a/services/ocm/pkg/config/parser/parse.go b/services/ocm/pkg/config/parser/parse.go index d0a7788010..adb4aadbd6 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/ocm/pkg/config" - "github.com/owncloud/ocis/v2/services/ocm/pkg/config/defaults" + 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" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 15431a352f..874a5129cd 100644 --- a/services/ocm/pkg/config/tracing.go +++ b/services/ocm/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 87d9cdd5a9..3d3e0c1312 100644 --- a/services/ocm/pkg/logging/logging.go +++ b/services/ocm/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/ocm/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/ocm/pkg/revaconfig/config.go b/services/ocm/pkg/revaconfig/config.go index 9a33ce13c5..22bf3afec5 100644 --- a/services/ocm/pkg/revaconfig/config.go +++ b/services/ocm/pkg/revaconfig/config.go @@ -4,8 +4,8 @@ import ( "math" "net/url" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/ocm/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" ) // OCMConfigFromStruct will adapt an oCIS config struct into a reva mapstructure to start a reva service. diff --git a/services/ocm/pkg/server/debug/option.go b/services/ocm/pkg/server/debug/option.go index b671376be3..7f27ab1666 100644 --- a/services/ocm/pkg/server/debug/option.go +++ b/services/ocm/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/ocm/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/ocm/pkg/config" ) // Option defines a single option function. diff --git a/services/ocm/pkg/server/debug/server.go b/services/ocm/pkg/server/debug/server.go index 87fe2864b0..6447fdaa39 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // Server initializes the debug service and server. diff --git a/services/ocs/cmd/ocs/main.go b/services/ocs/cmd/ocs/main.go index 96de1a08e1..bbb5096f44 100644 --- a/services/ocs/cmd/ocs/main.go +++ b/services/ocs/cmd/ocs/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/ocs/pkg/command" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/command" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/config/defaults" ) func main() { diff --git a/services/ocs/pkg/command/health.go b/services/ocs/pkg/command/health.go index e4939db9e1..d8444512e2 100644 --- a/services/ocs/pkg/command/health.go +++ b/services/ocs/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/ocs/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/ocs/pkg/command/root.go b/services/ocs/pkg/command/root.go index 1d2d38d881..1a3d8d70e5 100644 --- a/services/ocs/pkg/command/root.go +++ b/services/ocs/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 474f32735b..ec15836481 100644 --- a/services/ocs/pkg/command/server.go +++ b/services/ocs/pkg/command/server.go @@ -5,16 +5,16 @@ import ( "fmt" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - ogrpc "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/ocs/pkg/logging" - "github.com/owncloud/ocis/v2/services/ocs/pkg/metrics" - "github.com/owncloud/ocis/v2/services/ocs/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/ocs/pkg/server/http" + "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/services/ocs/pkg/config" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/logging" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/server/http" "github.com/urfave/cli/v2" ) diff --git a/services/ocs/pkg/command/version.go b/services/ocs/pkg/command/version.go index 06e48e76ef..92927fc0fd 100644 --- a/services/ocs/pkg/command/version.go +++ b/services/ocs/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/ocs/pkg/config/config.go b/services/ocs/pkg/config/config.go index 4097ff4ef6..8753560946 100644 --- a/services/ocs/pkg/config/config.go +++ b/services/ocs/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 6a9ebec588..4fd4baf943 100644 --- a/services/ocs/pkg/config/defaults/defaultconfig.go +++ b/services/ocs/pkg/config/defaults/defaultconfig.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/ocs/pkg/config/http.go b/services/ocs/pkg/config/http.go index 29cdc88953..6bb6f321be 100644 --- a/services/ocs/pkg/config/http.go +++ b/services/ocs/pkg/config/http.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/ocis-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 257052fb59..c6ea0c77b4 100644 --- a/services/ocs/pkg/config/parser/parse.go +++ b/services/ocs/pkg/config/parser/parse.go @@ -3,13 +3,13 @@ package parser import ( "errors" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/config/defaults" - ociscfg "github.com/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 f6f23b2ba5..7b5dab9911 100644 --- a/services/ocs/pkg/config/tracing.go +++ b/services/ocs/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 a0e4411f82..5ec6192193 100644 --- a/services/ocs/pkg/logging/logging.go +++ b/services/ocs/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/ocs/pkg/server/debug/option.go b/services/ocs/pkg/server/debug/option.go index 2533141d95..c1fa1cc3c5 100644 --- a/services/ocs/pkg/server/debug/option.go +++ b/services/ocs/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" ) // Option defines a single option function. diff --git a/services/ocs/pkg/server/debug/server.go b/services/ocs/pkg/server/debug/server.go index 52249a4689..15cd147054 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // 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 d259c1be75..887db1cbbc 100644 --- a/services/ocs/pkg/server/http/option.go +++ b/services/ocs/pkg/server/http/option.go @@ -3,9 +3,9 @@ package http import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config" - "github.com/owncloud/ocis/v2/services/ocs/pkg/metrics" + "github.com/opencloud-eu/opencloud/ocis-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" "go.opentelemetry.io/otel/trace" ) diff --git a/services/ocs/pkg/server/http/server.go b/services/ocs/pkg/server/http/server.go index eba4c07190..94e96c3756 100644 --- a/services/ocs/pkg/server/http/server.go +++ b/services/ocs/pkg/server/http/server.go @@ -4,11 +4,11 @@ import ( "fmt" "github.com/cs3org/reva/v2/pkg/store" chimiddleware "github.com/go-chi/chi/v5/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/cors" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/service/http" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - svc "github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0" + "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" + svc "github.com/opencloud-eu/opencloud/services/ocs/pkg/service/v0" "go-micro.dev/v4" microstore "go-micro.dev/v4/store" "go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp" diff --git a/services/ocs/pkg/service/v0/instrument.go b/services/ocs/pkg/service/v0/instrument.go index 8c48325201..a574a27c5f 100644 --- a/services/ocs/pkg/service/v0/instrument.go +++ b/services/ocs/pkg/service/v0/instrument.go @@ -3,7 +3,7 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/v2/services/ocs/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/metrics" ) // NewInstrument returns a service that instruments metrics. diff --git a/services/ocs/pkg/service/v0/logging.go b/services/ocs/pkg/service/v0/logging.go index c4e7c8382e..c883a367ef 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 9bf3c37ca9..d8e211f86c 100644 --- a/services/ocs/pkg/service/v0/option.go +++ b/services/ocs/pkg/service/v0/option.go @@ -3,8 +3,8 @@ package svc import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/config" "go-micro.dev/v4/store" ) diff --git a/services/ocs/pkg/service/v0/response/response.go b/services/ocs/pkg/service/v0/response/response.go index d1035fcd74..55ffa5b726 100644 --- a/services/ocs/pkg/service/v0/response/response.go +++ b/services/ocs/pkg/service/v0/response/response.go @@ -6,7 +6,7 @@ import ( "reflect" "github.com/go-chi/render" - "github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0/data" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/service/v0/data" ) // Response is the top level response structure diff --git a/services/ocs/pkg/service/v0/response/version.go b/services/ocs/pkg/service/v0/response/version.go index 5e72bc257a..a8460693a8 100644 --- a/services/ocs/pkg/service/v0/response/version.go +++ b/services/ocs/pkg/service/v0/response/version.go @@ -6,7 +6,7 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/render" - "github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0/data" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/service/v0/data" ) type key int diff --git a/services/ocs/pkg/service/v0/service.go b/services/ocs/pkg/service/v0/service.go index 207a33e0f5..806c188153 100644 --- a/services/ocs/pkg/service/v0/service.go +++ b/services/ocs/pkg/service/v0/service.go @@ -7,13 +7,13 @@ import ( "github.com/go-chi/chi/v5/middleware" "github.com/go-chi/render" - "github.com/owncloud/ocis/v2/ocis-pkg/account" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - opkgm "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - "github.com/owncloud/ocis/v2/services/ocs/pkg/config" - ocsm "github.com/owncloud/ocis/v2/services/ocs/pkg/middleware" - "github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0/response" + "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/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" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/service/v0/response" microstore "go-micro.dev/v4/store" ) diff --git a/services/ocs/pkg/service/v0/tracing.go b/services/ocs/pkg/service/v0/tracing.go index 4a2c04f51f..078f5841ca 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/owncloud/ocis/v2/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" ) // NewTracing returns a service that instruments traces. diff --git a/services/ocs/pkg/service/v0/users.go b/services/ocs/pkg/service/v0/users.go index 190e9bccd4..750421a586 100644 --- a/services/ocs/pkg/service/v0/users.go +++ b/services/ocs/pkg/service/v0/users.go @@ -7,8 +7,8 @@ import ( "net/http" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0/data" - "github.com/owncloud/ocis/v2/services/ocs/pkg/service/v0/response" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/service/v0/data" + "github.com/opencloud-eu/opencloud/services/ocs/pkg/service/v0/response" "go-micro.dev/v4/store" ) diff --git a/services/policies/cmd/policies/main.go b/services/policies/cmd/policies/main.go index e774e8c4a6..f8c85f3f91 100644 --- a/services/policies/cmd/policies/main.go +++ b/services/policies/cmd/policies/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/policies/pkg/command" - "github.com/owncloud/ocis/v2/services/policies/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/policies/pkg/command" + "github.com/opencloud-eu/opencloud/services/policies/pkg/config/defaults" ) func main() { diff --git a/services/policies/pkg/command/health.go b/services/policies/pkg/command/health.go index ec03f6a0ce..98440f030b 100644 --- a/services/policies/pkg/command/health.go +++ b/services/policies/pkg/command/health.go @@ -2,12 +2,12 @@ package command import ( "fmt" - "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/policies/pkg/config" - "github.com/owncloud/ocis/v2/services/policies/pkg/config/parser" + "github.com/opencloud-eu/opencloud/ocis-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 5926061c53..31f11405f9 100644 --- a/services/policies/pkg/command/root.go +++ b/services/policies/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/policies/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 832909400e..7219fa5dfa 100644 --- a/services/policies/pkg/command/server.go +++ b/services/policies/pkg/command/server.go @@ -8,18 +8,18 @@ import ( "github.com/oklog/run" "github.com/urfave/cli/v2" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - svcProtogen "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0" - "github.com/owncloud/ocis/v2/services/policies/pkg/config" - "github.com/owncloud/ocis/v2/services/policies/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/policies/pkg/engine/opa" - "github.com/owncloud/ocis/v2/services/policies/pkg/server/debug" - svcEvent "github.com/owncloud/ocis/v2/services/policies/pkg/service/event" - svcGRPC "github.com/owncloud/ocis/v2/services/policies/pkg/service/grpc" + "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" + 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" + "github.com/opencloud-eu/opencloud/services/policies/pkg/engine/opa" + "github.com/opencloud-eu/opencloud/services/policies/pkg/server/debug" + svcEvent "github.com/opencloud-eu/opencloud/services/policies/pkg/service/event" + svcGRPC "github.com/opencloud-eu/opencloud/services/policies/pkg/service/grpc" ) // Server is the entrypoint for the server command. diff --git a/services/policies/pkg/command/version.go b/services/policies/pkg/command/version.go index 48cfcfa242..1d3b61454d 100644 --- a/services/policies/pkg/command/version.go +++ b/services/policies/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/policies/pkg/config" + "github.com/opencloud-eu/opencloud/services/policies/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/policies/pkg/config/config.go b/services/policies/pkg/config/config.go index ee66c2cbbe..9fdd3364c9 100644 --- a/services/policies/pkg/config/config.go +++ b/services/policies/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 77cb7ff979..15eae9d372 100644 --- a/services/policies/pkg/config/defaults/defaultconfig.go +++ b/services/policies/pkg/config/defaults/defaultconfig.go @@ -3,8 +3,8 @@ package defaults import ( "time" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/policies/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/structs" + "github.com/opencloud-eu/opencloud/services/policies/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration which is needed for doc generation. diff --git a/services/policies/pkg/config/parser/parse.go b/services/policies/pkg/config/parser/parse.go index f89b989da9..f10ec1c83a 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/services/policies/pkg/config" - "github.com/owncloud/ocis/v2/services/policies/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/services/policies/pkg/config" + "github.com/opencloud-eu/opencloud/services/policies/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 6a4ca758ff..927f01a8a2 100644 --- a/services/policies/pkg/config/tracing.go +++ b/services/policies/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-pkg/tracing" // Tracing defines the available tracing configuration. type Tracing struct { diff --git a/services/policies/pkg/engine/engine.go b/services/policies/pkg/engine/engine.go index 651f1cbff1..6137ec146c 100644 --- a/services/policies/pkg/engine/engine.go +++ b/services/policies/pkg/engine/engine.go @@ -6,7 +6,7 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0" + "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/policies/v0" "google.golang.org/protobuf/encoding/protojson" ) diff --git a/services/policies/pkg/engine/engine_test.go b/services/policies/pkg/engine/engine_test.go index 3ac7c5101f..df92951879 100644 --- a/services/policies/pkg/engine/engine_test.go +++ b/services/policies/pkg/engine/engine_test.go @@ -3,8 +3,8 @@ package engine_test import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - pMessage "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0" - "github.com/owncloud/ocis/v2/services/policies/pkg/engine" + pMessage "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/policies/v0" + "github.com/opencloud-eu/opencloud/services/policies/pkg/engine" ) var _ = Describe("Engine", func() { diff --git a/services/policies/pkg/engine/opa/engine.go b/services/policies/pkg/engine/opa/engine.go index 21c07cdb4a..122410809a 100644 --- a/services/policies/pkg/engine/opa/engine.go +++ b/services/policies/pkg/engine/opa/engine.go @@ -9,9 +9,9 @@ import ( "github.com/open-policy-agent/opa/rego" "github.com/open-policy-agent/opa/topdown/print" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/policies/pkg/config" - "github.com/owncloud/ocis/v2/services/policies/pkg/engine" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/policies/pkg/config" + "github.com/opencloud-eu/opencloud/services/policies/pkg/engine" ) // OPA wraps open policy agent makes it possible to ask if an action is granted. diff --git a/services/policies/pkg/engine/opa/opa.go b/services/policies/pkg/engine/opa/opa.go index b012e38dc7..ea2d6db832 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) type logPrinter struct { diff --git a/services/policies/pkg/engine/opa/rf_mimetype_test.go b/services/policies/pkg/engine/opa/rf_mimetype_test.go index d2f692deba..bcc6806251 100644 --- a/services/policies/pkg/engine/opa/rf_mimetype_test.go +++ b/services/policies/pkg/engine/opa/rf_mimetype_test.go @@ -9,7 +9,7 @@ import ( . "github.com/onsi/gomega" "github.com/open-policy-agent/opa/rego" - "github.com/owncloud/ocis/v2/services/policies/pkg/engine/opa" + "github.com/opencloud-eu/opencloud/services/policies/pkg/engine/opa" ) var _ = Describe("opa ocis mimetype functions", func() { diff --git a/services/policies/pkg/engine/opa/rf_resource_test.go b/services/policies/pkg/engine/opa/rf_resource_test.go index 4c5c2fe31a..34b551c651 100644 --- a/services/policies/pkg/engine/opa/rf_resource_test.go +++ b/services/policies/pkg/engine/opa/rf_resource_test.go @@ -10,7 +10,7 @@ import ( . "github.com/onsi/gomega" "github.com/open-policy-agent/opa/rego" - "github.com/owncloud/ocis/v2/services/policies/pkg/engine/opa" + "github.com/opencloud-eu/opencloud/services/policies/pkg/engine/opa" ) var _ = Describe("opa ocis resource functions", func() { diff --git a/services/policies/pkg/server/debug/option.go b/services/policies/pkg/server/debug/option.go index aaf0a8d7a8..a98321641b 100644 --- a/services/policies/pkg/server/debug/option.go +++ b/services/policies/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/policies/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/policies/pkg/config" ) // Option defines a single option function. diff --git a/services/policies/pkg/server/debug/server.go b/services/policies/pkg/server/debug/server.go index 24f2e67915..ec4670a908 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // 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 756b360a90..3cd44284f3 100644 --- a/services/policies/pkg/service/event/service.go +++ b/services/policies/pkg/service/event/service.go @@ -4,8 +4,8 @@ import ( "context" "github.com/cs3org/reva/v2/pkg/events" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/policies/pkg/engine" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/policies/pkg/engine" "go.opentelemetry.io/otel/trace" ) diff --git a/services/policies/pkg/service/grpc/service.go b/services/policies/pkg/service/grpc/service.go index 5a53fe3d03..bc1654efcd 100644 --- a/services/policies/pkg/service/grpc/service.go +++ b/services/policies/pkg/service/grpc/service.go @@ -3,8 +3,8 @@ package grpcSVC import ( "context" - "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0" - "github.com/owncloud/ocis/v2/services/policies/pkg/engine" + "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0" + "github.com/opencloud-eu/opencloud/services/policies/pkg/engine" ) // Service defines the service handlers. diff --git a/services/postprocessing/cmd/postprocessing/main.go b/services/postprocessing/cmd/postprocessing/main.go index 869d23db02..5d3c494378 100644 --- a/services/postprocessing/cmd/postprocessing/main.go +++ b/services/postprocessing/cmd/postprocessing/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/command" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/command" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/defaults" ) func main() { diff --git a/services/postprocessing/pkg/command/health.go b/services/postprocessing/pkg/command/health.go index 0a9fe13bdf..674e26bc9e 100644 --- a/services/postprocessing/pkg/command/health.go +++ b/services/postprocessing/pkg/command/health.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/postprocessing/pkg/command/postprocessing.go b/services/postprocessing/pkg/command/postprocessing.go index 74af6581fa..79c54f9959 100644 --- a/services/postprocessing/pkg/command/postprocessing.go +++ b/services/postprocessing/pkg/command/postprocessing.go @@ -6,9 +6,9 @@ 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/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config/parser" + "github.com/opencloud-eu/opencloud/ocis-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 1e9796445f..fc7e2c5afd 100644 --- a/services/postprocessing/pkg/command/root.go +++ b/services/postprocessing/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 ef47a3bebe..d7ec402bd2 100644 --- a/services/postprocessing/pkg/command/server.go +++ b/services/postprocessing/pkg/command/server.go @@ -11,12 +11,12 @@ import ( "github.com/urfave/cli/v2" microstore "go-micro.dev/v4/store" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/logging" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/service" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/service" ) // Server is the entrypoint for the server command. diff --git a/services/postprocessing/pkg/command/version.go b/services/postprocessing/pkg/command/version.go index 5d52c94a8c..e5a2fa6f54 100644 --- a/services/postprocessing/pkg/command/version.go +++ b/services/postprocessing/pkg/command/version.go @@ -1,7 +1,7 @@ package command import ( - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/postprocessing/pkg/config/config.go b/services/postprocessing/pkg/config/config.go index 8919df2f7a..ed64f064db 100644 --- a/services/postprocessing/pkg/config/config.go +++ b/services/postprocessing/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" ) // Config combines all available configuration parts. diff --git a/services/postprocessing/pkg/config/defaults/defaultconfig.go b/services/postprocessing/pkg/config/defaults/defaultconfig.go index 4f00a1ff9e..90b00f9d56 100644 --- a/services/postprocessing/pkg/config/defaults/defaultconfig.go +++ b/services/postprocessing/pkg/config/defaults/defaultconfig.go @@ -3,7 +3,7 @@ package defaults import ( "time" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" ) // FullDefaultConfig returns a full sanitized config diff --git a/services/postprocessing/pkg/config/parser/parse.go b/services/postprocessing/pkg/config/parser/parse.go index e10e15291a..76e14e555b 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 4c34e37f9f..bca288bc89 100644 --- a/services/postprocessing/pkg/config/tracing.go +++ b/services/postprocessing/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 d24cac3380..a954aca5d3 100644 --- a/services/postprocessing/pkg/logging/logging.go +++ b/services/postprocessing/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/postprocessing/pkg/postprocessing/postprocessing.go b/services/postprocessing/pkg/postprocessing/postprocessing.go index f5274e9875..c59ecab6b9 100644 --- a/services/postprocessing/pkg/postprocessing/postprocessing.go +++ b/services/postprocessing/pkg/postprocessing/postprocessing.go @@ -7,7 +7,7 @@ import ( user "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" "github.com/cs3org/reva/v2/pkg/events" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" ) // Postprocessing handles postprocessing of a file diff --git a/services/postprocessing/pkg/server/debug/option.go b/services/postprocessing/pkg/server/debug/option.go index da002867f7..7e9b82efd2 100644 --- a/services/postprocessing/pkg/server/debug/option.go +++ b/services/postprocessing/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/postprocessing/pkg/config" ) // Option defines a single option function. diff --git a/services/postprocessing/pkg/server/debug/server.go b/services/postprocessing/pkg/server/debug/server.go index 67e67eea9b..0c0504adf5 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/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "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" ) // Server initializes the debug service and server. diff --git a/services/postprocessing/pkg/service/service.go b/services/postprocessing/pkg/service/service.go index 0628fd73f1..605ee6aaa9 100644 --- a/services/postprocessing/pkg/service/service.go +++ b/services/postprocessing/pkg/service/service.go @@ -11,9 +11,9 @@ 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/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/config" - "github.com/owncloud/ocis/v2/services/postprocessing/pkg/postprocessing" + "github.com/opencloud-eu/opencloud/ocis-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" "go.opentelemetry.io/otel/trace" ) diff --git a/services/proxy/cmd/proxy/main.go b/services/proxy/cmd/proxy/main.go index 889bc6772e..5f62cc32a6 100644 --- a/services/proxy/cmd/proxy/main.go +++ b/services/proxy/cmd/proxy/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/proxy/pkg/command" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/command" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults" ) func main() { diff --git a/services/proxy/pkg/command/health.go b/services/proxy/pkg/command/health.go index 824d626e51..922288da94 100644 --- a/services/proxy/pkg/command/health.go +++ b/services/proxy/pkg/command/health.go @@ -4,10 +4,10 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/proxy/pkg/logging" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/urfave/cli/v2" ) diff --git a/services/proxy/pkg/command/root.go b/services/proxy/pkg/command/root.go index b918424d6d..188cef70d4 100644 --- a/services/proxy/pkg/command/root.go +++ b/services/proxy/pkg/command/root.go @@ -3,8 +3,8 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-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 964e718bf8..3784332a94 100644 --- a/services/proxy/pkg/command/server.go +++ b/services/proxy/pkg/command/server.go @@ -15,28 +15,28 @@ import ( chimiddleware "github.com/go-chi/chi/v5/middleware" "github.com/justinas/alice" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - pkgmiddleware "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - policiessvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/proxy/pkg/logging" - "github.com/owncloud/ocis/v2/services/proxy/pkg/metrics" - "github.com/owncloud/ocis/v2/services/proxy/pkg/middleware" - "github.com/owncloud/ocis/v2/services/proxy/pkg/proxy" - "github.com/owncloud/ocis/v2/services/proxy/pkg/router" - "github.com/owncloud/ocis/v2/services/proxy/pkg/server/debug" - proxyHTTP "github.com/owncloud/ocis/v2/services/proxy/pkg/server/http" - "github.com/owncloud/ocis/v2/services/proxy/pkg/staticroutes" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" - "github.com/owncloud/ocis/v2/services/proxy/pkg/userroles" + "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" + 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" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/logging" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/middleware" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/proxy" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/router" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/server/debug" + proxyHTTP "github.com/opencloud-eu/opencloud/services/proxy/pkg/server/http" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/staticroutes" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/userroles" "github.com/urfave/cli/v2" "go-micro.dev/v4/selector" microstore "go-micro.dev/v4/store" diff --git a/services/proxy/pkg/command/version.go b/services/proxy/pkg/command/version.go index 0cf3e85b1d..c405dd9026 100644 --- a/services/proxy/pkg/command/version.go +++ b/services/proxy/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/proxy/pkg/config/config.go b/services/proxy/pkg/config/config.go index 574cbbe70f..047c2bc1ff 100644 --- a/services/proxy/pkg/config/config.go +++ b/services/proxy/pkg/config/config.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 aab86ff061..ee511ee8cc 100644 --- a/services/proxy/pkg/config/defaults/defaultconfig.go +++ b/services/proxy/pkg/config/defaults/defaultconfig.go @@ -7,10 +7,10 @@ import ( "strings" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "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/services/proxy/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/proxy/pkg/config/parser/parse.go b/services/proxy/pkg/config/parser/parse.go index f4d96a484e..14551f636f 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 8241edb7a2..caa66deec3 100644 --- a/services/proxy/pkg/config/tracing.go +++ b/services/proxy/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 b5803e3280..2e249093b9 100644 --- a/services/proxy/pkg/logging/logging.go +++ b/services/proxy/pkg/logging/logging.go @@ -1,8 +1,8 @@ package logging import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) // Configure initializes a service-specific logger instance. diff --git a/services/proxy/pkg/middleware/accesslog.go b/services/proxy/pkg/middleware/accesslog.go index e51faeb4bb..88fc7e2cdd 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 422d067ed8..15da7b4a96 100644 --- a/services/proxy/pkg/middleware/account_resolver.go +++ b/services/proxy/pkg/middleware/account_resolver.go @@ -7,14 +7,14 @@ import ( "time" "github.com/jellydator/ttlcache/v3" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" - "github.com/owncloud/ocis/v2/services/proxy/pkg/userroles" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/userroles" revactx "github.com/cs3org/reva/v2/pkg/ctx" "github.com/cs3org/reva/v2/pkg/events" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 e83c5f7c55..a827c87f07 100644 --- a/services/proxy/pkg/middleware/account_resolver_test.go +++ b/services/proxy/pkg/middleware/account_resolver_test.go @@ -10,11 +10,11 @@ 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/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend/mocks" - userRoleMocks "github.com/owncloud/ocis/v2/services/proxy/pkg/userroles/mocks" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/services/proxy/pkg/middleware/app_auth.go b/services/proxy/pkg/middleware/app_auth.go index b828af4b48..7f422db942 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 79d857019f..91d5b26be5 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) var _ = Describe("Authenticating requests", Label("AppAuthAuthenticator"), func() { diff --git a/services/proxy/pkg/middleware/authentication.go b/services/proxy/pkg/middleware/authentication.go index 558510b207..b27f25bdb2 100644 --- a/services/proxy/pkg/middleware/authentication.go +++ b/services/proxy/pkg/middleware/authentication.go @@ -7,8 +7,8 @@ import ( "regexp" "strings" - "github.com/owncloud/ocis/v2/services/proxy/pkg/router" - "github.com/owncloud/ocis/v2/services/proxy/pkg/webdav" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/router" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/webdav" "go.opentelemetry.io/otel/trace" "golang.org/x/text/cases" "golang.org/x/text/language" diff --git a/services/proxy/pkg/middleware/authentication_test.go b/services/proxy/pkg/middleware/authentication_test.go index 4b15deb591..74c27a9c2f 100644 --- a/services/proxy/pkg/middleware/authentication_test.go +++ b/services/proxy/pkg/middleware/authentication_test.go @@ -13,12 +13,12 @@ import ( "github.com/golang-jwt/jwt/v5" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - oidcmocks "github.com/owncloud/ocis/v2/ocis-pkg/oidc/mocks" - "github.com/owncloud/ocis/v2/services/proxy/pkg/router" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend/mocks" + "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/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" "github.com/stretchr/testify/mock" "go-micro.dev/v4/store" "google.golang.org/grpc" diff --git a/services/proxy/pkg/middleware/basic_auth.go b/services/proxy/pkg/middleware/basic_auth.go index 81ebadf0e8..2b42a3b6fb 100644 --- a/services/proxy/pkg/middleware/basic_auth.go +++ b/services/proxy/pkg/middleware/basic_auth.go @@ -3,9 +3,9 @@ package middleware import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend" ) // BasicAuthenticator is the authenticator responsible for HTTP Basic authentication. diff --git a/services/proxy/pkg/middleware/basic_auth_test.go b/services/proxy/pkg/middleware/basic_auth_test.go index 986884b4c5..e8d8eaf235 100644 --- a/services/proxy/pkg/middleware/basic_auth_test.go +++ b/services/proxy/pkg/middleware/basic_auth_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/mock" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend/mocks" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend/mocks" ) var _ = Describe("Authenticating requests", Label("BasicAuthenticator"), func() { diff --git a/services/proxy/pkg/middleware/context_logger.go b/services/proxy/pkg/middleware/context_logger.go index d8f0cc177c..c22ae0d79f 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 e1327d2d19..d95a904b5d 100644 --- a/services/proxy/pkg/middleware/create_home.go +++ b/services/proxy/pkg/middleware/create_home.go @@ -12,8 +12,8 @@ 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/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" "google.golang.org/grpc/metadata" ) diff --git a/services/proxy/pkg/middleware/metrics.go b/services/proxy/pkg/middleware/metrics.go index 186a180a0c..8c2c640fb5 100644 --- a/services/proxy/pkg/middleware/metrics.go +++ b/services/proxy/pkg/middleware/metrics.go @@ -5,7 +5,7 @@ import ( "time" "github.com/go-chi/chi/v5/middleware" - "github.com/owncloud/ocis/v2/services/proxy/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/services/proxy/pkg/middleware/oidc_auth.go b/services/proxy/pkg/middleware/oidc_auth.go index ed29111c02..7ba0dc88b1 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/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 70a047706c..68c70b5bfb 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/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - oidcmocks "github.com/owncloud/ocis/v2/ocis-pkg/oidc/mocks" + "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/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 90b60c45b4..8e3937b27b 100644 --- a/services/proxy/pkg/middleware/options.go +++ b/services/proxy/pkg/middleware/options.go @@ -7,13 +7,13 @@ 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/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - policiessvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" - "github.com/owncloud/ocis/v2/services/proxy/pkg/userroles" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/user/backend" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/userroles" "go-micro.dev/v4/store" "go.opentelemetry.io/otel/trace" ) diff --git a/services/proxy/pkg/middleware/policies.go b/services/proxy/pkg/middleware/policies.go index 4861df0105..6b7c0a0d2c 100644 --- a/services/proxy/pkg/middleware/policies.go +++ b/services/proxy/pkg/middleware/policies.go @@ -17,9 +17,9 @@ import ( "github.com/cs3org/reva/v2/pkg/storagespace" "github.com/cs3org/reva/v2/pkg/utils" - pMessage "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0" - pService "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0" - "github.com/owncloud/ocis/v2/services/webdav/pkg/net" + pMessage "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/policies/v0" + pService "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0" + "github.com/opencloud-eu/opencloud/services/webdav/pkg/net" ) type ( diff --git a/services/proxy/pkg/middleware/policies_test.go b/services/proxy/pkg/middleware/policies_test.go index 33e95f379b..858504c049 100644 --- a/services/proxy/pkg/middleware/policies_test.go +++ b/services/proxy/pkg/middleware/policies_test.go @@ -14,11 +14,11 @@ import ( "github.com/cs3org/reva/v2/pkg/rgrpc/todo/pool" cs3mocks "github.com/cs3org/reva/v2/tests/cs3mocks/mocks" . "github.com/onsi/gomega" - pMessage "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/policies/v0" - policiesPG "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0" - "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/policies/v0/mocks" - "github.com/owncloud/ocis/v2/services/proxy/pkg/middleware" - "github.com/owncloud/ocis/v2/services/webdav/pkg/net" + pMessage "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/policies/v0" + policiesPG "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0" + "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/policies/v0/mocks" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/middleware" + "github.com/opencloud-eu/opencloud/services/webdav/pkg/net" "github.com/stretchr/testify/mock" "go-micro.dev/v4/client" "google.golang.org/grpc" diff --git a/services/proxy/pkg/middleware/public_share_auth.go b/services/proxy/pkg/middleware/public_share_auth.go index c7468d6bbc..db70b48201 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 9f748c4ed1..e202e15fb0 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" "google.golang.org/grpc" ) diff --git a/services/proxy/pkg/middleware/security.go b/services/proxy/pkg/middleware/security.go index ef48abbe08..f769e4fc7c 100644 --- a/services/proxy/pkg/middleware/security.go +++ b/services/proxy/pkg/middleware/security.go @@ -6,7 +6,7 @@ import ( gofig "github.com/gookit/config/v2" "github.com/gookit/config/v2/yaml" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/unrolled/secure" "github.com/unrolled/secure/cspbuilder" ) diff --git a/services/proxy/pkg/middleware/selector_cookie.go b/services/proxy/pkg/middleware/selector_cookie.go index f0ec0d1f24..1f8599af62 100644 --- a/services/proxy/pkg/middleware/selector_cookie.go +++ b/services/proxy/pkg/middleware/selector_cookie.go @@ -3,10 +3,10 @@ package middleware import ( "net/http" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/proxy/policy" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/proxy/policy" ) // SelectorCookie provides a middleware which diff --git a/services/proxy/pkg/middleware/signed_url_auth.go b/services/proxy/pkg/middleware/signed_url_auth.go index 431b8a36e5..e3b4544c32 100644 --- a/services/proxy/pkg/middleware/signed_url_auth.go +++ b/services/proxy/pkg/middleware/signed_url_auth.go @@ -11,10 +11,10 @@ import ( "time" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" - "github.com/owncloud/ocis/v2/services/proxy/pkg/userroles" + "github.com/opencloud-eu/opencloud/ocis-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" microstore "go-micro.dev/v4/store" "golang.org/x/crypto/pbkdf2" ) diff --git a/services/proxy/pkg/middleware/signed_url_auth_test.go b/services/proxy/pkg/middleware/signed_url_auth_test.go index dbbea75d62..45a4bab830 100644 --- a/services/proxy/pkg/middleware/signed_url_auth_test.go +++ b/services/proxy/pkg/middleware/signed_url_auth_test.go @@ -8,7 +8,7 @@ import ( userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "github.com/stretchr/testify/assert" "go-micro.dev/v4/store" ) diff --git a/services/proxy/pkg/middleware/tracing.go b/services/proxy/pkg/middleware/tracing.go index aed4b67569..97b94b24c4 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/owncloud/ocis/v2/ocis-pkg/tracing" + pkgtrace "github.com/opencloud-eu/opencloud/ocis-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 628e9087c7..42a3ad5f95 100644 --- a/services/proxy/pkg/proxy/option.go +++ b/services/proxy/pkg/proxy/option.go @@ -1,8 +1,8 @@ package proxy import ( - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) // Option defines a single option function. diff --git a/services/proxy/pkg/proxy/policy/selector.go b/services/proxy/pkg/proxy/policy/selector.go index bd69aa237b..0c56740454 100644 --- a/services/proxy/pkg/proxy/policy/selector.go +++ b/services/proxy/pkg/proxy/policy/selector.go @@ -7,8 +7,8 @@ import ( "sort" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) var ( diff --git a/services/proxy/pkg/proxy/policy/selector_test.go b/services/proxy/pkg/proxy/policy/selector_test.go index 675a61e42e..bbc95b6ba7 100644 --- a/services/proxy/pkg/proxy/policy/selector_test.go +++ b/services/proxy/pkg/proxy/policy/selector_test.go @@ -8,8 +8,8 @@ import ( userv1beta1 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" revactx "github.com/cs3org/reva/v2/pkg/ctx" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) func TestLoadSelector(t *testing.T) { diff --git a/services/proxy/pkg/proxy/proxy.go b/services/proxy/pkg/proxy/proxy.go index 1dabc843fc..f505fd1c0d 100644 --- a/services/proxy/pkg/proxy/proxy.go +++ b/services/proxy/pkg/proxy/proxy.go @@ -11,10 +11,10 @@ import ( "os" "time" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/proxy/policy" - "github.com/owncloud/ocis/v2/services/proxy/pkg/router" + "github.com/opencloud-eu/opencloud/ocis-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" "github.com/rs/zerolog" ) diff --git a/services/proxy/pkg/proxy/proxy_integration_test.go b/services/proxy/pkg/proxy/proxy_integration_test.go index 97e776f81a..c876766ac5 100644 --- a/services/proxy/pkg/proxy/proxy_integration_test.go +++ b/services/proxy/pkg/proxy/proxy_integration_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/router" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 cab3e96e4f..90ef2c2eef 100644 --- a/services/proxy/pkg/router/router.go +++ b/services/proxy/pkg/router/router.go @@ -8,9 +8,9 @@ import ( "regexp" "strings" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/proxy/policy" + "github.com/opencloud-eu/opencloud/ocis-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 303ba293bd..edad027cee 100644 --- a/services/proxy/pkg/router/router_test.go +++ b/services/proxy/pkg/router/router_test.go @@ -9,10 +9,10 @@ import ( "net/url" "testing" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 5174c60d46..0c5c173519 100644 --- a/services/proxy/pkg/server/debug/option.go +++ b/services/proxy/pkg/server/debug/option.go @@ -3,8 +3,8 @@ package debug import ( "context" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) // Option defines a single option function. diff --git a/services/proxy/pkg/server/debug/server.go b/services/proxy/pkg/server/debug/server.go index 8027762356..1cd011e972 100644 --- a/services/proxy/pkg/server/debug/server.go +++ b/services/proxy/pkg/server/debug/server.go @@ -6,11 +6,11 @@ import ( "github.com/ggwhite/go-masker" - "github.com/owncloud/ocis/v2/ocis-pkg/checks" - "github.com/owncloud/ocis/v2/ocis-pkg/handlers" - "github.com/owncloud/ocis/v2/ocis-pkg/service/debug" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "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/services/proxy/pkg/config" ) // Server initializes the debug service and server. diff --git a/services/proxy/pkg/server/http/option.go b/services/proxy/pkg/server/http/option.go index 3955118fd7..fce4df9915 100644 --- a/services/proxy/pkg/server/http/option.go +++ b/services/proxy/pkg/server/http/option.go @@ -5,9 +5,9 @@ import ( "net/http" "github.com/justinas/alice" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/metrics" + "github.com/opencloud-eu/opencloud/ocis-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 0f1931c2df..26e5142653 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/owncloud/ocis/v2/ocis-pkg/crypto" - "github.com/owncloud/ocis/v2/ocis-pkg/service/http" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + 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" "go-micro.dev/v4" ) diff --git a/services/proxy/pkg/staticroutes/backchannellogout.go b/services/proxy/pkg/staticroutes/backchannellogout.go index f371fbc2f6..663c2fb8eb 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/owncloud/ocis/v2/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/ocis-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 143503b791..ad7b33a5cd 100644 --- a/services/proxy/pkg/staticroutes/staticroutes.go +++ b/services/proxy/pkg/staticroutes/staticroutes.go @@ -5,10 +5,10 @@ import ( "github.com/cs3org/reva/v2/pkg/events" "github.com/go-chi/chi/v5" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" - "github.com/owncloud/ocis/v2/services/proxy/pkg/user/backend" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 a1021bc4b9..7e9edc2fdc 100644 --- a/services/proxy/pkg/user/backend/cs3.go +++ b/services/proxy/pkg/user/backend/cs3.go @@ -15,10 +15,10 @@ import ( "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/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - "github.com/owncloud/ocis/v2/services/graph/pkg/errorcode" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/oidc" + "github.com/opencloud-eu/opencloud/services/graph/pkg/errorcode" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" "go-micro.dev/v4/selector" ) diff --git a/services/proxy/pkg/userroles/defaultrole.go b/services/proxy/pkg/userroles/defaultrole.go index 1136097ddd..83f93eede1 100644 --- a/services/proxy/pkg/userroles/defaultrole.go +++ b/services/proxy/pkg/userroles/defaultrole.go @@ -5,9 +5,9 @@ import ( cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - settingsService "github.com/owncloud/ocis/v2/services/settings/pkg/service/v0" + "github.com/opencloud-eu/opencloud/ocis-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 edc1ad327f..22f3008cd7 100644 --- a/services/proxy/pkg/userroles/oidcroles.go +++ b/services/proxy/pkg/userroles/oidcroles.go @@ -8,9 +8,9 @@ import ( cs3 "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" "github.com/cs3org/reva/v2/pkg/utils" - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" - "github.com/owncloud/ocis/v2/ocis-pkg/oidc" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" + "github.com/opencloud-eu/opencloud/ocis-pkg/middleware" + "github.com/opencloud-eu/opencloud/ocis-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 c8e51f54e8..2e4f79374f 100644 --- a/services/proxy/pkg/userroles/userroles.go +++ b/services/proxy/pkg/userroles/userroles.go @@ -6,9 +6,9 @@ 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/owncloud/ocis/v2/ocis-pkg/log" - settingssvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/settings/v0" - "github.com/owncloud/ocis/v2/services/proxy/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + settingssvc "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/settings/v0" + "github.com/opencloud-eu/opencloud/services/proxy/pkg/config" ) // UserRoleAssigner allows providing different implementations for how users get their default roles diff --git a/services/search/cmd/search/main.go b/services/search/cmd/search/main.go index 1426e298d3..87dcc740f9 100644 --- a/services/search/cmd/search/main.go +++ b/services/search/cmd/search/main.go @@ -6,8 +6,8 @@ import ( "os/signal" "syscall" - "github.com/owncloud/ocis/v2/services/search/pkg/command" - "github.com/owncloud/ocis/v2/services/search/pkg/config/defaults" + "github.com/opencloud-eu/opencloud/services/search/pkg/command" + "github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults" ) func main() { diff --git a/services/search/pkg/command/health.go b/services/search/pkg/command/health.go index 21060de80d..b4c33bff69 100644 --- a/services/search/pkg/command/health.go +++ b/services/search/pkg/command/health.go @@ -4,9 +4,9 @@ import ( "fmt" "net/http" - "github.com/owncloud/ocis/v2/services/search/pkg/config" - "github.com/owncloud/ocis/v2/services/search/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/search/pkg/logging" + "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" "github.com/urfave/cli/v2" ) diff --git a/services/search/pkg/command/index.go b/services/search/pkg/command/index.go index 39dc33618e..3f95c236f3 100644 --- a/services/search/pkg/command/index.go +++ b/services/search/pkg/command/index.go @@ -9,12 +9,12 @@ import ( "github.com/urfave/cli/v2" "go-micro.dev/v4/client" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" - "github.com/owncloud/ocis/v2/services/search/pkg/config" - "github.com/owncloud/ocis/v2/services/search/pkg/config/parser" + "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" + 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" ) // Index is the entrypoint for the server command. diff --git a/services/search/pkg/command/root.go b/services/search/pkg/command/root.go index f0f9d05b71..878747e302 100644 --- a/services/search/pkg/command/root.go +++ b/services/search/pkg/command/root.go @@ -3,9 +3,9 @@ package command import ( "os" - "github.com/owncloud/ocis/v2/ocis-pkg/clihelper" + "github.com/opencloud-eu/opencloud/ocis-pkg/clihelper" - "github.com/owncloud/ocis/v2/services/search/pkg/config" + "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 05d38e9b85..3f3efe81e4 100644 --- a/services/search/pkg/command/server.go +++ b/services/search/pkg/command/server.go @@ -5,16 +5,16 @@ import ( "fmt" "github.com/oklog/run" - "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" - ogrpc "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" - "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/ocis-pkg/version" - "github.com/owncloud/ocis/v2/services/search/pkg/config" - "github.com/owncloud/ocis/v2/services/search/pkg/config/parser" - "github.com/owncloud/ocis/v2/services/search/pkg/logging" - "github.com/owncloud/ocis/v2/services/search/pkg/metrics" - "github.com/owncloud/ocis/v2/services/search/pkg/server/debug" - "github.com/owncloud/ocis/v2/services/search/pkg/server/grpc" + "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/services/search/pkg/config" + "github.com/opencloud-eu/opencloud/services/search/pkg/config/parser" + "github.com/opencloud-eu/opencloud/services/search/pkg/logging" + "github.com/opencloud-eu/opencloud/services/search/pkg/metrics" + "github.com/opencloud-eu/opencloud/services/search/pkg/server/debug" + "github.com/opencloud-eu/opencloud/services/search/pkg/server/grpc" "github.com/urfave/cli/v2" ) diff --git a/services/search/pkg/command/version.go b/services/search/pkg/command/version.go index fd176dc9a7..595349eca7 100644 --- a/services/search/pkg/command/version.go +++ b/services/search/pkg/command/version.go @@ -4,11 +4,11 @@ import ( "fmt" "os" - "github.com/owncloud/ocis/v2/ocis-pkg/registry" - "github.com/owncloud/ocis/v2/ocis-pkg/version" + "github.com/opencloud-eu/opencloud/ocis-pkg/registry" + "github.com/opencloud-eu/opencloud/ocis-pkg/version" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis/v2/services/search/pkg/config" + "github.com/opencloud-eu/opencloud/services/search/pkg/config" "github.com/urfave/cli/v2" ) diff --git a/services/search/pkg/config/config.go b/services/search/pkg/config/config.go index fc09268727..f2ed311471 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/owncloud/ocis/v2/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/ocis-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 3f4cce3e0a..751bc15648 100644 --- a/services/search/pkg/config/defaults/defaultconfig.go +++ b/services/search/pkg/config/defaults/defaultconfig.go @@ -3,10 +3,10 @@ package defaults import ( "path/filepath" - "github.com/owncloud/ocis/v2/ocis-pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/ocis-pkg/structs" - "github.com/owncloud/ocis/v2/services/search/pkg/config" + "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/services/search/pkg/config" ) // FullDefaultConfig returns a fully initialized default configuration diff --git a/services/search/pkg/config/grpc.go b/services/search/pkg/config/grpc.go index a0b7409bfc..0f54b53883 100644 --- a/services/search/pkg/config/grpc.go +++ b/services/search/pkg/config/grpc.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/shared" +import "github.com/opencloud-eu/opencloud/ocis-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 7e8ee90937..0f00471ca8 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/owncloud/ocis/v2/ocis-pkg/config" - "github.com/owncloud/ocis/v2/ocis-pkg/shared" - "github.com/owncloud/ocis/v2/services/search/pkg/config" - "github.com/owncloud/ocis/v2/services/search/pkg/config/defaults" + ociscfg "github.com/opencloud-eu/opencloud/ocis-pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/shared" + "github.com/opencloud-eu/opencloud/services/search/pkg/config" + "github.com/opencloud-eu/opencloud/services/search/pkg/config/defaults" - "github.com/owncloud/ocis/v2/ocis-pkg/config/envdecode" + "github.com/opencloud-eu/opencloud/ocis-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 53f0c49b79..a3dcae44b9 100644 --- a/services/search/pkg/config/tracing.go +++ b/services/search/pkg/config/tracing.go @@ -1,6 +1,6 @@ package config -import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" +import "github.com/opencloud-eu/opencloud/ocis-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 42e2952200..22ef984fa8 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-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 a88b695418..80ee13cb46 100644 --- a/services/search/pkg/content/basic_test.go +++ b/services/search/pkg/content/basic_test.go @@ -7,8 +7,8 @@ import ( cs3Types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/search/pkg/content" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/search/pkg/content" ) var _ = Describe("Basic", func() { diff --git a/services/search/pkg/content/content_test.go b/services/search/pkg/content/content_test.go index 17631fe4d7..09f8411e41 100644 --- a/services/search/pkg/content/content_test.go +++ b/services/search/pkg/content/content_test.go @@ -5,7 +5,7 @@ import ( . "github.com/stretchr/testify/assert" - "github.com/owncloud/ocis/v2/services/search/pkg/content" + "github.com/opencloud-eu/opencloud/services/search/pkg/content" ) func TestCleanContent(t *testing.T) { diff --git a/services/search/pkg/content/cs3.go b/services/search/pkg/content/cs3.go index 4a90e85a96..f2bd44d6ec 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/owncloud/ocis/v2/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" ) type cs3 struct { diff --git a/services/search/pkg/content/mocks/extractor.go b/services/search/pkg/content/mocks/extractor.go index 273d96b014..3d25993cb6 100644 --- a/services/search/pkg/content/mocks/extractor.go +++ b/services/search/pkg/content/mocks/extractor.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - content "github.com/owncloud/ocis/v2/services/search/pkg/content" + content "github.com/opencloud-eu/opencloud/services/search/pkg/content" mock "github.com/stretchr/testify/mock" diff --git a/services/search/pkg/content/tika.go b/services/search/pkg/content/tika.go index 5db7476c88..a2a71c56fd 100644 --- a/services/search/pkg/content/tika.go +++ b/services/search/pkg/content/tika.go @@ -14,8 +14,8 @@ import ( "github.com/google/go-tika/tika" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - "github.com/owncloud/ocis/v2/services/search/pkg/config" + "github.com/opencloud-eu/opencloud/ocis-pkg/log" + "github.com/opencloud-eu/opencloud/services/search/pkg/config" ) // 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 8dd2ae5e89..0d93d7d49c 100644 --- a/services/search/pkg/content/tika_test.go +++ b/services/search/pkg/content/tika_test.go @@ -15,10 +15,10 @@ import ( "github.com/stretchr/testify/mock" libregraph "github.com/owncloud/libre-graph-api-go" - "github.com/owncloud/ocis/v2/ocis-pkg/log" - conf "github.com/owncloud/ocis/v2/services/search/pkg/config/defaults" - "github.com/owncloud/ocis/v2/services/search/pkg/content" - contentMocks "github.com/owncloud/ocis/v2/services/search/pkg/content/mocks" + "github.com/opencloud-eu/opencloud/ocis-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" ) var _ = Describe("Tika", func() { diff --git a/services/search/pkg/engine/bleve.go b/services/search/pkg/engine/bleve.go index b5170ac7ae..b32615782a 100644 --- a/services/search/pkg/engine/bleve.go +++ b/services/search/pkg/engine/bleve.go @@ -28,10 +28,10 @@ import ( libregraph "github.com/owncloud/libre-graph-api-go" - searchMessage "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" - searchService "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" - "github.com/owncloud/ocis/v2/services/search/pkg/content" - searchQuery "github.com/owncloud/ocis/v2/services/search/pkg/query" + searchMessage "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0" + searchService "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" + "github.com/opencloud-eu/opencloud/services/search/pkg/content" + searchQuery "github.com/opencloud-eu/opencloud/services/search/pkg/query" ) // Bleve represents a search engine which utilizes bleve to search and store resources. diff --git a/services/search/pkg/engine/bleve_test.go b/services/search/pkg/engine/bleve_test.go index 1023ee8da0..90a842bb84 100644 --- a/services/search/pkg/engine/bleve_test.go +++ b/services/search/pkg/engine/bleve_test.go @@ -11,11 +11,11 @@ import ( . "github.com/onsi/gomega" libregraph "github.com/owncloud/libre-graph-api-go" - searchmsg "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" - searchsvc "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" - "github.com/owncloud/ocis/v2/services/search/pkg/content" - "github.com/owncloud/ocis/v2/services/search/pkg/engine" - "github.com/owncloud/ocis/v2/services/search/pkg/query/bleve" + 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/content" + "github.com/opencloud-eu/opencloud/services/search/pkg/engine" + "github.com/opencloud-eu/opencloud/services/search/pkg/query/bleve" ) var _ = Describe("Bleve", func() { diff --git a/services/search/pkg/engine/engine.go b/services/search/pkg/engine/engine.go index 734cf607f3..d125bef07b 100644 --- a/services/search/pkg/engine/engine.go +++ b/services/search/pkg/engine/engine.go @@ -7,9 +7,9 @@ import ( "github.com/blevesearch/bleve/v2/search" storageProvider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" - searchMessage "github.com/owncloud/ocis/v2/protogen/gen/ocis/messages/search/v0" - searchService "github.com/owncloud/ocis/v2/protogen/gen/ocis/services/search/v0" - "github.com/owncloud/ocis/v2/services/search/pkg/content" + searchMessage "github.com/opencloud-eu/opencloud/protogen/gen/ocis/messages/search/v0" + searchService "github.com/opencloud-eu/opencloud/protogen/gen/ocis/services/search/v0" + "github.com/opencloud-eu/opencloud/services/search/pkg/content" ) var queryEscape = regexp.MustCompile(`([` + regexp.QuoteMeta(`+=&|>