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 b680186df..41b1e451d 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 2ae8b98ad..c77f373b1 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 0d15b33b6..f431f308d 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 fe4d07040..dff192ccf 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 946856f8b..4f9644ba0 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 c10b53bbf..6af211de6 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 48502fe6a..8d3474718 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 693ba255c..939cde157 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 fcaa792d6..135b2648a 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 5e469d7be..46682dacf 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 cd125e2c0..9da021fc0 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 f25cccd81..b532571e6 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 1899e3bd4..249ce0fd8 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 30dbacd17..b6ac7b61f 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 d29b356bf..26a710da1 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 0ac1d1c4c..5a12e8287 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 6147edc44..3feb97743 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 6787f9890..29703ae88 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 32f0bbc69..62683d87b 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 0326c580d..3484c16ca 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 3a87111b6..d9b7390a8 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 55033eb1f..ef0d82b61 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 674a91561..7a1e398e3 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 812f831df..857fd89ef 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 99deef825..3e76a1443 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 6e14cc7b6..a39dc8673 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 09f1249c5..d6b03aa1c 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 0712a1a7e..8adc31827 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 0908c187f..54acfab82 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 f9b5786b7..3fe82a9f9 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 ff43cb8e9..9607e3dcd 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 aae42be08..908095a6f 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 44dbd706b..de11d26a0 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 465c025de..4dde0f897 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 4c8c53346..3eb7954d0 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 0331dbc03..01e6b3d2e 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 3daf8d24f..27752603c 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 5a9c60df0..45a68f347 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 4558a2414..faa299743 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 5fa498c2d..22f8794d7 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 662d9ec52..b95a95edd 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 450b135de..c27eb7dd7 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 fbfc5fe7a..c76078327 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 5c39d299b..fef16c9f2 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 291670042..d3ec4ca8f 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 ea3c93716..005aeaa47 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 4ac3db2d5..10cdd7b87 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 67538e0c0..d9bfc5d91 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 796dcaa22..4c68a5c3b 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 4a5984ba8..16522f673 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 b44e398eb..572def34f 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 3ed6b162f..23f634cb1 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 df16ced77..ccf75b70c 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 2b958d7df..b62c58ba3 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 035d8c93a..333e50587 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 f9d53612b..5bd69ae45 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 df2095f9a..8663b4e80 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 cc37ace2b..53fb193e6 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 2c09f0eee..151c5f15c 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 cc61bf74b..8b78fb302 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 238fbd5f6..7ac4a2b46 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 fdd0640c5..e9e363c82 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 c4e426d3c..c27afe766 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 21e20842d..148f367c2 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 b853f48f8..875fe972b 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 28c7ecde0..5052b4004 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 d61f9cf90..278b94aa8 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 bafd54f85..3ac540d52 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 7e85591b5..fea8db725 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 aa845395e..9f9ec602c 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 569b70238..7299dc7cc 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 6dd7136e4..3b075450a 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 f9c3aed07..c8f69f033 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 378bd4a6f..760e61d04 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 20d466501..d2ca1f6d5 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 a68b66e6d..5bc0807f1 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 e4c351b2f..28ab01826 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 0808e4cb4..1221a2d41 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 3f0252605..7b1720143 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 7f59da14d..21c8c1c19 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 4c92e673c..bbe8b12e9 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 49ce93c3b..18e8ae5a3 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 7343fc974..44d300247 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 f07fdf988..5e0e4aa7a 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 d0bc3e3bc..822f3d159 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 880b0a33d..91d1b3764 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 956f32f9c..343a4a505 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 f5d298b1a..fd5141c1f 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 7ee055c8c..935ea4303 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 9e1fa83da..222d0d658 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 4d813c168..227af8191 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 ba73046b5..980037e90 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 3b7e21636..d57773856 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 4e069f844..047c71853 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 c653ddc6d..8a85b6834 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 1d035ab63..a99e02351 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 b78e27e77..194532788 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 d38008316..ba581a069 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 531213456..e73da493b 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 83aad864e..e13896e39 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 5d03a85fa..5a30e5b1b 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 80cc63622..def0b8429 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 dae55b4f1..64571354f 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 7b67d682b..6e0704ace 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 0874c9389..56fe63d69 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 9490e588f..ec3b7d9bd 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 a382b6af6..6ba2fd2f7 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 4101ecbcd..e7fe6c384 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 32f30bd0f..038dd7155 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 917453d16..ad9b7bd99 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 f39dabd38..4a051afa6 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 d88662daf..c735f4739 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 3d499becf..49e38a7fe 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 95979961a..cfe4aec00 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 760cb131b..eca7c74ae 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 86a239b28..90da0bea1 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 6fe5db0d3..e5aa50053 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 0aa97abfc..df91229a9 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 b6e27bc37..e74893b1a 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 a98f541f7..2a40e6468 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 8f0332ad1..dfa798fab 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 d348184ca..d4b442d79 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 4683d3bc5..ae7c14929 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 d259f0f5e..4cf17c8d1 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 3286c932c..678c6d8b5 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 24be86e50..c262d6d2c 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 fab4c2f0c..3dbd81b8e 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 2cea5a426..4fa48090e 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 85b597f7b..220b14c95 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 1118208c8..1abf1716b 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 687e47013..9e7b5ac39 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 099228dd0..049f4388b 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 1d7474d45..b5125c508 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 23db3c501..20e042d14 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 42ac00c49..f0e088fc2 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 8267ed8ea..b7a128d07 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 ee143919f..70b12ce80 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 1c422ab21..857c01682 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 bc9d84da0..ad80ea5ae 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 575041aec..49a710840 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 441d0cb5d..052d99d4e 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 cf1470f49..e01c4e94d 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 b1d1fda58..fda5a77cc 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 8fa6342dc..2545119c4 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 3ce3b8d3c..54914a8ec 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 ddb4faa29..7dd9732db 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 f8331072c..ec740ac58 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 41582af22..a54bb2161 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 651b96c65..95f344fc8 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 c4e1adc1f..8de6f03cd 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 15c212539..86c52c34d 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 1c51f77c7..251b7e3ca 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 4fb879c6b..27d324957 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 93f983cda..bea58e3f1 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 d07c2a1d4..5312d9e66 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 68215a328..33a558612 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 ea63c5116..95082da76 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 3ce3b8d3c..54914a8ec 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 56413c60b..7034fa314 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 faf43b8e0..b4e5e23da 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 c52fd880d..d5b2d692f 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 61503c7fb..bf4e3beb5 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 8b08928c3..52b33d8e8 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 a211ccc36..fa676a2a1 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 a85abaec7..5d4282e67 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 6eb0d12dd..d51644040 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 01f0569fa..d7e88da87 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 944900624..5a688ca8d 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 fb423a820..991586f44 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 14690f7c7..6667f09b4 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 b18209409..5032243e8 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 ada20d1af..47a34876f 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 5e2b897f9..6a18f4feb 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 fad375e20..e75c6a95d 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 a3c2c87df..d7a1def3d 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 6debb8a11..ae92418d7 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 b7c644c55..657e7672e 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 ef7cc1ebe..04ca7e3a5 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 01215d1fe..34a4da985 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 d9c71d927..d30c05a4e 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 f082a4c82..5bcd12e6d 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 b01a17932..949c0a409 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 da7527531..f7ac8ca3e 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 81f515267..4af9f19d2 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 3ce3b8d3c..54914a8ec 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 1d141e9e3..54015fa2a 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 4c18d1e2f..18b8bd190 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 967001c7c..b3561685b 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 c4515a575..376d1c836 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 6235d5da7..84d505655 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 269847ebb..7369fdfad 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 46823bc17..b529e6ef9 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 d451083b1..9cb06159a 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 f2bbc5eb3..9982f512c 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 65aa3bc22..a461554c8 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 b21153fc3..e2e07df9c 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 77a36f502..4770330ab 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 250c70812..1c5b5bd6a 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 07957bcd7..8460b2fb3 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 fa69b8159..5253701f3 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 e9a4f9829..ab7c1fac6 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 3ce3b8d3c..54914a8ec 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 8cab6c04a..822ce045d 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 b562eaa4a..f38a7848c 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 c22b4f9ae..bc5985abc 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 7e5e0b447..7f8970ea3 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 1f1af58f6..a8146380f 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 c09ddbaae..6eff5d40b 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 457eae88f..07d83d538 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 77e3df436..6699d0d50 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 92fff0ffc..931e47170 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 e4ebcff3c..01996a5ea 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 fbea0184e..9549f8f7b 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 2fde7978b..92f79b6e1 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 3ce3b8d3c..54914a8ec 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 f2b0bdc36..c9bf4b6dd 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 2e04d3a5b..bc67d69cb 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 733789b97..b0dc4bb30 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 21e8e3ccd..8d3b9e940 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 6912c3382..cadb60b34 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 4c1c01b0c..dc3c07534 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 3123334d5..1c759103c 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 1f6b850d9..da5369b5b 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 6728fdb79..5e8df881c 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 2b3cffb4e..176567aae 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 0dc323829..1a55f9a91 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 2208627e3..2e6ba2cf8 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 3ce3b8d3c..54914a8ec 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 70b2c3d7f..9b7f9689e 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 7470b581d..ea14260af 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 f37d4584c..305dcce62 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 69681fc75..6be512854 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 8bd660262..d6438d3a2 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 d3be2fe26..d01c1d526 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 3e6215675..2de42059d 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 5eb858c53..59d540533 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 331fbdf6a..b3227c78f 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 46345d8d9..fbaea8fe2 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 4baaff794..686f5efd4 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 b11a774e6..561b2c092 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 3ce3b8d3c..54914a8ec 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 9c6595c60..e806917e9 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 69e2b10ec..a120eaf50 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 ca9b26166..b9a995907 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 9a7a05cf3..96f46d27c 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 73c8776ba..284b5fa18 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 d3f8f6111..aafd31054 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 b0a2951bd..5eeab2e1f 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 16a73bef0..44acdbfde 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 f4320a086..4c00e30dd 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 ca7adb4cb..d9fe1bb83 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 1dafbb244..d9a1dede4 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 fb423a820..991586f44 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 26509a3ed..451dfe7f8 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 849c78ce8..5a8daefa5 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 4285ec1d8..1ae8e5ea3 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 887c9de10..0def28071 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 b822ed2e2..b1404f232 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 a0fc40bfc..3dce84d86 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 11035c800..d79f5f8d6 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 51c788bc2..80e17a0bd 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 ce31ba5c2..86d810723 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 ecedf4b27..e04a1b8cc 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 8da179805..3a9200dc4 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 def74b862..c8ad824c5 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 3908a9e83..b2f2ceeea 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 ee38fc318..a1e7d1552 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 0332b09bf..e1f6a80f3 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 dfe99f09a..09de27dc1 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 21522e53b..7fd2dadd5 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 73e68d0a0..f59f6e586 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 5cb594731..531eb8188 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 7a5921b8a..f03dbc9a5 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 b13a06723..09c81ddca 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 db7b51aee..1abdd8f94 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 6fb44ffcc..0c57f0159 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 33430a5d1..1266bf4a6 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 4bbd15e27..d5dc1352a 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 ea990e4f5..6ec371d0a 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 d3efc1e9b..efa8ada25 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 aeb0149c7..8c1dc680e 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 0a8c1c661..b5f783a30 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 283d90d4a..1bc6eedd8 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 ca1b0cc48..7d1f38276 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 4fda3077e..33ff39589 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 db383e663..499708657 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 11491a279..73754b629 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 0dec46040..bb0e0feca 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 c2e5e70c8..c87d43f7a 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 f1b3ae1b9..f82bd747b 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 414c45ed8..d04986fee 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 7438aa9f1..47a38ea6b 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 1b4bab0d7..0a893cb64 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 47eb6483c..990b2c024 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 2d39a1d51..43b91f2ce 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 a1d27a563..5d3152189 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 1fc33fdb3..98cf738dd 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 8962d1a21..ba492b66c 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 ded8be6b5..161593132 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 1865be43f..6cea21e83 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 e21eae15f..42b77aa8d 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 e8b6c038c..3adedba5f 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 07c704fb0..dea1fa04d 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 a3966b315..22e81d330 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 24f2e6791..ec4670a90 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 0519117ee..67f17fe75 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 58bda2de2..fbf816ad1 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 ba2a49298..59ff6bb1c 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 84dc58a46..6965aab07 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 a3e887680..4d5273e79 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 8875d73ef..f0e1fac15 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 5f39b3bd3..77b8c1148 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 0e906f15e..1f38bd393 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 263cb0a56..6229b8163 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 348b33d6a..65df1c568 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 b4e3c721f..abafe4eee 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 47523b516..7f056d6fd 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 baca0098c..f90a9200f 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 7e908e34d..d4f412dcb 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 ae1c806d1..081cea263 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 3cd7ad87a..93662ff11 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 913fe9a70..62ad7cee2 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 e7a3edba5..835273dfc 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 766b15bcf..f9392d3b2 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 e2b5231ce..70cb2eefa 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 940a43259..8070b9b55 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 44e1bfa70..bc84eef83 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 52768b243..e234d5767 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 53699fccc..f539cb2c5 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 5d003bb37..c2e039b0c 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 f86f8f4c6..9ef434f25 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 31346b0f8..2caf008b0 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 2f6971e59..5fe717e63 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 73d36b011..e6ae1eb2b 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 4ff6334a9..1297ef244 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 15985427f..d91770cc4 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 b0d9189e0..799a68992 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 9d5093bc3..0d9f12482 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 f2cd34c89..fb594ff3d 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 b571e0686..1cb877596 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 b3cf03e9b..b760538d6 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 537adb249..709b01637 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 c8820d4ef..ab784ab64 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 ee31e5cb7..ae2902bff 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 fd95546f0..3afe91609 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 497f5ab05..0b127950c 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 023dc1a65..5bd8edaac 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 ccc0ad53d..f74c66595 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 3bcd06f4f..d0fb1930b 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 657430fca..0c3f2d7c5 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 45ec797c8..0649e92ce 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 003bdfc8f..650105b2a 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 976f97d5c..9a194ad5d 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 4a653b199..70639e2e4 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 e188b4ada..5a9859257 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 199fc5f28..d40e6bab8 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 d33fc13d7..9c2cc0691 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 88ade7912..c5c0169d6 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 b57dccc73..5469f544b 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 fe0ef5d13..ff0c361b8 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 7ee07bc85..2fe34d165 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 5da5d9b3b..f48b9ae8c 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 a84a1df28..b2cf11222 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 ff7d74c33..0322e6f87 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 a7efaf955..2fb7b6273 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 f9465c0f6..97c36f206 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 c30e2177c..f2f4d38a4 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 e049701d2..71efea746 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 b21eb8ce1..4b06357d6 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 90602d417..10a1707d9 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 0c7fee4ee..0e50a4754 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 6b9d639ea..8299644de 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 276596180..e22de0978 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 a4b779eb2..1795ffd52 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 be4b6ddf2..f4d6de2df 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 53a4b184e..d1572c546 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 060070569..de91d0cd1 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 9cb643cb3..e3954621c 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 1a66adf39..73dadfb65 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 f9e5e420d..c4af15965 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 2761a23a5..911800496 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 4c7d209a2..9ff30c142 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 2b3751fbd..59ffd95fb 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 7cdc245fb..990ec49e1 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 0c9cb0dae..fb8d27dc2 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 38dc96dd3..d4e36f156 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 ce70a8b13..34e2eb57d 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 e27a5b84b..49124ba96 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 10b848811..ef2bae9b0 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 1fcda72e4..f19812f27 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 36579c683..72e76765a 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 d2e324018..2038459d3 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 061b2638a..ae8518162 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 732db58d6..fba69ab06 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 dce131fdd..320eb86f4 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 3b291bcb7..c3efe195d 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 629eead6e..095d63e05 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 640f94e05..a87096597 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 e8a6bc24c..23c28bc94 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 70dfcce14..b85850a41 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 5087de6d8..75d754d8a 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 8f6f707a5..c209f8dbf 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 b83f3b162..3407205eb 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 e6560fb1a..289deb6b3 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 8b1c840b1..09c7bc997 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 6447de5a1..4cfc08749 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 09d90e8f2..aa19de403 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 6f7691362..c97f61a3a 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 03cc754ef..0bcccdda0 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 22a9be302..1a20f3e1e 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 aa3429629..3a9d2c52c 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 0a51d8b08..b6f24b027 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 795ebefd8..0f6b13623 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 99c64ec41..a44114876 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 b8310c970..fa7796483 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 3bdc88ccc..ae0267963 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 04cba45c3..b594e9232 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 9d3dbb84c..b69e37378 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 5a0936b8e..945900cdf 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 b9dbc4963..8564afdc2 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 99730c344..ef92f78a5 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 ce30d6442..0ab1312ac 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 4768348f5..53a14b234 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 5fe83a003..50f9e703f 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 7d3c77c7d..cb84a2999 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 ecf3cfdd8..8932848fe 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 c1d4afadb..047ce782d 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 8a48fe36c..475d71c31 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 ba2a991b4..0c6bbd4fa 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 3e3a911c9..949476f9f 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 270cb99c6..3499f7790 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 2219fbab2..161443a7e 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 1a93ea152..bef3e44ff 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 ed312dfc4..55c9ce5bd 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 c0d5da704..0304cec21 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 ad28529c5..b36963a9d 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 60de17da1..f70a036dc 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 54c9e8fa8..4472a24b5 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 3ce3b8d3c..54914a8ec 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 e61c15349..6ea062725 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 328ac3969..f1694b699 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 bdc370448..ee586da2d 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 6e6c9c4dc..f24bfaf83 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 237d2a0ec..2e52e5e66 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 b9834afe3..859e5f20a 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 df1782c4f..20868bc80 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 78bc0be0a..dec1a7985 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 105792280..eb15b05da 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 1c2faed96..f5fa0c5a6 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 3ed1956c1..2388ebbba 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 8099c7bf2..df48a7a35 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 de20d3a5b..0c0f4d114 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 76899e655..1cb430c39 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 10c093a39..6ac0db32a 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 461bd5cbe..b7ea9d68a 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 b6707989c..9f84c7b2c 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 355f2f6ca..0e28eb189 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 392d9178f..a3b668991 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 4d17011d1..8ffbfeae7 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 6a129bd45..6984b3a00 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 9f13ae410..cbdd73827 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 5510ebf57..caa9fe986 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 6d14e7440..67311dc91 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 1f4cb85bc..2b1a2a467 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 5358b266e..b1c1345a8 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 2e0242e22..9d68578eb 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 cdd1f23c4..e259a30dc 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 ddc7c24c0..ddf75dd95 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 b7a6933c8..e95ef180f 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 f336c7321..bf1000529 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 19c3603cd..1ea74618f 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 8c9a45aea..265c5c750 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 85d98acea..88b567da4 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 4d4a197c3..f24dc4865 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 c6bdfbc7c..a8a9529f8 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 d9c6de161..8fd09aeb6 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 7425baf0d..3b27a3f68 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 c2137e9d2..a4e2bf2c5 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 01a85f800..51dc0abd9 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 f0635190e..b39f394a2 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 7c4f4cfde..4d54d4516 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 966463da6..d2d4b1dca 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 d1e09361b..322ef2e94 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 20d19fa94..b1b0f169e 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 bade349eb..affc9a12e 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 4a1279c8e..10ec24b6c 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 6f7626a9d..92b638ff6 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 4a831899d..e48ed33ac 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 12b06cfbb..6ca6c09d7 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 5c50b0050..595979a80 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 42c31b509..c748f05ce 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 0115d9c80..0394decae 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 35641c0a5..c93893092 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 791c8c39d..49f68f20b 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 5082772ee..d55ad07ab 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 347a2cc3e..a34a9a543 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 75e5ab838..28e5e1e3c 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 483d91b63..ef9b83e32 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 6ad8a6931..18cc1fa8b 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 7e82763e1..b7db8b15a 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 421e936af..0499d36e2 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 9f2add031..0a56fa39d 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 07dfdd370..6963b5100 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 6c5643c1f..f6d515e5c 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 548895cf5..6b68b0226 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 977b85f3b..46fe727dc 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 e133a8bdd..61d872201 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 73f31b88f..4c9c89b59 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 89ecb87df..93c487912 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 bcc1df71a..42a326e84 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 d61b299dc..c3faab224 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 8da57ce84..651e7eb9a 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 309bc603f..b83eb3452 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 3d288bb77..e02e9136e 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 08f41f260..59715e2ea 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 69b94c91d..0741175cf 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 c1beebca0..eaf20392a 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 fa778f5ec..16fa701f8 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 73ff67fe9..e35cab204 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 968fa78de..9611df63b 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 c0d940f3a..c640b8ed4 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 4b5c4341b..20a290c7f 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 9ecb9364f..9f2a708b9 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 50db21ecd..3b3ad9fe6 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 ac0194ed7..fcfe61641 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 a0ba9c443..90ff8d499 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 56c60d9eb..780bf51bc 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 7f282054f..0dcde5795 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 d362d355f..4e6ecacd5 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 a1c260414..dc34a5eb1 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 acf4545c5..4219512d8 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 9ba58acb4..141e855fe 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 1c3b53c0f..adb031760 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 8607acbaf..8d1c77ab1 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 866e1860f..b588809e9 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 14832121f..4715ba214 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 5a6d24390..153458711 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 c207e17f2..3bfdebd4e 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 6dd851868..a7a58cc32 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 e6eaaf4c7..a6820ffdb 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 6025ef482..bcad60e4a 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 05cb2dafa..52f5408cb 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 b9f8dd00d..a40d0d768 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 ada294bfa..b31ccd9f6 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 069958a0b..2c95fb3fd 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 bab410617..953bb0e3a 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 76dc12aa5..3aecf2e09 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 3ce3b8d3c..54914a8ec 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 77a2913ba..085d9745a 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 7f41a24b1..3e4cb6cd6 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 e524c73bd..03c6bfb0f 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 3b8dd053b..b5fad3e6b 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 13639cff0..943460afc 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 c961c1aeb..d129ba4ce 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 aab7f2f2a..e31e0be01 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 d0a778801..adb4aadbd 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 15431a352..874a5129c 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 87d9cdd5a..3d3e0c131 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 9a33ce13c..22bf3afec 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 b671376be..7f27ab166 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 87fe2864b..6447fdaa3 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 96de1a08e..bbb5096f4 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 e4939db9e..d8444512e 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 1d2d38d88..1a3d8d70e 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 474f32735..ec1583648 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 06e48e76e..92927fc0f 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 4097ff4ef..875356094 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 6a9ebec58..4fd4baf94 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 29cdc8895..6bb6f321b 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 257052fb5..c6ea0c77b 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 f6f23b2ba..7b5dab991 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 a0e4411f8..5ec619219 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 2533141d9..c1fa1cc3c 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 52249a468..15cd14705 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 d259c1be7..887db1cbb 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 eba4c0719..94e96c375 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 8c4832520..a574a27c5 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 c4e7c8382..c883a367e 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 9bf3c37ca..d8e211f86 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 d1035fcd7..55ffa5b72 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 5e72bc257..a8460693a 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 207a33e0f..806c18815 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 4a2c04f51..078f5841c 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 190e9bccd..750421a58 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 e774e8c4a..f8c85f3f9 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 ec03f6a0c..98440f030 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 5926061c5..31f11405f 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 832909400..7219fa5df 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 48cfcfa24..1d3b61454 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 ee66c2cbb..9fdd3364c 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 77cb7ff97..15eae9d37 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 f89b989da..f10ec1c83 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 6a4ca758f..927f01a8a 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 651f1cbff..6137ec146 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 3ac7c5101..df9295187 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 21c07cdb4..122410809 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 b012e38dc..ea2d6db83 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 d2f692deb..bcc680625 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 4c5c2fe31..34b551c65 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 aaf0a8d7a..a98321641 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 24f2e6791..ec4670a90 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 756b360a9..3cd44284f 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 5a53fe3d0..bc1654efc 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 869d23db0..5d3c49437 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 0a9fe13bd..674e26bc9 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 74af6581f..79c54f995 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 1e9796445..fc7e2c5af 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 ef47a3beb..d7ec402bd 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 5d52c94a8..e5a2fa6f5 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 8919df2f7..ed64f064d 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 4f00a1ff9..90b00f9d5 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 e10e15291..76e14e555 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 4c34e37f9..bca288bc8 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 d24cac338..a954aca5d 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 f5274e987..c59ecab6b 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 da002867f..7e9b82efd 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 67e67eea9..0c0504adf 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 0628fd73f..605ee6aaa 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 889bc6772..5f62cc32a 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 824d626e5..922288da9 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 b918424d6..188cef70d 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 964e718bf..3784332a9 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 0cf3e85b1..c405dd902 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 574cbbe70..047c2bc1f 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 aab86ff06..ee511ee8c 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 f4d96a484..14551f636 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 8241edb7a..caa66deec 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 b5803e328..2e249093b 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 e51faeb4b..88fc7e2cd 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 422d067ed..15da7b4a9 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 e83c5f7c5..a827c87f0 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 b828af4b4..7f422db94 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 79d857019..91d5b26be 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 558510b20..b27f25bdb 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 4b15deb59..74c27a9c2 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 81ebadf0e..2b42a3b6f 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 986884b4c..e8d8eaf23 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 d8f0cc177..c22ae0d79 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 e1327d2d1..d95a904b5 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 186a180a0..8c2c640fb 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 ed29111c0..7ba0dc88b 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 70a047706..68c70b5bf 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 90b60c45b..8e3937b27 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 4861df010..6b7c0a0d2 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 33e95f379..858504c04 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 c7468d6bb..db70b4820 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 9f748c4ed..e202e15fb 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 ef48abbe0..f769e4fc7 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 f0ec0d1f2..1f8599af6 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 431b8a36e..e3b4544c3 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 dbbea75d6..45a4bab83 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 aed4b6756..97b94b24c 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 628e9087c..42a3ad5f9 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 bd69aa237..0c5674045 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 675a61e42..bbc95b6ba 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 1dabc843f..f505fd1c0 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 97e776f81..c876766ac 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 cab3e96e4..90ef2c2ee 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 303ba293b..edad027ce 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 5174c60d4..0c5c17351 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 802776235..1cd011e97 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 3955118fd..fce4df991 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 0f1931c2d..26e514265 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 f371fbc2f..663c2fb8e 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 143503b79..ad7b33a5c 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 a1021bc4b..7e9edc2fd 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 1136097dd..83f93eede 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 edc1ad327..22f3008cd 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 c8e51f54e..2e4f79374 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 1426e298d..87dcc740f 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 21060de80..b4c33bff6 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 39dc33618..3f95c236f 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 f0f9d05b7..878747e30 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 05d38e9b8..3f3efe81e 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 fd176dc9a..595349eca 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 fc0926872..f2ed31147 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 3f4cce3e0..751bc1564 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 a0b7409bf..0f54b5388 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 7e8ee9093..0f00471ca 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 53f0c49b7..a3dcae44b 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 42e295220..22ef984fa 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 a88b69541..80ee13cb4 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 17631fe4d..09f8411e4 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 4a90e85a9..f2bd44d6e 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 273d96b01..3d25993cb 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 5db7476c8..a2a71c56f 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 8dd2ae5e8..0d93d7d49 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 b5170ac7a..b32615782 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 1023ee8da..90a842bb8 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 734cf607f..d125bef07 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(`+=&|>